drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am ae66946b: Merge "fix a race in SF buffer management" into gingerbread

Browse Source 
Merge commit 'ae66946bd9e9f1168241c75196d2379b43e3ca30' into gingerbread-plus-aosp

* commit 'ae66946bd9e9f1168241c75196d2379b43e3ca30':
  fix a race in SF buffer management
This commit is contained in:
Mathias Agopian
2010-08-27 12:23:35 -07:00
committed by Android Git Automerger
parent e339c0968e ae66946bd9
commit d322d16323
2 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/private/surfaceflinger/SharedBufferStack.h
View File

@ -151,7 +151,6 @@ public:
~SharedBufferBase();
status_t getStatus() const;
int32_t getIdentity() const;
size_t getFrontBuffer() const;
String8 dump(char const* prefix) const;
protected:
@ -226,6 +225,11 @@ private:
inline ssize_t operator()();
};
struct DequeueUpdate : public UpdateBase {
inline DequeueUpdate(SharedBufferBase* sbb);
inline ssize_t operator()();
};
struct UndoDequeueUpdate : public UpdateBase {
inline UndoDequeueUpdate(SharedBufferBase* sbb);
inline ssize_t operator()();

24
libs/surfaceflinger_client/SharedBufferStack.cpp
View File

@ -191,12 +191,6 @@ int32_t SharedBufferBase::getIdentity() const
return stack.identity;
}
size_t SharedBufferBase::getFrontBuffer() const
{
SharedBufferStack& stack( *mSharedStack );
return size_t( stack.head );
}
String8 SharedBufferBase::dump(char const* prefix) const
{
const size_t SIZE = 1024;
@ -281,6 +275,16 @@ ssize_t SharedBufferClient::QueueUpdate::operator()() {
return NO_ERROR;
}
SharedBufferClient::DequeueUpdate::DequeueUpdate(SharedBufferBase* sbb)
: UpdateBase(sbb) {
}
ssize_t SharedBufferClient::DequeueUpdate::operator()() {
if (android_atomic_dec(&stack.available) == 0) {
LOGW("dequeue probably called from multiple threads!");
}
return NO_ERROR;
}
SharedBufferClient::UndoDequeueUpdate::UndoDequeueUpdate(SharedBufferBase* sbb)
: UpdateBase(sbb) {
}
@ -388,12 +392,8 @@ ssize_t SharedBufferClient::dequeue()
if (err != NO_ERROR)
return ssize_t(err);
// NOTE: 'stack.available' is part of the conditions, however
// decrementing it, never changes any conditions, so we don't need
// to do this as part of an update.
if (android_atomic_dec(&stack.available) == 0) {
LOGW("dequeue probably called from multiple threads!");
}
DequeueUpdate update(this);
updateCondition( update );
undoDequeueTail = tail;
int dequeued = stack.index[tail];