bionic: make property area expandable
The property area is initially one 4K region, automatically expanding as
needed up to 64 regions.
To avoid duplicating code, __system_property_area_init() now allocates
and initializes the first region (previously it was allocated in init's
init_property_area() and initialized in bionic). For testing purposes,
__system_property_set_filename() may be used to override the file used
to map in regions.
Signed-off-by: Greg Hackmann <ghackmann@google.com>
(cherry picked from commit d32969701be070c0161c2643ee3c3df16066bbb8)
Change-Id: I038d451fe8849b0c4863663eec6f57f6521bf4a7
diff --git a/tests/property_benchmark.cpp b/tests/property_benchmark.cpp
index 2c8e2a1..7266bd0 100644
--- a/tests/property_benchmark.cpp
+++ b/tests/property_benchmark.cpp
@@ -15,23 +15,40 @@
*/
#include "benchmark.h"
+#include <unistd.h>
#define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_
#include <sys/_system_properties.h>
#include <vector>
+#include <string>
-extern void *__system_property_area__;
+extern void *__system_property_regions__[PA_REGION_COUNT];
#define TEST_NUM_PROPS \
- Arg(1)->Arg(4)->Arg(16)->Arg(64)->Arg(128)->Arg(247)
+ Arg(1)->Arg(4)->Arg(16)->Arg(64)->Arg(128)->Arg(256)->Arg(512)->Arg(1024)
struct LocalPropertyTestState {
- LocalPropertyTestState(int nprops) : nprops(nprops) {
+ LocalPropertyTestState(int nprops) : nprops(nprops), valid(false) {
static const char prop_name_chars[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ.-_";
- old_pa = __system_property_area__;
- pa = malloc(PA_SIZE);
- __system_property_area_init(pa);
+
+ char dir_template[] = "/data/nativetest/prop-XXXXXX";
+ char *dirname = mkdtemp(dir_template);
+ if (!dirname) {
+ perror("making temp file for test state failed (is /data/nativetest writable?)");
+ return;
+ }
+
+ for (size_t i = 0; i < PA_REGION_COUNT; i++) {
+ old_pa[i] = __system_property_regions__[i];
+ __system_property_regions__[i] = NULL;
+ }
+
+ pa_dirname = dirname;
+ pa_filename = pa_dirname + "/__properties__";
+
+ __system_property_set_filename(pa_filename.c_str());
+ __system_property_area_init();
names = new char* [nprops];
name_lens = new int[nprops];
@@ -54,10 +71,22 @@
}
__system_property_add(names[i], name_lens[i], values[i], value_lens[i]);
}
+
+ valid = true;
}
~LocalPropertyTestState() {
- __system_property_area__ = old_pa;
+ if (!valid)
+ return;
+
+ for (size_t i = 0; i < PA_REGION_COUNT; i++) {
+ __system_property_regions__[i] = old_pa[i];
+ }
+
+ __system_property_set_filename(PROP_FILENAME);
+ unlink(pa_filename.c_str());
+ rmdir(pa_dirname.c_str());
+
for (int i = 0; i < nprops; i++) {
delete names[i];
delete values[i];
@@ -66,7 +95,6 @@
delete[] name_lens;
delete[] values;
delete[] value_lens;
- free(pa);
}
public:
const int nprops;
@@ -74,10 +102,12 @@
int *name_lens;
char **values;
int *value_lens;
+ bool valid;
private:
- void *pa;
- void *old_pa;
+ std::string pa_dirname;
+ std::string pa_filename;
+ void *old_pa[PA_REGION_COUNT];
};
static void BM_property_get(int iters, int nprops)
@@ -87,6 +117,9 @@
LocalPropertyTestState pa(nprops);
char value[PROP_VALUE_MAX];
+ if (!pa.valid)
+ return;
+
srandom(iters * nprops);
StartBenchmarkTiming();
@@ -104,6 +137,9 @@
LocalPropertyTestState pa(nprops);
+ if (!pa.valid)
+ return;
+
srandom(iters * nprops);
StartBenchmarkTiming();