Split properties into their own class to make testing better
Reinitializing system properties can result in crashes later in the
program, and is generally not recommended or even supported. This
change moves the actual logic for system properties into a class that
can be tested in isolation, without reinitializing the actual system
property area used in libc.
Bug: 62197783
Test: boot devices, ensure properties work
Test: system property unit tests and benchmarks
Change-Id: I9ae6e1b56c62f51a4d3fdb5b62b8926cef545649
diff --git a/benchmarks/property_benchmark.cpp b/benchmarks/property_benchmark.cpp
index 5760bf1..9868765 100644
--- a/benchmarks/property_benchmark.cpp
+++ b/benchmarks/property_benchmark.cpp
@@ -21,37 +21,28 @@
#include <string>
+#include <android-base/test_utils.h>
+
+using namespace std::literals;
+
#if defined(__BIONIC__)
#define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_
#include <sys/_system_properties.h>
#include <benchmark/benchmark.h>
+#include <system_properties/system_properties.h>
#include "util.h"
struct LocalPropertyTestState {
- explicit LocalPropertyTestState(int nprops) : nprops(nprops), valid(false) {
+ explicit LocalPropertyTestState(int nprops)
+ : nprops(nprops), valid(false), system_properties_(false) {
static const char prop_name_chars[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_.";
- const char* android_data = getenv("ANDROID_DATA");
- if (android_data == NULL) {
- printf("ANDROID_DATA environment variable not set\n");
+ valid = system_properties_.AreaInit(dir_.path, nullptr);
+ if (!valid) {
return;
}
- char dir_template[PATH_MAX];
- snprintf(dir_template, sizeof(dir_template), "%s/local/tmp/prop-XXXXXX", android_data);
- char* dirname = mkdtemp(dir_template);
- if (!dirname) {
- printf("making temp file for test state failed (is %s/local/tmp writable?): %s\n",
- android_data, strerror(errno));
- return;
- }
-
- 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];
@@ -88,7 +79,7 @@
values[i][j] = prop_name_chars[random() % (sizeof(prop_name_chars) - 1)];
}
- if (__system_property_add(names[i], name_lens[i], values[i], value_lens[i]) < 0) {
+ if (system_properties_.Add(names[i], name_lens[i], values[i], value_lens[i]) < 0) {
printf("Failed to add a property, terminating...\n");
printf("%s = %.*s\n", names[i], value_lens[i], values[i]);
exit(1);
@@ -98,14 +89,16 @@
valid = true;
}
- ~LocalPropertyTestState() {
- if (!valid)
- return;
+ SystemProperties& system_properties() {
+ return system_properties_;
+ }
- __system_property_set_filename(PROP_FILENAME);
- __system_property_area_init();
- unlink(pa_filename.c_str());
- rmdir(pa_dirname.c_str());
+ ~LocalPropertyTestState() {
+ if (!valid) {
+ return;
+ }
+
+ system_properties_.contexts()->FreeAndUnmap();
for (int i = 0; i < nprops; i++) {
delete names[i];
@@ -126,8 +119,8 @@
bool valid;
private:
- std::string pa_dirname;
- std::string pa_filename;
+ SystemProperties system_properties_;
+ TemporaryDir dir_;
};
static void BM_property_get(benchmark::State& state) {
@@ -138,7 +131,7 @@
while (state.KeepRunning()) {
char value[PROP_VALUE_MAX];
- __system_property_get(pa.names[random() % nprops], value);
+ pa.system_properties().Get(pa.names[random() % nprops], value);
}
}
BIONIC_BENCHMARK_WITH_ARG(BM_property_get, "NUM_PROPS");
@@ -150,7 +143,7 @@
if (!pa.valid) return;
while (state.KeepRunning()) {
- __system_property_find(pa.names[random() % nprops]);
+ pa.system_properties().Find(pa.names[random() % nprops]);
}
}
BIONIC_BENCHMARK_WITH_ARG(BM_property_find, "NUM_PROPS");
@@ -165,12 +158,12 @@
char propvalue[PROP_VALUE_MAX];
for (size_t i = 0; i < nprops; ++i) {
- pinfo[i] = __system_property_find(pa.names[random() % nprops]);
+ pinfo[i] = pa.system_properties().Find(pa.names[random() % nprops]);
}
size_t i = 0;
while (state.KeepRunning()) {
- __system_property_read(pinfo[i], 0, propvalue);
+ pa.system_properties().Read(pinfo[i], 0, propvalue);
i = (i + 1) % nprops;
}
@@ -186,12 +179,12 @@
const prop_info** pinfo = new const prop_info*[nprops];
for (size_t i = 0; i < nprops; ++i) {
- pinfo[i] = __system_property_find(pa.names[random() % nprops]);
+ pinfo[i] = pa.system_properties().Find(pa.names[random() % nprops]);
}
size_t i = 0;
while (state.KeepRunning()) {
- __system_property_serial(pinfo[i]);
+ pa.system_properties().Serial(pinfo[i]);
i = (i + 1) % nprops;
}