ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am d55f0adf: Qualify the source argument of atomic loads as a const pointer.

Browse source 
Merge commit 'd55f0adfb5ec4202ad5bd5d188e66c0f6a27b0aa' into gingerbread-plus-aosp

* commit 'd55f0adfb5ec4202ad5bd5d188e66c0f6a27b0aa':
  Qualify the source argument of atomic loads as a const pointer.
This commit is contained in:
Carl Shapiro 2010-09-28 14:20:54 -07:00 • committed by Android Git Automerger
commit df2f5a07ae
4 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/cutils/atomic-arm.h
View file

@ -49,14 +49,14 @@ extern inline void android_memory_barrier(void)
} }
#endif #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; int32_t value = *ptr;
android_memory_barrier(); android_memory_barrier();
return value; 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(); android_memory_barrier();
return *ptr; return *ptr;
@ -196,11 +196,13 @@ extern inline int32_t android_atomic_add(int32_t increment,
} }
#endif #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); 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); return android_atomic_add(-1, addr);
} }

18
include/cutils/atomic-x86.h
View file

@ -36,25 +36,29 @@ extern inline void android_memory_barrier(void)
} }
#endif #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; int32_t value = *ptr;
android_compiler_barrier(); android_compiler_barrier();
return value; 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(); android_memory_barrier();
return *ptr; return *ptr;
} }
extern inline void android_atomic_acquire_store(int32_t value, extern inline void android_atomic_acquire_store(int32_t value,
volatile int32_t *ptr) { volatile int32_t *ptr)
{
*ptr = value; *ptr = value;
android_memory_barrier(); android_memory_barrier();
} }
extern inline void android_atomic_release_store(int32_t value, extern inline void android_atomic_release_store(int32_t value,
volatile int32_t *ptr) { volatile int32_t *ptr)
{
android_compiler_barrier(); android_compiler_barrier();
*ptr = value; *ptr = value;
} }
@ -107,11 +111,13 @@ extern inline int32_t android_atomic_add(int32_t increment,
return 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); 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); return android_atomic_add(-1, addr);
} }

4
include/cutils/atomic.h
View file

@ -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 * 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. * 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_acquire_load(volatile const int32_t* addr);
int32_t android_atomic_release_load(volatile int32_t* addr); int32_t android_atomic_release_load(volatile const int32_t* addr);
/* /*
* Perform an atomic store with "acquire" or "release" ordering. * Perform an atomic store with "acquire" or "release" ordering.

4
libcutils/atomic-android-sh.c
View file

@ -49,12 +49,12 @@ static pthread_mutex_t _swap_locks[SWAP_LOCK_COUNT];
&_swap_locks[((unsigned)(void*)(addr) >> 3U) % SWAP_LOCK_COUNT] &_swap_locks[((unsigned)(void*)(addr) >> 3U) % SWAP_LOCK_COUNT]
int32_t android_atomic_acquire_load(volatile int32_t* addr) int32_t android_atomic_acquire_load(volatile const int32_t* addr)
{ {
return *addr; return *addr;
} }
int32_t android_atomic_release_load(volatile int32_t* addr) int32_t android_atomic_release_load(volatile const int32_t* addr)
{ {
return *addr; return *addr;
} }