am e755dfd4: Merge changes I1db3137b,I0f66144e (a44c31cc) · Commits · e / os / android_system_core

libcutils/properties.c

+19 −10

Original line number	Diff line number	Diff line
		@@ -52,19 +52,28 @@ int property_get(const char key, char value, const char *default_value)
		return len;
		}

		int property_list(void (propfn)(const char key, const char value, void cookie),
		void *cookie)
		struct property_list_callback_data
		{
		void (propfn)(const char key, const char value, void cookie);
		void *cookie;
		};

		static void property_list_callback(const prop_info pi, void cookie)
		{
		char name[PROP_NAME_MAX];
		char value[PROP_VALUE_MAX];
		const prop_info *pi;
		unsigned n;
		struct property_list_callback_data *data = cookie;

		for(n = 0; (pi = __system_property_find_nth(n)); n++) {
		__system_property_read(pi, name, value);
		propfn(name, value, cookie);
		data->propfn(name, value, data->cookie);
		}
		return 0;

		int property_list(
		void (propfn)(const char key, const char value, void cookie),
		void *cookie)
		{
		struct property_list_callback_data data = { propfn, cookie };
		return __system_property_foreach(property_list_callback, &data);
		}

		#elif defined(HAVE_SYSTEM_PROPERTY_SERVER)

toolbox/watchprops.c

+59 −39

Original line number	Diff line number	Diff line
		#include <stdio.h>
		#include <stdlib.h>
		#include <time.h>
		#include <errno.h>

		#include <cutils/properties.h>
		#include <cutils/hashmap.h>

		#include <sys/atomics.h>

		#define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_
		#include <sys/_system_properties.h>

		typedef struct pwatch pwatch;

		struct pwatch
		static int str_hash(void *key)
		{
		const prop_info *pi;
		unsigned serial;
		};
		return hashmapHash(key, strlen(key));
		}

		static pwatch watchlist[1024];
		static bool str_equals(void keyA, void keyB)
		{
		return strcmp(keyA, keyB) == 0;
		}

		static void announce(const prop_info *pi)
		static void announce(char name, char value)
		{
		char name[PROP_NAME_MAX];
		char value[PROP_VALUE_MAX];
		char *x;

		__system_property_read(pi, name, value);

		for(x = value; *x; x++) {
		if((x < 32) \|\| (x > 127)) *x = '.';
		}
		@@ -34,42 +32,64 @@ static void announce(const prop_info *pi)
		fprintf(stderr,"%10d %s = '%s'\n", (int) time(0), name, value);
		}

		int watchprops_main(int argc, char *argv[])
		static void add_to_watchlist(Hashmap watchlist, const char name,
		const prop_info *pi)
		{
		unsigned serial = 0;
		unsigned count;
		unsigned n;
		char *key = strdup(name);
		unsigned *value = malloc(sizeof(unsigned));
		if (!key \|\| !value)
		exit(1);

		for(n = 0; n < 1024; n++) {
		watchlist[n].pi = __system_property_find_nth(n);
		if (watchlist[n].pi == 0)
		break;
		watchlist[n].serial = __system_property_serial(watchlist[n].pi);
		*value = __system_property_serial(pi);
		hashmapPut(watchlist, key, value);
		}

		count = n;
		if (count == 1024)
		exit(1);
		static void populate_watchlist(const prop_info pi, void cookie)
		{
		Hashmap *watchlist = cookie;
		char name[PROP_NAME_MAX];
		char value_unused[PROP_VALUE_MAX];

		for(;;) {
		serial = __system_property_wait_any(serial);
		while(count < 1024){
		watchlist[count].pi = __system_property_find_nth(count);
		if (watchlist[count].pi == 0)
		break;
		watchlist[count].serial = __system_property_serial(watchlist[n].pi);
		announce(watchlist[count].pi);
		count++;
		if(count == 1024) exit(1);
		__system_property_read(pi, name, value_unused);
		add_to_watchlist(watchlist, name, pi);
		}

		for(n = 0; n < count; n++){
		unsigned tmp = __system_property_serial(watchlist[n].pi);
		if(watchlist[n].serial != tmp) {
		announce(watchlist[n].pi);
		watchlist[n].serial = tmp;
		static void update_watchlist(const prop_info pi, void cookie)
		{
		Hashmap *watchlist = cookie;
		char name[PROP_NAME_MAX];
		char value[PROP_VALUE_MAX];
		unsigned *serial;

		__system_property_read(pi, name, value);
		serial = hashmapGet(watchlist, name);
		if (!serial) {
		add_to_watchlist(watchlist, name, pi);
		announce(name, value);
		} else {
		unsigned tmp = __system_property_serial(pi);
		if (*serial != tmp) {
		*serial = tmp;
		announce(name, value);
		}
		}
		}

		int watchprops_main(int argc, char *argv[])
		{
		unsigned serial = 0;
		unsigned count = 0;
		unsigned n;

		Hashmap *watchlist = hashmapCreate(1024, str_hash, str_equals);
		if (!watchlist)
		exit(1);

		__system_property_foreach(populate_watchlist, watchlist);

		for(;;) {
		serial = __system_property_wait_any(serial);
		__system_property_foreach(update_watchlist, watchlist);
		}
		return 0;
		}