Re-enable libunwind for arm.
Update to handle the new optimized way that libunwind works.
In addition, a small refactor of the BacktraceMap code.
A few new tests of for good measure.
Change-Id: I2f9b4f5ad5a0dfe907b31febee76e4b9b94fb76f
diff --git a/debuggerd/tombstone.cpp b/debuggerd/tombstone.cpp
index acb6ed6..f0e63af 100644
--- a/debuggerd/tombstone.cpp
+++ b/debuggerd/tombstone.cpp
@@ -638,12 +638,9 @@
dump_fault_addr(log, tid, signal);
}
- BacktraceMap* map = NULL;
- UniquePtr<Backtrace> backtrace(Backtrace::Create(pid, tid));
+ UniquePtr<BacktraceMap> map(BacktraceMap::Create(pid));
+ UniquePtr<Backtrace> backtrace(Backtrace::Create(pid, tid, map.get()));
if (backtrace->Unwind(0)) {
- // Grab the map that was created and share it with the siblings.
- map = backtrace->TakeMapOwnership();
-
dump_abort_message(backtrace.get(), log, abort_msg_address);
dump_thread(backtrace.get(), log, SCOPE_AT_FAULT, total_sleep_time_usec);
}
@@ -654,12 +651,9 @@
bool detach_failed = false;
if (dump_sibling_threads) {
- detach_failed = dump_sibling_thread_report(log, pid, tid, total_sleep_time_usec, map);
+ detach_failed = dump_sibling_thread_report(log, pid, tid, total_sleep_time_usec, map.get());
}
- // Destroy the BacktraceMap object.
- delete map;
-
if (want_logs) {
dump_logs(log, pid, false);
}