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

Merge "bionic: add missing memory barriers to system properties"

Browse Source
This commit is contained in:
Greg Hackmann 2013-06-24 17:15:43 +00:00 committed by Android (Google) Code Review
commit a823883548
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libc/bionic/system_properties.c
View File

@ -49,6 +49,7 @@
#include <sys/_system_properties.h> #include <sys/_system_properties.h>
#include <sys/atomics.h> #include <sys/atomics.h>
#include <bionic_atomic_inline.h>
struct prop_area { struct prop_area {
unsigned volatile count; unsigned volatile count;
@ -315,6 +316,7 @@ int __system_property_read(const prop_info *pi, char *name, char *value)
} }
len = SERIAL_VALUE_LEN(serial); len = SERIAL_VALUE_LEN(serial);
memcpy(value, pi->value, len + 1); memcpy(value, pi->value, len + 1);
ANDROID_MEMBAR_FULL();
if(serial == pi->serial) { if(serial == pi->serial) {
if(name != 0) { if(name != 0) {
strcpy(name, pi->name); strcpy(name, pi->name);
@ -446,7 +448,9 @@ int __system_property_update(prop_info *pi, const char *value, unsigned int len)
return -1; return -1;
pi->serial = pi->serial | 1; pi->serial = pi->serial | 1;
ANDROID_MEMBAR_FULL();
memcpy(pi->value, value, len + 1); memcpy(pi->value, value, len + 1);
ANDROID_MEMBAR_FULL();
pi->serial = (len << 24) | ((pi->serial + 1) & 0xffffff); pi->serial = (len << 24) | ((pi->serial + 1) & 0xffffff);
__futex_wake(&pi->serial, INT32_MAX); __futex_wake(&pi->serial, INT32_MAX);
@ -493,6 +497,7 @@ int __system_property_add(const char *name, unsigned int namelen,
memcpy(pi->value, value, valuelen + 1); memcpy(pi->value, value, valuelen + 1);
pa->toc[pa->count] = (namelen << 24) | (((unsigned) pi) - ((unsigned) pa)); pa->toc[pa->count] = (namelen << 24) | (((unsigned) pi) - ((unsigned) pa));
ANDROID_MEMBAR_FULL();
pa->count++; pa->count++;
pa->serial++; pa->serial++;