summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2012-01-06 15:54:37 -0800
committerMathias Agopian <mathias@google.com>2012-01-11 22:03:41 -0800
commit0db7590ed2785cfa8973dbcb6b93627ea02774ce (patch)
tree4371c3f854095cee97dec40f23b7713c40c611f0 /libs
parent7e9a3706d9236be563341cf076ddd41098e161ea (diff)
downloadframeworks_base-0db7590ed2785cfa8973dbcb6b93627ea02774ce.zip
frameworks_base-0db7590ed2785cfa8973dbcb6b93627ea02774ce.tar.gz
frameworks_base-0db7590ed2785cfa8973dbcb6b93627ea02774ce.tar.bz2
remove dead/usnused code
Change-Id: I6fa2bc6ee01790abd2c1533f043d61a5e5c8d26e
Diffstat (limited to 'libs')
-rw-r--r--libs/ui/Android.mk1
-rw-r--r--libs/ui/FramebufferNativeWindow.cpp15
-rw-r--r--libs/ui/GraphicLog.cpp92
3 files changed, 0 insertions, 108 deletions
diff --git a/libs/ui/Android.mk b/libs/ui/Android.mk
index fbabfc4..f8b4452 100644
--- a/libs/ui/Android.mk
+++ b/libs/ui/Android.mk
@@ -47,7 +47,6 @@ LOCAL_SRC_FILES:= \
GraphicBuffer.cpp \
GraphicBufferAllocator.cpp \
GraphicBufferMapper.cpp \
- GraphicLog.cpp \
InputTransport.cpp \
PixelFormat.cpp \
Rect.cpp \
diff --git a/libs/ui/FramebufferNativeWindow.cpp b/libs/ui/FramebufferNativeWindow.cpp
index f5ed981..d1dca0c 100644
--- a/libs/ui/FramebufferNativeWindow.cpp
+++ b/libs/ui/FramebufferNativeWindow.cpp
@@ -29,7 +29,6 @@
#include <ui/Rect.h>
#include <ui/FramebufferNativeWindow.h>
-#include <ui/GraphicLog.h>
#include <EGL/egl.h>
@@ -211,9 +210,6 @@ int FramebufferNativeWindow::dequeueBuffer(ANativeWindow* window,
if (self->mBufferHead >= self->mNumBuffers)
self->mBufferHead = 0;
- GraphicLog& logger(GraphicLog::getInstance());
- logger.log(GraphicLog::SF_FB_DEQUEUE_BEFORE, index);
-
// wait for a free buffer
while (!self->mNumFreeBuffers) {
self->mCondition.wait(self->mutex);
@@ -224,7 +220,6 @@ int FramebufferNativeWindow::dequeueBuffer(ANativeWindow* window,
*buffer = self->buffers[index].get();
- logger.log(GraphicLog::SF_FB_DEQUEUE_AFTER, index);
return 0;
}
@@ -235,16 +230,12 @@ int FramebufferNativeWindow::lockBuffer(ANativeWindow* window,
Mutex::Autolock _l(self->mutex);
const int index = self->mCurrentBufferIndex;
- GraphicLog& logger(GraphicLog::getInstance());
- logger.log(GraphicLog::SF_FB_LOCK_BEFORE, index);
// wait that the buffer we're locking is not front anymore
while (self->front == buffer) {
self->mCondition.wait(self->mutex);
}
- logger.log(GraphicLog::SF_FB_LOCK_AFTER, index);
-
return NO_ERROR;
}
@@ -257,13 +248,7 @@ int FramebufferNativeWindow::queueBuffer(ANativeWindow* window,
buffer_handle_t handle = static_cast<NativeBuffer*>(buffer)->handle;
const int index = self->mCurrentBufferIndex;
- GraphicLog& logger(GraphicLog::getInstance());
- logger.log(GraphicLog::SF_FB_POST_BEFORE, index);
-
int res = fb->post(fb, handle);
-
- logger.log(GraphicLog::SF_FB_POST_AFTER, index);
-
self->front = static_cast<NativeBuffer*>(buffer);
self->mNumFreeBuffers++;
self->mCondition.broadcast();
diff --git a/libs/ui/GraphicLog.cpp b/libs/ui/GraphicLog.cpp
deleted file mode 100644
index 7ba2779..0000000
--- a/libs/ui/GraphicLog.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <cutils/log.h>
-#include <cutils/properties.h>
-#include <utils/Endian.h>
-#include <utils/Timers.h>
-
-#include <ui/GraphicLog.h>
-
-namespace android {
-
-ANDROID_SINGLETON_STATIC_INSTANCE(GraphicLog)
-
-static inline
-void writeInt32(uint8_t* base, size_t& pos, int32_t value) {
-#ifdef HAVE_LITTLE_ENDIAN
- int32_t v = value;
-#else
- int32_t v = htole32(value);
-#endif
- base[pos] = EVENT_TYPE_INT;
- memcpy(&base[pos+1], &v, sizeof(int32_t));
- pos += 1+sizeof(int32_t);
-}
-
-static inline
-void writeInt64(uint8_t* base, size_t& pos, int64_t value) {
-#ifdef HAVE_LITTLE_ENDIAN
- int64_t v = value;
-#else
- int64_t v = htole64(value);
-#endif
- base[pos] = EVENT_TYPE_LONG;
- memcpy(&base[pos+1], &v, sizeof(int64_t));
- pos += 1+sizeof(int64_t);
-}
-
-void GraphicLog::logImpl(int32_t tag, int32_t buffer)
-{
- uint8_t scratch[2 + 2 + sizeof(int32_t) + sizeof(int64_t)];
- size_t pos = 0;
- scratch[pos++] = EVENT_TYPE_LIST;
- scratch[pos++] = 2;
- writeInt32(scratch, pos, buffer);
- writeInt64(scratch, pos, ns2ms( systemTime( SYSTEM_TIME_MONOTONIC ) ));
- android_bWriteLog(tag, scratch, sizeof(scratch));
-}
-
-void GraphicLog::logImpl(int32_t tag, int32_t identity, int32_t buffer)
-{
- uint8_t scratch[2 + 3 + sizeof(int32_t) + sizeof(int32_t) + sizeof(int64_t)];
- size_t pos = 0;
- scratch[pos++] = EVENT_TYPE_LIST;
- scratch[pos++] = 3;
- writeInt32(scratch, pos, buffer);
- writeInt32(scratch, pos, identity);
- writeInt64(scratch, pos, ns2ms( systemTime( SYSTEM_TIME_MONOTONIC ) ));
- android_bWriteLog(tag, scratch, sizeof(scratch));
-}
-
-GraphicLog::GraphicLog()
- : mEnabled(0)
-{
- char property[PROPERTY_VALUE_MAX];
- if (property_get("debug.graphic_log", property, NULL) > 0) {
- mEnabled = atoi(property);
- }
-}
-
-void GraphicLog::setEnabled(bool enable)
-{
- mEnabled = enable;
-}
-
-}