summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2012-03-05 19:41:29 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-03-05 19:41:29 -0800
commit18364b31fcac0d3e3683c2d2ed13bad79c391935 (patch)
treee5822613c1308ba6ba5c68341ce4bbec9edbbbee
parent97a355a9a10ce762ec56a1d02e9c04e54c2f0902 (diff)
parentd1220b904d3313fbfd6bd32fa890741b06658ba3 (diff)
downloadframeworks_base-18364b31fcac0d3e3683c2d2ed13bad79c391935.zip
frameworks_base-18364b31fcac0d3e3683c2d2ed13bad79c391935.tar.gz
frameworks_base-18364b31fcac0d3e3683c2d2ed13bad79c391935.tar.bz2
Merge "Add ATRACEs for Buffer indices"
-rw-r--r--libs/gui/BufferQueue.cpp15
1 files changed, 15 insertions, 0 deletions
diff --git a/libs/gui/BufferQueue.cpp b/libs/gui/BufferQueue.cpp
index f0641e0..25a4c22 100644
--- a/libs/gui/BufferQueue.cpp
+++ b/libs/gui/BufferQueue.cpp
@@ -56,6 +56,11 @@
#define ST_LOGW(x, ...) ALOGW("[%s] "x, mConsumerName.string(), ##__VA_ARGS__)
#define ST_LOGE(x, ...) ALOGE("[%s] "x, mConsumerName.string(), ##__VA_ARGS__)
+#define ATRACE_BUFFER_INDEX(index) \
+ char ___traceBuf[1024]; \
+ snprintf(___traceBuf, 1024, "%s: %d", mConsumerName.string(), (index)); \
+ android::ScopedTrace ___bufTracer(ATRACE_TAG, ___traceBuf);
+
namespace android {
// Get an ID that's unique within this process.
@@ -387,6 +392,8 @@ status_t BufferQueue::dequeueBuffer(int *outBuf, uint32_t w, uint32_t h,
const int buf = found;
*outBuf = found;
+ ATRACE_BUFFER_INDEX(buf);
+
const bool useDefaultSize = !w && !h;
if (useDefaultSize) {
// use the default size
@@ -497,6 +504,8 @@ status_t BufferQueue::setSynchronousMode(bool enabled) {
status_t BufferQueue::queueBuffer(int buf, int64_t timestamp,
uint32_t* outWidth, uint32_t* outHeight, uint32_t* outTransform) {
ATRACE_CALL();
+ ATRACE_BUFFER_INDEX(buf);
+
ST_LOGV("queueBuffer: slot=%d time=%lld", buf, timestamp);
sp<FrameAvailableListener> listener;
@@ -810,6 +819,7 @@ void BufferQueue::freeAllBuffersLocked() {
}
status_t BufferQueue::acquire(BufferItem *buffer) {
+ ATRACE_CALL();
Mutex::Autolock _l(mMutex);
// check if queue is empty
// In asynchronous mode the list is guaranteed to be one buffer
@@ -818,6 +828,8 @@ status_t BufferQueue::acquire(BufferItem *buffer) {
Fifo::iterator front(mQueue.begin());
int buf = *front;
+ ATRACE_BUFFER_INDEX(buf);
+
if (mSlots[buf].mAcquireCalled) {
buffer->mGraphicBuffer = NULL;
}
@@ -846,6 +858,9 @@ status_t BufferQueue::acquire(BufferItem *buffer) {
status_t BufferQueue::releaseBuffer(int buf, EGLDisplay display,
EGLSyncKHR fence) {
+ ATRACE_CALL();
+ ATRACE_BUFFER_INDEX(buf);
+
Mutex::Autolock _l(mMutex);
if (buf == INVALID_BUFFER_SLOT) {