Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 24825 into eclair

Browse Source 
* changes:
  fix [2111536] [FAST BLOCKER] Device is soft rebooted after ending the call through voice dialer
This commit is contained in:
Android (Google) Code Review
2009-09-11 22:19:10 -04:00
parent f376c837ea 3e63f9173a
commit d2cc42733e
1 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
libs/ui/SharedBufferStack.cpp
View File

@@ -246,10 +246,30 @@ SharedBufferClient::SharedBufferClient(SharedClient* sharedClient,
int surface, int num) int surface, int num)
: SharedBufferBase(sharedClient, surface, num), tail(0) : SharedBufferBase(sharedClient, surface, num), tail(0)
{ {
SharedBufferStack& stack( *mSharedStack );
int32_t avail;
int32_t head;
// we need to make sure we read available and head coherently,
// w.r.t RetireUpdate.
do {
avail = stack.available;
head = stack.head;
} while (stack.available != avail);
tail = head - avail + 1;
if (tail < 0) {
tail += num;
}
} }
ssize_t SharedBufferClient::dequeue() ssize_t SharedBufferClient::dequeue()
{ {
SharedBufferStack& stack( *mSharedStack );
if (stack.head == tail && stack.available == 2) {
LOGW("dequeue: tail=%d, head=%d, avail=%d, queued=%d",
tail, stack.head, stack.available, stack.queued);
}
//LOGD("[%d] about to dequeue a buffer", //LOGD("[%d] about to dequeue a buffer",
// mSharedStack->identity); // mSharedStack->identity);
DequeueCondition condition(this); DequeueCondition condition(this);
@@ -257,8 +277,6 @@ ssize_t SharedBufferClient::dequeue()
if (err != NO_ERROR) if (err != NO_ERROR)
return ssize_t(err); return ssize_t(err);
SharedBufferStack& stack( *mSharedStack );
// NOTE: 'stack.available' is part of the conditions, however // NOTE: 'stack.available' is part of the conditions, however
// decrementing it, never changes any conditions, so we don't need // decrementing it, never changes any conditions, so we don't need
// to do this as part of an update. // to do this as part of an update.
@@ -270,6 +288,7 @@ ssize_t SharedBufferClient::dequeue()
tail = ((tail+1 >= mNumBuffers) ? 0 : tail+1); tail = ((tail+1 >= mNumBuffers) ? 0 : tail+1);
LOGD_IF(DEBUG_ATOMICS, "dequeued=%d, tail=%d, %s", LOGD_IF(DEBUG_ATOMICS, "dequeued=%d, tail=%d, %s",
dequeued, tail, dump("").string()); dequeued, tail, dump("").string());
return dequeued; return dequeued;
} }
@@ -326,7 +345,7 @@ ssize_t SharedBufferServer::retireAndLock()
{ {
RetireUpdate update(this, mNumBuffers); RetireUpdate update(this, mNumBuffers);
ssize_t buf = updateCondition( update ); ssize_t buf = updateCondition( update );
LOGD_IF(DEBUG_ATOMICS, "retire=%d, %s", int(buf), dump("").string()); LOGD_IF(DEBUG_ATOMICS && buf>=0, "retire=%d, %s", int(buf), dump("").string());
return buf; return buf;
} }