ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 2d659286: am 2e59d2c3: DO NOT MERGE GraphicBufferAllocator: make frees async

Browse Source 
* commit '2d659286b59dc7ff7378fe967f1c425e92155995':
  DO NOT MERGE GraphicBufferAllocator: make frees async
This commit is contained in:
Jamie Gennis 2012-12-07 10:59:29 -08:00 committed by Android Git Automerger
commit 7df16644c4
2 changed files with 57 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/ui/GraphicBufferAllocator.h
View File

@ -84,6 +84,7 @@ private:
static KeyedVector<buffer_handle_t, alloc_rec_t> sAllocList;
friend class Singleton<GraphicBufferAllocator>;
friend class BufferLiberatorThread;
GraphicBufferAllocator();
~GraphicBufferAllocator();

68
libs/ui/GraphicBufferAllocator.cpp
View File

@ -129,21 +129,65 @@ status_t GraphicBufferAllocator::alloc(uint32_t w, uint32_t h, PixelFormat forma
return err;
}
status_t GraphicBufferAllocator::free(buffer_handle_t handle)
{
ATRACE_CALL();
status_t err;
class BufferLiberatorThread : public Thread {
public:
err = mAllocDev->free(mAllocDev, handle);
ALOGW_IF(err, "free(...) failed %d (%s)", err, strerror(-err));
if (err == NO_ERROR) {
Mutex::Autolock _l(sLock);
KeyedVector<buffer_handle_t, alloc_rec_t>& list(sAllocList);
list.removeItem(handle);
static void queueCaptiveBuffer(buffer_handle_t handle) {
static sp<BufferLiberatorThread> thread(new BufferLiberatorThread);
static bool running = false;
if (!running) {
thread->run("BufferLiberator");
running = true;
}
{
Mutex::Autolock lock(thread->mMutex);
thread->mQueue.push_back(handle);
thread->mCondition.signal();
}
}
return err;
private:
BufferLiberatorThread() {}
virtual bool threadLoop() {
buffer_handle_t handle;
{
Mutex::Autolock lock(mMutex);
while (mQueue.isEmpty()) {
mCondition.wait(mMutex);
}
handle = mQueue[0];
mQueue.removeAt(0);
}
status_t err;
GraphicBufferAllocator& gba(GraphicBufferAllocator::get());
{ // Scope for tracing
ATRACE_NAME("gralloc::free");
err = gba.mAllocDev->free(gba.mAllocDev, handle);
}
ALOGW_IF(err, "free(...) failed %d (%s)", err, strerror(-err));
if (err == NO_ERROR) {
Mutex::Autolock _l(GraphicBufferAllocator::sLock);
KeyedVector<buffer_handle_t, GraphicBufferAllocator::alloc_rec_t>&
list(GraphicBufferAllocator::sAllocList);
list.removeItem(handle);
}
return true;
}
Vector<buffer_handle_t> mQueue;
Condition mCondition;
Mutex mMutex;
};
status_t GraphicBufferAllocator::free(buffer_handle_t handle)
{
BufferLiberatorThread::queueCaptiveBuffer(handle);
return NO_ERROR;
}
// ---------------------------------------------------------------------------