diff options
| author | Carl Shapiro <cshapiro@google.com> | 2010-09-28 13:47:03 -0700 |
|---|---|---|
| committer | Carl Shapiro <cshapiro@google.com> | 2010-09-28 14:06:00 -0700 |
| commit | d55f0adfb5ec4202ad5bd5d188e66c0f6a27b0aa (patch) | |
| tree | 409d6c3ac1cb97d41a9422f8e740134d7847bdfd /include | |
| parent | f62b23f2c1540221621024c850fdf615dda0c903 (diff) | |
| download | system_core-d55f0adfb5ec4202ad5bd5d188e66c0f6a27b0aa.zip system_core-d55f0adfb5ec4202ad5bd5d188e66c0f6a27b0aa.tar.gz system_core-d55f0adfb5ec4202ad5bd5d188e66c0f6a27b0aa.tar.bz2 | |
Qualify the source argument of atomic loads as a const pointer.
Also normalizes the opening brace placment in a few locations.
Change-Id: I8f518e933094337d5d3371321326ffc03b3a5f5a
Diffstat (limited to 'include')
| -rw-r--r-- | include/cutils/atomic-arm.h | 10 | ||||
| -rw-r--r-- | include/cutils/atomic-x86.h | 18 | ||||
| -rw-r--r-- | include/cutils/atomic.h | 4 |
3 files changed, 20 insertions, 12 deletions
diff --git a/include/cutils/atomic-arm.h b/include/cutils/atomic-arm.h index 0dd629d..93633c4 100644 --- a/include/cutils/atomic-arm.h +++ b/include/cutils/atomic-arm.h @@ -49,14 +49,14 @@ extern inline void android_memory_barrier(void) } #endif -extern inline int32_t android_atomic_acquire_load(volatile int32_t *ptr) +extern inline int32_t android_atomic_acquire_load(volatile const int32_t *ptr) { int32_t value = *ptr; android_memory_barrier(); return value; } -extern inline int32_t android_atomic_release_load(volatile int32_t *ptr) +extern inline int32_t android_atomic_release_load(volatile const int32_t *ptr) { android_memory_barrier(); return *ptr; @@ -196,11 +196,13 @@ extern inline int32_t android_atomic_add(int32_t increment, } #endif -extern inline int32_t android_atomic_inc(volatile int32_t *addr) { +extern inline int32_t android_atomic_inc(volatile int32_t *addr) +{ return android_atomic_add(1, addr); } -extern inline int32_t android_atomic_dec(volatile int32_t *addr) { +extern inline int32_t android_atomic_dec(volatile int32_t *addr) +{ return android_atomic_add(-1, addr); } diff --git a/include/cutils/atomic-x86.h b/include/cutils/atomic-x86.h index 06b643f..12a1985 100644 --- a/include/cutils/atomic-x86.h +++ b/include/cutils/atomic-x86.h @@ -36,25 +36,29 @@ extern inline void android_memory_barrier(void) } #endif -extern inline int32_t android_atomic_acquire_load(volatile int32_t *ptr) { +extern inline int32_t android_atomic_acquire_load(volatile const int32_t *ptr) +{ int32_t value = *ptr; android_compiler_barrier(); return value; } -extern inline int32_t android_atomic_release_load(volatile int32_t *ptr) { +extern inline int32_t android_atomic_release_load(volatile const int32_t *ptr) +{ android_memory_barrier(); return *ptr; } extern inline void android_atomic_acquire_store(int32_t value, - volatile int32_t *ptr) { + volatile int32_t *ptr) +{ *ptr = value; android_memory_barrier(); } extern inline void android_atomic_release_store(int32_t value, - volatile int32_t *ptr) { + volatile int32_t *ptr) +{ android_compiler_barrier(); *ptr = value; } @@ -107,11 +111,13 @@ extern inline int32_t android_atomic_add(int32_t increment, return increment; } -extern inline int32_t android_atomic_inc(volatile int32_t *addr) { +extern inline int32_t android_atomic_inc(volatile int32_t *addr) +{ return android_atomic_add(1, addr); } -extern inline int32_t android_atomic_dec(volatile int32_t *addr) { +extern inline int32_t android_atomic_dec(volatile int32_t *addr) +{ return android_atomic_add(-1, addr); } diff --git a/include/cutils/atomic.h b/include/cutils/atomic.h index 3866848..a50bf0f 100644 --- a/include/cutils/atomic.h +++ b/include/cutils/atomic.h @@ -77,8 +77,8 @@ int32_t android_atomic_or(int32_t value, volatile int32_t* addr); * This is only necessary if you need the memory barrier. A 32-bit read * from a 32-bit aligned address is atomic on all supported platforms. */ -int32_t android_atomic_acquire_load(volatile int32_t* addr); -int32_t android_atomic_release_load(volatile int32_t* addr); +int32_t android_atomic_acquire_load(volatile const int32_t* addr); +int32_t android_atomic_release_load(volatile const int32_t* addr); /* * Perform an atomic store with "acquire" or "release" ordering. |