remove dead/usnused code (55ef3433) · Commits · e / os / android_frameworks_native-old

include/ui/GraphicLog.h

deleted100644 → 0

+0 −70

Original line number	Original line	Diff line number	Diff line
	/*
	* 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.
	*/

	#ifndef _UI_GRAPHIC_LOG_H
	#define _UI_GRAPHIC_LOG_H

	#include <utils/Singleton.h>
	#include <cutils/compiler.h>

	namespace android {

	class GraphicLog : public Singleton<GraphicLog>
	{
	int32_t mEnabled;
	static void logImpl(int32_t tag, int32_t buffer);
	static void logImpl(int32_t tag, int32_t identity, int32_t buffer);

	public:
	enum {
	SF_APP_DEQUEUE_BEFORE = 60100,
	SF_APP_DEQUEUE_AFTER = 60101,
	SF_APP_LOCK_BEFORE = 60102,
	SF_APP_LOCK_AFTER = 60103,
	SF_APP_QUEUE = 60104,

	SF_REPAINT = 60105,
	SF_COMPOSITION_COMPLETE = 60106,
	SF_UNLOCK_CLIENTS = 60107,
	SF_SWAP_BUFFERS = 60108,
	SF_REPAINT_DONE = 60109,

	SF_FB_POST_BEFORE = 60110,
	SF_FB_POST_AFTER = 60111,
	SF_FB_DEQUEUE_BEFORE = 60112,
	SF_FB_DEQUEUE_AFTER = 60113,
	SF_FB_LOCK_BEFORE = 60114,
	SF_FB_LOCK_AFTER = 60115,
	};

	inline void log(int32_t tag, int32_t buffer) {
	if (CC_UNLIKELY(mEnabled))
	logImpl(tag, buffer);
	}
	inline void log(int32_t tag, int32_t identity, int32_t buffer) {
	if (CC_UNLIKELY(mEnabled))
	logImpl(tag, identity, buffer);
	}

	GraphicLog();

	void setEnabled(bool enable);
	};

	}

	#endif // _UI_GRAPHIC_LOG_H

libs/ui/Android.mk

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -47,7 +47,6 @@ LOCAL_SRC_FILES:= \
	GraphicBuffer.cpp \		GraphicBuffer.cpp \
	GraphicBufferAllocator.cpp \		GraphicBufferAllocator.cpp \
	GraphicBufferMapper.cpp \		GraphicBufferMapper.cpp \
	GraphicLog.cpp \
	InputTransport.cpp \		InputTransport.cpp \
	PixelFormat.cpp \		PixelFormat.cpp \
	Rect.cpp \		Rect.cpp \

libs/ui/FramebufferNativeWindow.cpp

+0 −15

Original line number	Original line	Diff line number	Diff line
	@@ -29,7 +29,6 @@

	#include <ui/Rect.h>		#include <ui/Rect.h>
	#include <ui/FramebufferNativeWindow.h>		#include <ui/FramebufferNativeWindow.h>
	#include <ui/GraphicLog.h>

	#include <EGL/egl.h>		#include <EGL/egl.h>

	@@ -211,9 +210,6 @@ int FramebufferNativeWindow::dequeueBuffer(ANativeWindow* window,
	if (self->mBufferHead >= self->mNumBuffers)		if (self->mBufferHead >= self->mNumBuffers)
	self->mBufferHead = 0;		self->mBufferHead = 0;

	GraphicLog& logger(GraphicLog::getInstance());
	logger.log(GraphicLog::SF_FB_DEQUEUE_BEFORE, index);

	// wait for a free buffer		// wait for a free buffer
	while (!self->mNumFreeBuffers) {		while (!self->mNumFreeBuffers) {
	self->mCondition.wait(self->mutex);		self->mCondition.wait(self->mutex);
	@@ -224,7 +220,6 @@ int FramebufferNativeWindow::dequeueBuffer(ANativeWindow* window,

	*buffer = self->buffers[index].get();		*buffer = self->buffers[index].get();

	logger.log(GraphicLog::SF_FB_DEQUEUE_AFTER, index);
	return 0;		return 0;
	}		}

	@@ -235,16 +230,12 @@ int FramebufferNativeWindow::lockBuffer(ANativeWindow* window,
	Mutex::Autolock _l(self->mutex);		Mutex::Autolock _l(self->mutex);

	const int index = self->mCurrentBufferIndex;		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		// wait that the buffer we're locking is not front anymore
	while (self->front == buffer) {		while (self->front == buffer) {
	self->mCondition.wait(self->mutex);		self->mCondition.wait(self->mutex);
	}		}

	logger.log(GraphicLog::SF_FB_LOCK_AFTER, index);

	return NO_ERROR;		return NO_ERROR;
	}		}

	@@ -257,13 +248,7 @@ int FramebufferNativeWindow::queueBuffer(ANativeWindow* window,
	buffer_handle_t handle = static_cast<NativeBuffer*>(buffer)->handle;		buffer_handle_t handle = static_cast<NativeBuffer*>(buffer)->handle;

	const int index = self->mCurrentBufferIndex;		const int index = self->mCurrentBufferIndex;
	GraphicLog& logger(GraphicLog::getInstance());
	logger.log(GraphicLog::SF_FB_POST_BEFORE, index);

	int res = fb->post(fb, handle);		int res = fb->post(fb, handle);

	logger.log(GraphicLog::SF_FB_POST_AFTER, index);

	self->front = static_cast<NativeBuffer*>(buffer);		self->front = static_cast<NativeBuffer*>(buffer);
	self->mNumFreeBuffers++;		self->mNumFreeBuffers++;
	self->mCondition.broadcast();		self->mCondition.broadcast();

libs/ui/GraphicLog.cpp

deleted100644 → 0

+0 −92

Original line number	Original line	Diff line number	Diff line
	/*
	* 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;
	}

	}

services/surfaceflinger/DisplayHardware/DisplayHardware.cpp

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -384,10 +384,6 @@ status_t DisplayHardware::compositionComplete() const {
	return mNativeWindow->compositionComplete();		return mNativeWindow->compositionComplete();
	}		}

	int DisplayHardware::getCurrentBufferIndex() const {
	return mNativeWindow->getCurrentBufferIndex();
	}

	void DisplayHardware::flip(const Region& dirty) const		void DisplayHardware::flip(const Region& dirty) const
	{		{
	checkGLErrors();		checkGLErrors();