pa-fazil
/
android_bionic
mirror of https://github.com/fazilsheik96/android_bionic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge "property: fix getting dirty serial value"

This commit is contained in:
Elliott Hughes 2014-03-13 20:16:17 +00:00 committed by Gerrit Code Review
parent 01cd78854a 879d330499
commit 6ece7fc33a
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libc/bionic/system_properties.cpp
View File

@ -609,19 +609,13 @@ const prop_info *__system_property_find(const char *name)
int __system_property_read(const prop_info *pi, char *name, char *value) int __system_property_read(const prop_info *pi, char *name, char *value)
{ {
unsigned serial, len;
if (__predict_false(compat_mode)) { if (__predict_false(compat_mode)) {
return __system_property_read_compat(pi, name, value); return __system_property_read_compat(pi, name, value);
} }
for(;;) { while (true) {
serial = pi->serial; uint32_t serial = __system_property_serial(pi);
while(SERIAL_DIRTY(serial)) { size_t len = SERIAL_VALUE_LEN(serial);
__futex_wait((volatile void *)&pi->serial, serial, NULL);
serial = pi->serial;
}
len = SERIAL_VALUE_LEN(serial);
memcpy(value, pi->value, len + 1); memcpy(value, pi->value, len + 1);
ANDROID_MEMBAR_FULL(); ANDROID_MEMBAR_FULL();
if (serial == pi->serial) { if (serial == pi->serial) {
@ -702,6 +696,7 @@ int __system_property_update(prop_info *pi, const char *value, unsigned int len)
return 0; return 0;
} }
int __system_property_add(const char *name, unsigned int namelen, int __system_property_add(const char *name, unsigned int namelen,
const char *value, unsigned int valuelen) 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) 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) unsigned int __system_property_wait_any(unsigned int serial)