Merge change I0c4cec7e into eclair (0b7b65da) · Commits · e / os / platform_frameworks_native

include/private/ui/SharedBufferStack.h

+9 −7

Original line number	Original line	Diff line number	Diff line
	@@ -142,6 +142,7 @@ public:
	SharedBufferBase(SharedClient* sharedClient, int surface, int num);		SharedBufferBase(SharedClient* sharedClient, int surface, int num);
	~SharedBufferBase();		~SharedBufferBase();
	uint32_t getIdentity();		uint32_t getIdentity();
			status_t getStatus() const;
	size_t getFrontBuffer() const;		size_t getFrontBuffer() const;
	String8 dump(char const* prefix) const;		String8 dump(char const* prefix) const;

	@@ -188,13 +189,14 @@ status_t SharedBufferBase::waitForCondition(T condition)
	if (condition()) {		if (condition()) {
	LOGE("waitForCondition(%s) timed out (identity=%d), "		LOGE("waitForCondition(%s) timed out (identity=%d), "
	"but condition is true! We recovered but it "		"but condition is true! We recovered but it "
	"shouldn't happen." ,		"shouldn't happen." , T::name(),
	T::name(), mSharedStack->identity);		mSharedStack->identity);
	break;		break;
	} else {		} else {
	LOGW("waitForCondition(%s) timed out (identity=%d). "		LOGW("waitForCondition(%s) timed out "
	"CPU may be pegged. trying again.",		"(identity=%d, status=%d). "
	T::name(), mSharedStack->identity);		"CPU may be pegged. trying again.", T::name(),
			mSharedStack->identity, mSharedStack->status);
	}		}
	} else {		} else {
	LOGE("waitForCondition(%s) error (%s) ",		LOGE("waitForCondition(%s) error (%s) ",

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -20,17 +20,12 @@

	#include <utils/Errors.h>		#include <utils/Errors.h>
	#include <utils/Log.h>		#include <utils/Log.h>
	#include <binder/MemoryBase.h>
	#include <binder/IMemory.h>

	#include <ui/PixelFormat.h>		#include <ui/PixelFormat.h>
	#include <ui/Surface.h>
	#include <pixelflinger/pixelflinger.h>		#include <pixelflinger/pixelflinger.h>

	#include "Buffer.h"		#include "Buffer.h"
	#include "BufferAllocator.h"		#include "BufferAllocator.h"
	#include "SurfaceFlinger.h"


	namespace android {		namespace android {

+0 −11

Original line number	Original line	Diff line number	Diff line
	@@ -20,20 +20,11 @@
	#include <stdint.h>		#include <stdint.h>
	#include <sys/types.h>		#include <sys/types.h>

	#include <hardware/gralloc.h>

	#include <utils/Atomic.h>

	#include <ui/PixelFormat.h>		#include <ui/PixelFormat.h>
	#include <ui/Rect.h>		#include <ui/Rect.h>
	#include <ui/Surface.h>

	#include <pixelflinger/pixelflinger.h>		#include <pixelflinger/pixelflinger.h>

	#include <private/ui/SharedBufferStack.h>
	#include <private/ui/SurfaceBuffer.h>		#include <private/ui/SurfaceBuffer.h>

	class copybit_image_t;
	struct android_native_buffer_t;		struct android_native_buffer_t;

	namespace android {		namespace android {
	@@ -42,8 +33,6 @@ namespace android {
	// Buffer		// Buffer
	// ===========================================================================		// ===========================================================================

	class NativeBuffer;

	class Buffer : public SurfaceBuffer		class Buffer : public SurfaceBuffer
	{		{
	public:		public:

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -15,8 +15,6 @@
	** limitations under the License.		** limitations under the License.
	*/		*/

	#include <sys/mman.h>
	#include <cutils/ashmem.h>
	#include <cutils/log.h>		#include <cutils/log.h>

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

+0 −8

Original line number	Original line	Diff line number	Diff line
	@@ -65,14 +65,6 @@ Layer::~Layer()
	// the actual buffers will be destroyed here		// the actual buffers will be destroyed here
	}		}

	// called with SurfaceFlinger::mStateLock as soon as the layer is entered
	// in the purgatory list
	void Layer::onRemoved()
	{
	// wake up the condition
	lcblk->setStatus(NO_INIT);
	}

	void Layer::destroy()		void Layer::destroy()
	{		{
	for (size_t i=0 ; i<NUM_BUFFERS ; i++) {		for (size_t i=0 ; i<NUM_BUFFERS ; i++) {