Commit bf650332 authored by topjohnwu's avatar topjohnwu

Update nanopb

parent f32e0af8
Subproject commit 3c69a905b16df149e1bda12f25e0522073a24678 Subproject commit 1466e6f953835b191a7f5acf0c06c941d4cd33d9
...@@ -8,4 +8,4 @@ std::string getprop(const char *name, bool persist = false); ...@@ -8,4 +8,4 @@ std::string getprop(const char *name, bool persist = false);
void getprops(void (*callback)(const char *, const char *, void *), void getprops(void (*callback)(const char *, const char *, void *),
void *cookie = nullptr, bool persist = false); void *cookie = nullptr, bool persist = false);
int delprop(const char *name, bool persist = false); int delprop(const char *name, bool persist = false);
void load_prop_file(const char *filename, bool trigger = true); void load_prop_file(const char *filename, bool prop_svc = true);
...@@ -8,41 +8,30 @@ ...@@ -8,41 +8,30 @@
#define PERSISTENT_PROPERTY_DIR "/data/property" #define PERSISTENT_PROPERTY_DIR "/data/property"
struct prop_cb { struct prop_cb {
virtual void exec(const char *name, const char *value) = 0; virtual void exec(const char *name, const char *value) {
exec(std::string(name), value);
}
virtual void exec(std::string &&name, const char *value) {
exec(name.data(), value);
}
}; };
template<class T> extern bool use_pb;
struct prop_cb_impl : public prop_cb {
typedef void (*callback_type)(const char *, const char *, T&);
#pragma GCC diagnostic push using prop_list = std::map<std::string, std::string>;
#pragma GCC diagnostic ignored "-Wdangling-field" // Dangling field is expected
prop_cb_impl(T &arg, callback_type fn) : arg(arg), fn(fn) {}
#pragma GCC diagnostic pop
struct prop_collector : prop_cb {
explicit prop_collector(prop_list &list) : list(list) {}
void exec(const char *name, const char *value) override { void exec(const char *name, const char *value) override {
fn(name, value, arg); list.insert_or_assign(name, value);
}
void exec(std::string &&name, const char *value) override {
list.insert_or_assign(std::move(name), value);
} }
private: private:
T &arg; prop_list &list;
callback_type fn;
};
extern bool use_pb;
using prop_list = std::map<std::string_view, std::string>;
struct prop_collector : prop_cb_impl<prop_list> {
prop_collector(prop_list &list) :
prop_cb_impl<prop_list>(list, [](auto name, auto val, auto list){ list.emplace(name, val); }) {}
}; };
template <class T, class Func>
prop_cb_impl<T> make_prop_cb(T &arg, Func f) {
return prop_cb_impl<T>(arg, f);
}
std::string persist_getprop(const char *name); std::string persist_getprop(const char *name);
void persist_getprops(prop_cb *prop_cb); void persist_getprops(prop_cb *prop_cb);
bool persist_deleteprop(const char *name); bool persist_deleteprop(const char *name);
void persist_cleanup();
This diff is collapsed.
...@@ -67,25 +67,25 @@ static bool check_legal_property_name(const char *name) { ...@@ -67,25 +67,25 @@ static bool check_legal_property_name(const char *name) {
return true; return true;
illegal: illegal:
LOGE("Illegal property name: [%s]\n", name); LOGE("Illegal property name: [%s]\n", name);
return false; return false;
} }
static void read_prop(const prop_info *pi, void *cb) { static void read_prop(const prop_info *pi, void *cb) {
__system_property_read_callback( auto callback = [](void *cb, const char *name, const char *value, uint32_t) {
pi, [](auto cb, auto name, auto value, auto) { static_cast<prop_cb*>(cb)->exec(name, value);
reinterpret_cast<prop_cb*>(cb)->exec(name, value); };
}, cb); __system_property_read_callback(pi, callback, cb);
} }
static void print_props(bool persist) { static void print_props(bool persist) {
getprops([](auto name, auto value, auto) { getprops([](const char *name, const char *value, auto) {
printf("[%s]: [%s]\n", name, value); printf("[%s]: [%s]\n", name, value);
}, nullptr, persist); }, nullptr, persist);
} }
struct sysprop { struct sysprop_stub {
virtual int setprop(const char *name, const char *value, bool trigger) { return 1; } virtual int setprop(const char *name, const char *value, bool trigger) { return 1; }
virtual string getprop(const char *name, bool persist) { return ""; } virtual string getprop(const char *name, bool persist) { return ""; }
virtual void getprops(void (*callback)(const char *, const char *, void *), virtual void getprops(void (*callback)(const char *, const char *, void *),
...@@ -93,7 +93,7 @@ struct sysprop { ...@@ -93,7 +93,7 @@ struct sysprop {
virtual int delprop(const char *name, bool persist) { return 1; } virtual int delprop(const char *name, bool persist) { return 1; }
}; };
struct stock_sysprop : public sysprop { struct sysprop : public sysprop_stub {
int setprop(const char *name, const char *value, bool) override { int setprop(const char *name, const char *value, bool) override {
return system_property_set(name, value); return system_property_set(name, value);
} }
...@@ -105,31 +105,30 @@ struct stock_sysprop : public sysprop { ...@@ -105,31 +105,30 @@ struct stock_sysprop : public sysprop {
} }
}; };
struct resetprop : public sysprop { struct resetprop : public sysprop_stub {
int setprop(const char *name, const char *value, bool trigger) override { int setprop(const char *name, const char *value, bool prop_svc) override {
if (!check_legal_property_name(name)) if (!check_legal_property_name(name))
return 1; return 1;
const char *msg = prop_svc ? "property_service" : "modifying prop data structure";
int ret; int ret;
auto pi = const_cast<prop_info *>(__system_property_find(name)); auto pi = const_cast<prop_info *>(__system_property_find(name));
if (pi != nullptr) { if (pi != nullptr) {
if (trigger) { if (prop_svc) {
if (strncmp(name, "ro.", 3) == 0) if (strncmp(name, "ro.", 3) == 0)
delprop(name, false); delprop(name, false);
ret = system_property_set(name, value); ret = system_property_set(name, value);
} else { } else {
ret = __system_property_update(pi, value, strlen(value)); ret = __system_property_update(pi, value, strlen(value));
} }
LOGD("resetprop: update prop [%s]: [%s] by %s\n", name, value, LOGD("resetprop: update prop [%s]: [%s] by %s\n", name, value, msg);
trigger ? "property_service" : "modifying prop data structure");
} else { } else {
if (trigger) { if (prop_svc) {
ret = system_property_set(name, value); ret = system_property_set(name, value);
} else { } else {
ret = __system_property_add(name, strlen(name), value, strlen(value)); ret = __system_property_add(name, strlen(name), value, strlen(value));
} }
LOGD("resetprop: create prop [%s]: [%s] by %s\n", name, value, LOGD("resetprop: create prop [%s]: [%s] by %s\n", name, value, msg);
trigger ? "property_service" : "modifying prop data structure");
} }
if (ret) if (ret)
...@@ -138,24 +137,30 @@ struct resetprop : public sysprop { ...@@ -138,24 +137,30 @@ struct resetprop : public sysprop {
return ret; return ret;
} }
struct prop_to_string : prop_cb {
explicit prop_to_string(string &s) : val(s) {}
void exec(const char *name, const char *value) override {
val = value;
}
private:
string &val;
};
string getprop(const char *name, bool persist) override { string getprop(const char *name, bool persist) override {
if (!check_legal_property_name(name)) if (!check_legal_property_name(name))
return string(); return string();
auto pi = __system_property_find(name); auto pi = __system_property_find(name);
if (pi == nullptr) { if (pi == nullptr) {
if (persist && strncmp(name, "persist.", 8) == 0) { if (persist && strncmp(name, "persist.", 8) == 0) {
auto value = persist_getprop(name); if (auto value = persist_getprop(name); !value.empty())
if (value.empty()) return value;
goto not_found;
return value;
} }
not_found:
LOGD("resetprop: prop [%s] does not exist\n", name); LOGD("resetprop: prop [%s] does not exist\n", name);
return string(); return string();
} else { } else {
string val; string val;
auto reader = make_prop_cb(val, [](auto, auto value, auto str){ str = value; }); auto prop = prop_to_string(val);
read_prop(pi, &reader); read_prop(pi, &prop);
LOGD("resetprop: getprop [%s]: [%s]\n", name, val.data()); LOGD("resetprop: getprop [%s]: [%s]\n", name, val.data());
return val; return val;
} }
...@@ -170,8 +175,6 @@ struct resetprop : public sysprop { ...@@ -170,8 +175,6 @@ struct resetprop : public sysprop {
persist_getprops(&collector); persist_getprops(&collector);
for (auto &[key, val] : list) for (auto &[key, val] : list)
callback(key.data(), val.data(), cookie); callback(key.data(), val.data(), cookie);
if (persist)
persist_cleanup();
} }
int delprop(const char *name, bool persist) override { int delprop(const char *name, bool persist) override {
...@@ -187,8 +190,8 @@ struct resetprop : public sysprop { ...@@ -187,8 +190,8 @@ struct resetprop : public sysprop {
#define DLOAD(name) \ #define DLOAD(name) \
*(void **) &name = dlsym(RTLD_DEFAULT, "__" #name) *(void **) &name = dlsym(RTLD_DEFAULT, "__" #name)
static sysprop *get_impl() { static sysprop_stub *get_impl() {
static sysprop *impl = nullptr; static sysprop_stub *impl = nullptr;
if (impl == nullptr) { if (impl == nullptr) {
use_pb = access(PERSISTENT_PROPERTY_DIR "/persistent_properties", R_OK) == 0; use_pb = access(PERSISTENT_PROPERTY_DIR "/persistent_properties", R_OK) == 0;
#ifdef APPLET_STUB_MAIN #ifdef APPLET_STUB_MAIN
...@@ -203,7 +206,7 @@ static sysprop *get_impl() { ...@@ -203,7 +206,7 @@ static sysprop *get_impl() {
if (__system_properties_init()) { if (__system_properties_init()) {
LOGW("resetprop: __system_properties_init error\n"); LOGW("resetprop: __system_properties_init error\n");
DLOAD(system_property_get); DLOAD(system_property_get);
impl = system_property_get ? new stock_sysprop() : new sysprop(); impl = system_property_get ? new sysprop() : new sysprop_stub();
} else { } else {
impl = new resetprop(); impl = new resetprop();
} }
...@@ -232,11 +235,11 @@ int delprop(const char *name, bool persist) { ...@@ -232,11 +235,11 @@ int delprop(const char *name, bool persist) {
return get_impl()->delprop(name, persist); return get_impl()->delprop(name, persist);
} }
void load_prop_file(const char *filename, bool trigger) { void load_prop_file(const char *filename, bool prop_svc) {
auto impl = get_impl(); auto impl = get_impl();
LOGD("resetprop: Parse prop file [%s]\n", filename); LOGD("resetprop: Parse prop file [%s]\n", filename);
parse_prop_file(filename, [=](auto key, auto val) -> bool { parse_prop_file(filename, [=](auto key, auto val) -> bool {
impl->setprop(key.data(), val.data(), trigger); impl->setprop(key.data(), val.data(), prop_svc);
return true; return true;
}); });
} }
...@@ -244,9 +247,9 @@ void load_prop_file(const char *filename, bool trigger) { ...@@ -244,9 +247,9 @@ void load_prop_file(const char *filename, bool trigger) {
int resetprop_main(int argc, char *argv[]) { int resetprop_main(int argc, char *argv[]) {
log_cb.d = [](auto fmt, auto ap) -> int { return verbose ? vfprintf(stderr, fmt, ap) : 0; }; log_cb.d = [](auto fmt, auto ap) -> int { return verbose ? vfprintf(stderr, fmt, ap) : 0; };
bool trigger = true, persist = false; bool prop_svc = true;
bool persist = false;
char *argv0 = argv[0]; char *argv0 = argv[0];
string prop;
--argc; --argc;
++argv; ++argv;
...@@ -257,7 +260,7 @@ int resetprop_main(int argc, char *argv[]) { ...@@ -257,7 +260,7 @@ int resetprop_main(int argc, char *argv[]) {
switch (argv[0][idx]) { switch (argv[0][idx]) {
case '-': case '-':
if (strcmp(argv[0], "--file") == 0 && argc == 2) { if (strcmp(argv[0], "--file") == 0 && argc == 2) {
load_prop_file(argv[1], trigger); load_prop_file(argv[1], prop_svc);
return 0; return 0;
} else if (strcmp(argv[0], "--delete") == 0 && argc == 2) { } else if (strcmp(argv[0], "--delete") == 0 && argc == 2) {
return delprop(argv[1], persist); return delprop(argv[1], persist);
...@@ -271,7 +274,7 @@ int resetprop_main(int argc, char *argv[]) { ...@@ -271,7 +274,7 @@ int resetprop_main(int argc, char *argv[]) {
persist = true; persist = true;
continue; continue;
case 'n': case 'n':
trigger = false; prop_svc = false;
continue; continue;
case '\0': case '\0':
break; break;
...@@ -289,13 +292,15 @@ int resetprop_main(int argc, char *argv[]) { ...@@ -289,13 +292,15 @@ int resetprop_main(int argc, char *argv[]) {
case 0: case 0:
print_props(persist); print_props(persist);
return 0; return 0;
case 1: case 1: {
prop = getprop(argv[0], persist); string prop = getprop(argv[0], persist);
if (prop.empty()) return 1; if (prop.empty())
return 1;
printf("%s\n", prop.data()); printf("%s\n", prop.data());
return 0; return 0;
}
case 2: case 2:
return setprop(argv[0], argv[1], trigger); return setprop(argv[0], argv[1], prop_svc);
default: default:
usage(argv0); usage(argv0);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment