diff options
| author | Mathias Agopian <mathias@google.com> | 2010-04-29 14:16:14 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-04-29 14:16:14 -0700 |
| commit | a228cc5efaa485d66855d475ded09a543a6fd076 (patch) | |
| tree | 2411dfd9b660f0fd40e5086a2961434a6e14ca3c /include | |
| parent | b219882a214a079233710a39c7c4943035d4f6dd (diff) | |
| parent | 0a8cd0689a76dbca7405004caac4dde4c0250aea (diff) | |
| download | frameworks_native-a228cc5efaa485d66855d475ded09a543a6fd076.zip frameworks_native-a228cc5efaa485d66855d475ded09a543a6fd076.tar.gz frameworks_native-a228cc5efaa485d66855d475ded09a543a6fd076.tar.bz2 | |
Merge "fix a race condition in undoDequeue(), where 'tail' could be computed incorrectly." into kraken
Diffstat (limited to 'include')
| -rw-r--r-- | include/private/surfaceflinger/SharedBufferStack.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/private/surfaceflinger/SharedBufferStack.h b/include/private/surfaceflinger/SharedBufferStack.h index 6ace5bc..39ef3a1 100644 --- a/include/private/surfaceflinger/SharedBufferStack.h +++ b/include/private/surfaceflinger/SharedBufferStack.h @@ -167,6 +167,7 @@ protected: SharedBufferStack* const mSharedStack; const int mNumBuffers; const int mIdentity; + int32_t computeTail() const; friend struct Update; friend struct QueueUpdate; @@ -259,8 +260,6 @@ private: friend struct Condition; friend struct DequeueCondition; friend struct LockCondition; - - int32_t computeTail() const; struct QueueUpdate : public UpdateBase { inline QueueUpdate(SharedBufferBase* sbb); @@ -288,6 +287,7 @@ private: }; int32_t tail; + int32_t undoDequeueTail; // statistics... nsecs_t mDequeueTime[NUM_BUFFER_MAX]; }; |