Merge "Teach LA how to destroy" (c552da43) · Commits · e / os / android_frameworks_base

libs/hwui/DeferredDisplayList.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -127,7 +127,7 @@ private:
		}

		void tryRecycleState(DeferredDisplayState* state) {
		mAllocator.rewindIfLastAlloc(state, sizeof(DeferredDisplayState));
		mAllocator.rewindIfLastAlloc(state);
		}

		/**

libs/hwui/tests/Android.mk

+0 −13

Original line number	Diff line number	Diff line
		@@ -34,16 +34,3 @@ LOCAL_SRC_FILES += \
		tests/main.cpp

		include $(BUILD_EXECUTABLE)

		include $(CLEAR_VARS)

		LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.common.mk
		LOCAL_MODULE := hwui_unit_tests
		LOCAL_MODULE_TAGS := tests

		include $(LOCAL_PATH)/Android.common.mk

		LOCAL_SRC_FILES += \
		tests/ClipAreaTests.cpp \

		include $(BUILD_NATIVE_TEST)

libs/hwui/unit_tests/Android.mk

0 → 100644

+34 −0

Original line number	Diff line number	Diff line
		#
		# Copyright (C) 2014 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.
		#

		local_target_dir := $(TARGET_OUT_DATA)/local/tmp
		LOCAL_PATH:= $(call my-dir)/..

		include $(CLEAR_VARS)

		LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.common.mk
		LOCAL_MODULE := hwui_unit_tests
		LOCAL_MODULE_TAGS := tests

		include $(LOCAL_PATH)/Android.common.mk

		LOCAL_SRC_FILES += \
		unit_tests/ClipAreaTests.cpp \
		unit_tests/LinearAllocatorTests.cpp \
		unit_tests/main.cpp


		include $(BUILD_NATIVE_TEST)

libs/hwui/tests/ClipAreaTests.cpp→libs/hwui/unit_tests/ClipAreaTests.cpp

+0 −0

File moved.

View file

libs/hwui/unit_tests/LinearAllocatorTests.cpp

0 → 100644

+108 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2015 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 <gtest/gtest.h>
		#include <utils/LinearAllocator.h>

		using namespace android;
		using namespace android::uirenderer;

		struct SimplePair {
		int one = 1;
		int two = 2;
		};

		class SignalingDtor {
		public:
		SignalingDtor() {
		mDestroyed = nullptr;
		}
		SignalingDtor(bool* destroyedSignal) {
		mDestroyed = destroyedSignal;
		*mDestroyed = false;
		}
		virtual ~SignalingDtor() {
		if (mDestroyed) {
		*mDestroyed = true;
		}
		}
		void setSignal(bool* destroyedSignal) {
		mDestroyed = destroyedSignal;
		}
		private:
		bool* mDestroyed;
		};

		TEST(LinearAllocator, alloc) {
		LinearAllocator la;
		EXPECT_EQ(0u, la.usedSize());
		la.alloc(64);
		// There's some internal tracking as well as padding
		// so the usedSize isn't strictly defined
		EXPECT_LE(64u, la.usedSize());
		EXPECT_GT(80u, la.usedSize());
		auto pair = la.alloc<SimplePair>();
		EXPECT_LE(64u + sizeof(SimplePair), la.usedSize());
		EXPECT_GT(80u + sizeof(SimplePair), la.usedSize());
		EXPECT_EQ(1, pair->one);
		EXPECT_EQ(2, pair->two);
		}

		TEST(LinearAllocator, dtor) {
		bool destroyed[10];
		{
		LinearAllocator la;
		for (int i = 0; i < 5; i++) {
		la.alloc<SignalingDtor>()->setSignal(destroyed + i);
		la.alloc<SimplePair>();
		}
		la.alloc(100);
		for (int i = 0; i < 5; i++) {
		auto sd = new (la) SignalingDtor(destroyed + 5 + i);
		la.autoDestroy(sd);
		new (la) SimplePair();
		}
		la.alloc(100);
		for (int i = 0; i < 10; i++) {
		EXPECT_FALSE(destroyed[i]);
		}
		}
		for (int i = 0; i < 10; i++) {
		EXPECT_TRUE(destroyed[i]);
		}
		}

		TEST(LinearAllocator, rewind) {
		bool destroyed;
		{
		LinearAllocator la;
		auto addr = la.alloc(100);
		EXPECT_LE(100u, la.usedSize());
		la.rewindIfLastAlloc(addr, 100);
		EXPECT_GT(16u, la.usedSize());
		size_t emptySize = la.usedSize();
		auto sigdtor = la.alloc<SignalingDtor>();
		sigdtor->setSignal(&destroyed);
		EXPECT_FALSE(destroyed);
		EXPECT_LE(emptySize, la.usedSize());
		la.rewindIfLastAlloc(sigdtor);
		EXPECT_TRUE(destroyed);
		EXPECT_EQ(emptySize, la.usedSize());
		destroyed = false;
		}
		// Checking for a double-destroy case
		EXPECT_EQ(destroyed, false);
		}