generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 6ece7fc3: Merge "property: fix getting dirty serial value"

Browse Source 
* commit '6ece7fc33a389ef9bcbe78a83a6633e4cb4e4743':
  property: fix getting dirty serial value
This commit is contained in:
Elliott Hughes 2014-03-13 20:21:05 +00:00 committed by Android Git Automerger
commit 5321a9e740
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libc/bionic/system_properties.cpp
View File

@ -609,23 +609,17 @@ const prop_info *__system_property_find(const char *name)
int __system_property_read(const prop_info *pi, char *name, char *value)
{
unsigned serial, len;
if (__predict_false(compat_mode)) {
return __system_property_read_compat(pi, name, value);
}
for(;;) {
serial = pi->serial;
while(SERIAL_DIRTY(serial)) {
__futex_wait((volatile void *)&pi->serial, serial, NULL);
serial = pi->serial;
}
len = SERIAL_VALUE_LEN(serial);
while (true) {
uint32_t serial = __system_property_serial(pi);
size_t len = SERIAL_VALUE_LEN(serial);
memcpy(value, pi->value, len + 1);
ANDROID_MEMBAR_FULL();
if(serial == pi->serial) {
if(name != 0) {
if (serial == pi->serial) {
if (name != 0) {
strcpy(name, pi->name);
}
return len;
@ -678,7 +672,7 @@ int __system_property_wait(const prop_info *pi)
const uint32_t n = pi->serial;
do {
__futex_wait((volatile void *)&pi->serial, n, NULL);
} while(n == pi->serial);
} while (n == pi->serial);
}
return 0;
}
@ -702,6 +696,7 @@ int __system_property_update(prop_info *pi, const char *value, unsigned int len)
return 0;
}
int __system_property_add(const char *name, unsigned int namelen,
const char *value, unsigned int valuelen)
{
@ -726,7 +721,12 @@ int __system_property_add(const char *name, unsigned int namelen,
unsigned int __system_property_serial(const prop_info *pi)
{
return pi->serial;
uint32_t serial = pi->serial;
while (SERIAL_DIRTY(serial)) {
__futex_wait(const_cast<volatile uint32_t*>(&pi->serial), serial, NULL);
serial = pi->serial;
}
return serial;
}
unsigned int __system_property_wait_any(unsigned int serial)
@ -735,7 +735,7 @@ unsigned int __system_property_wait_any(unsigned int serial)
do {
__futex_wait(&pa->serial, serial, NULL);
} while(pa->serial == serial);
} while (pa->serial == serial);
return pa->serial;
}