commit a82388354867435bfac443bd0239cad25b4511b5
author Greg Hackmann <ghackmann@google.com> Mon Jun 24 17:15:43 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 24 17:15:43 2013 +0000
tree 2490641f2c003c64f0aa0308a8b6851bde5f739c
parent ae9353387db69943a3c10add4a702e4d82914a08
parent 5bfa3ee8b37ef162154559575193018a6235acba

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

libc/bionic/system_properties.c

diff --git a/libc/bionic/system_properties.c b/libc/bionic/system_properties.c
index 800c8b8..b12879e 100644
--- a/libc/bionic/system_properties.c
+++ b/libc/bionic/system_properties.c
@@ -49,6 +49,7 @@
 #include <sys/_system_properties.h>
 
 #include <sys/atomics.h>
+#include <bionic_atomic_inline.h>
 
 struct prop_area {
     unsigned volatile count;
@@ -315,6 +316,7 @@
         }
         len = SERIAL_VALUE_LEN(serial);
         memcpy(value, pi->value, len + 1);
+        ANDROID_MEMBAR_FULL();
         if(serial == pi->serial) {
             if(name != 0) {
                 strcpy(name, pi->name);
@@ -446,7 +448,9 @@
         return -1;
 
     pi->serial = pi->serial | 1;
+    ANDROID_MEMBAR_FULL();
     memcpy(pi->value, value, len + 1);
+    ANDROID_MEMBAR_FULL();
     pi->serial = (len << 24) | ((pi->serial + 1) & 0xffffff);
     __futex_wake(&pi->serial, INT32_MAX);
 
@@ -493,6 +497,7 @@
     memcpy(pi->value, value, valuelen + 1);
 
     pa->toc[pa->count] = (namelen << 24) | (((unsigned) pi) - ((unsigned) pa));
+    ANDROID_MEMBAR_FULL();
 
     pa->count++;
     pa->serial++;