diff options
| author | Elliott Hughes <enh@google.com> | 2014-05-21 17:31:18 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2014-05-21 17:31:18 -0700 |
| commit | 77e1512aee8092069514973379a59a318e721be3 (patch) | |
| tree | 875411e1d44b2cf12e99134af2d7cfb7f9acceae /media/libmedia | |
| parent | ce473c32705e2d1c5fcc817198101e1220b3c8f7 (diff) | |
| download | frameworks_av-77e1512aee8092069514973379a59a318e721be3.zip frameworks_av-77e1512aee8092069514973379a59a318e721be3.tar.gz frameworks_av-77e1512aee8092069514973379a59a318e721be3.tar.bz2 | |
Move frameworks/av off __futex_syscall3.
Bug: 11156955
Change-Id: I943080bc51b6efa781059b48b5b5ecc4fa287512
Diffstat (limited to 'media/libmedia')
| -rw-r--r-- | media/libmedia/AudioTrackShared.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/media/libmedia/AudioTrackShared.cpp b/media/libmedia/AudioTrackShared.cpp index e898109..beb8547 100644 --- a/media/libmedia/AudioTrackShared.cpp +++ b/media/libmedia/AudioTrackShared.cpp @@ -295,8 +295,8 @@ void ClientProxy::binderDied() audio_track_cblk_t* cblk = mCblk; if (!(android_atomic_or(CBLK_INVALID, &cblk->mFlags) & CBLK_INVALID)) { // it seems that a FUTEX_WAKE_PRIVATE will not wake a FUTEX_WAIT, even within same process - (void) __futex_syscall3(&cblk->mFutex, mClientInServer ? FUTEX_WAKE_PRIVATE : FUTEX_WAKE, - 1); + (void) __futex_syscall4(&cblk->mFutex, mClientInServer ? FUTEX_WAKE_PRIVATE : FUTEX_WAKE, + 1, NULL); } } @@ -304,8 +304,8 @@ void ClientProxy::interrupt() { audio_track_cblk_t* cblk = mCblk; if (!(android_atomic_or(CBLK_INTERRUPT, &cblk->mFlags) & CBLK_INTERRUPT)) { - (void) __futex_syscall3(&cblk->mFutex, mClientInServer ? FUTEX_WAKE_PRIVATE : FUTEX_WAKE, - 1); + (void) __futex_syscall4(&cblk->mFutex, mClientInServer ? FUTEX_WAKE_PRIVATE : FUTEX_WAKE, + 1, NULL); } } @@ -535,8 +535,8 @@ status_t ServerProxy::obtainBuffer(Buffer* buffer, bool ackFlush) if (front != rear) { int32_t old = android_atomic_or(CBLK_FUTEX_WAKE, &cblk->mFutex); if (!(old & CBLK_FUTEX_WAKE)) { - (void) __futex_syscall3(&cblk->mFutex, - mClientInServer ? FUTEX_WAKE_PRIVATE : FUTEX_WAKE, 1); + (void) __futex_syscall4(&cblk->mFutex, + mClientInServer ? FUTEX_WAKE_PRIVATE : FUTEX_WAKE, 1, NULL); } } front = rear; @@ -638,8 +638,8 @@ void ServerProxy::releaseBuffer(Buffer* buffer) ALOGV("mAvailToClient=%u stepCount=%u minimum=%u", mAvailToClient, stepCount, minimum); int32_t old = android_atomic_or(CBLK_FUTEX_WAKE, &cblk->mFutex); if (!(old & CBLK_FUTEX_WAKE)) { - (void) __futex_syscall3(&cblk->mFutex, - mClientInServer ? FUTEX_WAKE_PRIVATE : FUTEX_WAKE, 1); + (void) __futex_syscall4(&cblk->mFutex, + mClientInServer ? FUTEX_WAKE_PRIVATE : FUTEX_WAKE, 1, NULL); } } @@ -682,8 +682,8 @@ bool AudioTrackServerProxy::setStreamEndDone() { bool old = (android_atomic_or(CBLK_STREAM_END_DONE, &mCblk->mFlags) & CBLK_STREAM_END_DONE) != 0; if (!old) { - (void) __futex_syscall3(&mCblk->mFutex, mClientInServer ? FUTEX_WAKE_PRIVATE : FUTEX_WAKE, - 1); + (void) __futex_syscall4(&mCblk->mFutex, mClientInServer ? FUTEX_WAKE_PRIVATE : FUTEX_WAKE, + 1, NULL); } return old; } |