HWUI: add leak check for macrobench (7dc370bf) · Commits · e / os / android_frameworks_base

libs/hwui/Android.mk

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -104,6 +104,7 @@ hwui_src_files := \

	hwui_test_common_src_files := \		hwui_test_common_src_files := \
	$(call all-cpp-files-under, tests/common/scenes) \		$(call all-cpp-files-under, tests/common/scenes) \
			tests/common/LeakChecker.cpp \
	tests/common/TestListViewSceneBase.cpp \		tests/common/TestListViewSceneBase.cpp \
	tests/common/TestContext.cpp \		tests/common/TestContext.cpp \
	tests/common/TestScene.cpp \		tests/common/TestScene.cpp \
	@@ -307,6 +308,7 @@ LOCAL_C_INCLUDES := $(hwui_c_includes)

	# set to libhwui_static_debug to skip actual GL commands		# set to libhwui_static_debug to skip actual GL commands
	LOCAL_WHOLE_STATIC_LIBRARIES := libhwui_static		LOCAL_WHOLE_STATIC_LIBRARIES := libhwui_static
			LOCAL_SHARED_LIBRARIES := libmemunreachable

	LOCAL_SRC_FILES += \		LOCAL_SRC_FILES += \
	$(hwui_test_common_src_files) \		$(hwui_test_common_src_files) \
	@@ -337,6 +339,7 @@ LOCAL_C_INCLUDES := $(hwui_c_includes)

	LOCAL_WHOLE_STATIC_LIBRARIES := libhwui_static_debug		LOCAL_WHOLE_STATIC_LIBRARIES := libhwui_static_debug
	LOCAL_STATIC_LIBRARIES := libgoogle-benchmark		LOCAL_STATIC_LIBRARIES := libgoogle-benchmark
			LOCAL_SHARED_LIBRARIES := libmemunreachable

	LOCAL_SRC_FILES += \		LOCAL_SRC_FILES += \
	$(hwui_test_common_src_files) \		$(hwui_test_common_src_files) \

libs/hwui/tests/common/LeakChecker.cpp

0 → 100644

+97 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* Copyright (C) 2016 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 "LeakChecker.h"

			#include "Caches.h"
			#include "TestUtils.h"

			#include <cstdio>
			#include <iostream>
			#include <memunreachable/memunreachable.h>
			#include <unistd.h>
			#include <unordered_set>

			using namespace std;

			namespace android {
			namespace uirenderer {
			namespace test {

			static void logUnreachable(initializer_list<UnreachableMemoryInfo> infolist) {
			// merge them all
			UnreachableMemoryInfo merged;
			unordered_set<uintptr_t> addrs;
			merged.allocation_bytes = 0;
			merged.leak_bytes = 0;
			merged.num_allocations = 0;
			merged.num_leaks = 0;
			for (auto& info : infolist) {
			// We'll be a little hazzy about these ones and just hope the biggest
			// is the most accurate
			merged.allocation_bytes = max(merged.allocation_bytes, info.allocation_bytes);
			merged.num_allocations = max(merged.num_allocations, info.num_allocations);
			for (auto& leak : info.leaks) {
			if (addrs.find(leak.begin) == addrs.end()) {
			merged.leaks.push_back(leak);
			merged.num_leaks++;
			merged.leak_bytes += leak.size;
			addrs.insert(leak.begin);
			}
			}
			}

			// Now log the result
			if (merged.num_leaks) {
			cout << endl << "Leaked memory!" << endl;
			if (!merged.leaks[0].backtrace.num_frames) {
			cout << "Re-run with 'setprop libc.debug.malloc.program hwui_unit_test'"
			<< endl << "and 'setprop libc.debug.malloc.options backtrace=8'"
			<< " to get backtraces" << endl;
			}
			cout << merged.ToString(false);
			}
			}

			void LeakChecker::checkForLeaks() {
			// TODO: Until we can shutdown the RT thread we need to do this in
			// two passes as GetUnreachableMemory has limited insight into
			// thread-local caches so some leaks will not be properly tagged as leaks
			nsecs_t before = systemTime();
			UnreachableMemoryInfo rtMemInfo;
			TestUtils::runOnRenderThread([&rtMemInfo](renderthread::RenderThread& thread) {
			if (Caches::hasInstance()) {
			Caches::getInstance().tasks.stop();
			}
			// Check for leaks
			if (!GetUnreachableMemory(rtMemInfo)) {
			cerr << "Failed to get unreachable memory!" << endl;
			return;
			}
			});
			UnreachableMemoryInfo uiMemInfo;
			if (!GetUnreachableMemory(uiMemInfo)) {
			cerr << "Failed to get unreachable memory!" << endl;
			return;
			}
			logUnreachable({rtMemInfo, uiMemInfo});
			nsecs_t after = systemTime();
			cout << "Leak check took " << ns2ms(after - before) << "ms" << endl;
			}

			} /* namespace test */
			} /* namespace uirenderer */
			} /* namespace android */

libs/hwui/tests/common/LeakChecker.h

0 → 100644

+29 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* Copyright (C) 2016 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.
			*/
			#pragma once

			namespace android {
			namespace uirenderer {
			namespace test {

			class LeakChecker {
			public:
			static void checkForLeaks();
			}; // class TestUtils

			} /* namespace test */
			} /* namespace uirenderer */
			} /* namespace android */
			No newline at end of file

libs/hwui/tests/common/TestUtils.cpp

+12 −5

Original line number	Original line	Diff line number	Diff line
	@@ -20,6 +20,7 @@
	#include "DeferredLayerUpdater.h"		#include "DeferredLayerUpdater.h"
	#include "LayerRenderer.h"		#include "LayerRenderer.h"

			#include <renderthread/EglManager.h>
	#include <utils/Unicode.h>		#include <utils/Unicode.h>

	namespace android {		namespace android {
	@@ -112,13 +113,19 @@ void TestUtils::drawUtf8ToCanvas(Canvas* canvas, const char* text,

	void TestUtils::TestTask::run() {		void TestUtils::TestTask::run() {
	// RenderState only valid once RenderThread is running, so queried here		// RenderState only valid once RenderThread is running, so queried here
	RenderState& renderState = renderthread::RenderThread::getInstance().renderState();		renderthread::RenderThread& renderThread = renderthread::RenderThread::getInstance();
			bool hasEglContext = renderThread.eglManager().hasEglContext();
			RenderState& renderState = renderThread.renderState();
			if (!hasEglContext) {
	renderState.onGLContextCreated();		renderState.onGLContextCreated();
	rtCallback(renderthread::RenderThread::getInstance());		}

			rtCallback(renderThread);
			if (!hasEglContext) {
	renderState.flush(Caches::FlushMode::Full);		renderState.flush(Caches::FlushMode::Full);
	renderState.onGLContextDestroyed();		renderState.onGLContextDestroyed();
	}		}
			}

	std::unique_ptr<uint16_t[]> TestUtils::asciiToUtf16(const char* str) {		std::unique_ptr<uint16_t[]> TestUtils::asciiToUtf16(const char* str) {
	const int length = strlen(str);		const int length = strlen(str);

libs/hwui/tests/macrobench/main.cpp

+2 −0

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

			#include "tests/common/LeakChecker.h"
	#include "tests/common/TestScene.h"		#include "tests/common/TestScene.h"

	#include "protos/hwui.pb.h"		#include "protos/hwui.pb.h"
	@@ -262,5 +263,6 @@ int main(int argc, char* argv[]) {
	}		}
	}		}
	printf("Success!\n");		printf("Success!\n");
			LeakChecker::checkForLeaks();
	return 0;		return 0;
	}		}