diff options
author | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-06 22:10:17 -0400 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-06 22:10:17 -0400 |
commit | 23e1ce72323c87cacd3443b7d0deeda3a82f9dba (patch) | |
tree | af3fdf56529cd7f2571c9e93d5be1cd9cfdee9e9 | |
parent | e33e00e931d1381d402484aa5cde67e540e3c82c (diff) | |
parent | d46758b6ec99533babbd24f62e381eae0a2a66a6 (diff) | |
download | frameworks_av-23e1ce72323c87cacd3443b7d0deeda3a82f9dba.zip frameworks_av-23e1ce72323c87cacd3443b7d0deeda3a82f9dba.tar.gz frameworks_av-23e1ce72323c87cacd3443b7d0deeda3a82f9dba.tar.bz2 |
Merge change I4961c959 into eclair
* changes:
fix [2152536] ANR in browser
-rw-r--r-- | include/private/ui/SharedBufferStack.h | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/include/private/ui/SharedBufferStack.h b/include/private/ui/SharedBufferStack.h index 59cf31c..f6824d9 100644 --- a/include/private/ui/SharedBufferStack.h +++ b/include/private/ui/SharedBufferStack.h @@ -139,7 +139,8 @@ private: class SharedBufferBase { public: - SharedBufferBase(SharedClient* sharedClient, int surface, int num); + SharedBufferBase(SharedClient* sharedClient, int surface, int num, + int32_t identity); ~SharedBufferBase(); uint32_t getIdentity(); status_t getStatus() const; @@ -150,6 +151,7 @@ protected: SharedClient* const mSharedClient; SharedBufferStack* const mSharedStack; const int mNumBuffers; + const int mIdentity; friend struct Update; friend struct QueueUpdate; @@ -180,7 +182,10 @@ status_t SharedBufferBase::waitForCondition(T condition) SharedClient& client( *mSharedClient ); const nsecs_t TIMEOUT = s2ns(1); Mutex::Autolock _l(client.lock); - while ((condition()==false) && (stack.status == NO_ERROR)) { + while ((condition()==false) && + (stack.identity == mIdentity) && + (stack.status == NO_ERROR)) + { status_t err = client.cv.waitRelative(client.lock, TIMEOUT); // handle errors and timeouts @@ -190,13 +195,13 @@ status_t SharedBufferBase::waitForCondition(T condition) LOGE("waitForCondition(%s) timed out (identity=%d), " "but condition is true! We recovered but it " "shouldn't happen." , T::name(), - mSharedStack->identity); + stack.identity); break; } else { LOGW("waitForCondition(%s) timed out " "(identity=%d, status=%d). " "CPU may be pegged. trying again.", T::name(), - mSharedStack->identity, mSharedStack->status); + stack.identity, stack.status); } } else { LOGE("waitForCondition(%s) error (%s) ", @@ -205,7 +210,7 @@ status_t SharedBufferBase::waitForCondition(T condition) } } } - return stack.status; + return (stack.identity != mIdentity) ? status_t(BAD_INDEX) : stack.status; } @@ -223,8 +228,9 @@ status_t SharedBufferBase::updateCondition(T update) { class SharedBufferClient : public SharedBufferBase { public: - SharedBufferClient(SharedClient* sharedClient, int surface, int num); - + SharedBufferClient(SharedClient* sharedClient, int surface, int num, + int32_t identity); + ssize_t dequeue(); status_t undoDequeue(int buf); |