diff options
author | Elliott Hughes <enh@google.com> | 2014-05-21 18:01:17 -0700 |
---|---|---|
committer | Elliott Hughes <enh@google.com> | 2014-05-21 18:01:17 -0700 |
commit | 9382378b6b271949bdce527ea3da748c13c4c692 (patch) | |
tree | 9b20c4e7b8e8dc733937f9125cd22b4c11c046a7 | |
parent | d83062287758be57d1d0908b30bb18aa9b367f38 (diff) | |
parent | b108091734ee7668084cc1063187c2b10ddb7bb7 (diff) | |
download | frameworks_av-9382378b6b271949bdce527ea3da748c13c4c692.zip frameworks_av-9382378b6b271949bdce527ea3da748c13c4c692.tar.gz frameworks_av-9382378b6b271949bdce527ea3da748c13c4c692.tar.bz2 |
resolved conflicts for merge of b1080917 to master
Change-Id: Iabbe3e95e29f28461ff722b550e8a9f35bd2528f
-rw-r--r-- | media/libmedia/AudioTrackShared.cpp | 20 | ||||
-rw-r--r-- | services/audioflinger/Threads.cpp | 4 | ||||
-rw-r--r-- | services/audioflinger/Tracks.cpp | 4 |
3 files changed, 14 insertions, 14 deletions
diff --git a/media/libmedia/AudioTrackShared.cpp b/media/libmedia/AudioTrackShared.cpp index 27a3718..ebf667a 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); } } @@ -683,8 +683,8 @@ bool AudioTrackServerProxy::setStreamEndDone() { bool old = (android_atomic_or(CBLK_STREAM_END_DONE, &cblk->mFlags) & CBLK_STREAM_END_DONE) != 0; if (!old) { - (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); } return old; } diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp index ce08ff1..cfae54e 100644 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp @@ -2752,7 +2752,7 @@ AudioFlinger::MixerThread::~MixerThread() if (state->mCommand == FastMixerState::COLD_IDLE) { int32_t old = android_atomic_inc(&mFastMixerFutex); if (old == -1) { - (void) __futex_syscall3(&mFastMixerFutex, FUTEX_WAKE_PRIVATE, 1); + (void) __futex_syscall4(&mFastMixerFutex, FUTEX_WAKE_PRIVATE, 1, NULL); } } state->mCommand = FastMixerState::EXIT; @@ -2809,7 +2809,7 @@ ssize_t AudioFlinger::MixerThread::threadLoop_write() if (state->mCommand == FastMixerState::COLD_IDLE) { int32_t old = android_atomic_inc(&mFastMixerFutex); if (old == -1) { - (void) __futex_syscall3(&mFastMixerFutex, FUTEX_WAKE_PRIVATE, 1); + (void) __futex_syscall4(&mFastMixerFutex, FUTEX_WAKE_PRIVATE, 1, NULL); } #ifdef AUDIO_WATCHDOG if (mAudioWatchdog != 0) { diff --git a/services/audioflinger/Tracks.cpp b/services/audioflinger/Tracks.cpp index de1782d..68b86f4 100644 --- a/services/audioflinger/Tracks.cpp +++ b/services/audioflinger/Tracks.cpp @@ -1008,7 +1008,7 @@ void AudioFlinger::PlaybackThread::Track::invalidate() android_atomic_or(CBLK_INVALID, &cblk->mFlags); android_atomic_release_store(0x40000000, &cblk->mFutex); // client is not in server, so FUTEX_WAKE is needed instead of FUTEX_WAKE_PRIVATE - (void) __futex_syscall3(&cblk->mFutex, FUTEX_WAKE, INT_MAX); + (void) __futex_syscall4(&cblk->mFutex, FUTEX_WAKE, INT_MAX, NULL); mIsInvalid = true; } @@ -1937,7 +1937,7 @@ void AudioFlinger::RecordThread::RecordTrack::invalidate() android_atomic_or(CBLK_INVALID, &cblk->mFlags); android_atomic_release_store(0x40000000, &cblk->mFutex); // client is not in server, so FUTEX_WAKE is needed instead of FUTEX_WAKE_PRIVATE - (void) __futex_syscall3(&cblk->mFutex, FUTEX_WAKE, INT_MAX); + (void) __futex_syscall4(&cblk->mFutex, FUTEX_WAKE, INT_MAX, NULL); } |