diff options
| author | Hans Boehm <hboehm@google.com> | 2014-07-23 23:27:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-23 23:27:57 +0000 |
| commit | f048af49e219c4f5568607d12aa91cc7439c9f97 (patch) | |
| tree | b8c8cf72917cb4e9aacfedd626182518d555aae0 /services/audioflinger/StateQueue.h | |
| parent | d3038c30ef8436810cd1c2e5265eab00e242e765 (diff) | |
| parent | 9eba0a74a1fa9aabb7f7078a32c591bc7f0a7168 (diff) | |
| download | frameworks_av-f048af49e219c4f5568607d12aa91cc7439c9f97.zip frameworks_av-f048af49e219c4f5568607d12aa91cc7439c9f97.tar.gz frameworks_av-f048af49e219c4f5568607d12aa91cc7439c9f97.tar.bz2 | |
am 9eba0a74: am 3879792f: Merge "Remove 64-bit android_atomic uses from StateQueue."
* commit '9eba0a74a1fa9aabb7f7078a32c591bc7f0a7168':
Remove 64-bit android_atomic uses from StateQueue.
Diffstat (limited to 'services/audioflinger/StateQueue.h')
| -rw-r--r-- | services/audioflinger/StateQueue.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/audioflinger/StateQueue.h b/services/audioflinger/StateQueue.h index 9e176c4..27f6a28 100644 --- a/services/audioflinger/StateQueue.h +++ b/services/audioflinger/StateQueue.h @@ -17,6 +17,8 @@ #ifndef ANDROID_AUDIO_STATE_QUEUE_H #define ANDROID_AUDIO_STATE_QUEUE_H +#include <stdatomic.h> + // The state queue template class was originally driven by this use case / requirements: // There are two threads: a fast mixer, and a normal mixer, and they share state. // The interesting part of the shared state is a set of active fast tracks, @@ -186,7 +188,7 @@ private: T mStates[kN]; // written by mutator, read by observer // "volatile" is meaningless with SMP, but here it indicates that we're using atomic ops - volatile const T* mNext; // written by mutator to advance next, read by observer + atomic_uintptr_t mNext; // written by mutator to advance next, read by observer volatile const T* mAck; // written by observer to acknowledge advance of next, read by mutator // only used by observer |