Merge "libBacktraceOffline: fix using debug frame with load bias." (b0c29e76) · Commits · e / os / android_system_core

libbacktrace/BacktraceOffline.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -320,7 +320,7 @@ bool BacktraceOffline::FindProcInfo(unw_addr_space_t addr_space, uint64_t ip,
		}
		if (debug_frame->has_debug_frame \|\| debug_frame->has_gnu_debugdata) {
		unw_dyn_info_t di;
		unw_word_t segbase = map.start - map.offset;
		unw_word_t segbase = map.start - debug_frame->min_vaddr;
		// TODO: http://b/32916571
		// TODO: Do it ourselves is more efficient than calling libunwind functions.
		int found = dwarf_find_debug_frame(0, &di, ip, segbase, filename.c_str(), map.start, map.end);

libbacktrace/backtrace_offline_test.cpp

+51 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@
		#include <vector>

		#include <android-base/file.h>
		#include <android-base/logging.h>
		#include <android-base/macros.h>
		#include <android-base/stringprintf.h>
		#include <android-base/strings.h>
		@@ -251,12 +252,21 @@ bool ReadOfflineTestData(const std::string offline_testdata_path, OfflineTestDat
		return false;
		}
		HexStringToRawData(&line[pos], &testdata->unw_context, size);
		#if defined(__arm__)
		} else if (android::base::StartsWith(line, "regs:")) {
		uint64_t pc;
		uint64_t sp;
		sscanf(line.c_str(), "regs: pc: %" SCNx64 " sp: %" SCNx64, &pc, &sp);
		testdata->unw_context.regs[13] = sp;
		testdata->unw_context.regs[15] = pc;
		#endif
		} else if (android::base::StartsWith(line, "stack:")) {
		size_t size;
		int pos;
		sscanf(line.c_str(),
		"stack: start: %" SCNx64 " end: %" SCNx64 " size: %zu %n",
		&testdata->stack_info.start, &testdata->stack_info.end, &size, &pos);
		CHECK_EQ(testdata->stack_info.end - testdata->stack_info.start, size);
		testdata->stack.resize(size);
		HexStringToRawData(&line[pos], &testdata->stack[0], size);
		testdata->stack_info.data = testdata->stack.data();
		@@ -391,3 +401,44 @@ TEST(libbacktrace, offline_unwind_mix_eh_frame_and_arm_exidx) {
		ASSERT_EQ(name, testdata.symbols[i].name);
		}
		}

		TEST(libbacktrace, offline_debug_frame_with_load_bias) {
		if (std::string(ABI_STRING) != "arm") {
		GTEST_LOG_(INFO) << "Skipping test since offline for arm on " << ABI_STRING
		<< " isn't supported.";
		return;
		}
		const std::string testlib_path(GetTestPath("libandroid_runtime.so"));
		struct stat st;
		ASSERT_EQ(0, stat(testlib_path.c_str(), &st)) << "can't find testlib " << testlib_path;

		const std::string offline_testdata_path(GetTestPath("offline_testdata_for_libandroid_runtime"));
		OfflineTestData testdata;
		ASSERT_TRUE(ReadOfflineTestData(offline_testdata_path, &testdata));

		// Fix path of /system/lib/libandroid_runtime.so.
		for (auto& map : testdata.maps) {
		if (map.name.find("libandroid_runtime.so") != std::string::npos) {
		map.name = testlib_path;
		}
		}

		// Do offline backtrace.
		std::unique_ptr<BacktraceMap> map(BacktraceMap::Create(testdata.pid, testdata.maps));
		ASSERT_TRUE(map != nullptr);

		std::unique_ptr<Backtrace> backtrace(
		Backtrace::CreateOffline(testdata.pid, testdata.tid, map.get(), testdata.stack_info));
		ASSERT_TRUE(backtrace != nullptr);

		ucontext_t ucontext = GetUContextFromUnwContext(testdata.unw_context);
		ASSERT_TRUE(backtrace->Unwind(0, &ucontext));

		ASSERT_EQ(testdata.symbols.size(), backtrace->NumFrames());
		for (size_t i = 0; i < backtrace->NumFrames(); ++i) {
		uintptr_t vaddr_in_file =
		backtrace->GetFrame(i)->pc - testdata.maps[0].start + testdata.maps[0].load_bias;
		std::string name = FunctionNameForAddress(vaddr_in_file, testdata.symbols);
		ASSERT_EQ(name, testdata.symbols[i].name);
		}
		}

libbacktrace/testdata/arm/libandroid_runtime.so

0 → 100644

+1.36 MiB

File added.

No diff preview for this file type.

View file

libbacktrace/testdata/arm/offline_testdata_for_libandroid_runtime

0 → 100644

+6 −0

Original line number	Diff line number	Diff line
		pid: 7288 tid: 31656
		regs: pc: f1f6dc49 sp: d8fe6930
		map: start: f1f10000 end: f2049000 offset: 0 load_bias: 10000 flags: 5 name: /system/lib/libandroid_runtime.so
		stack: start: d8fe6954 end: d8fe6958 size: 4 e7dcf6f1
		function: start: 6dbf9 end: 6dce5 name: android::AndroidRuntime::javaThreadShell
		function: start: 6dce5 end: 6dd79 name: android::AndroidRuntime::javaCreateThreadEtc