commit c130d42aab615e764e1c95aa3ace0a2e3df555cd
author Karl Wiberg <kwiberg@webrtc.org> Thu Feb 28 17:06:54 2019 +0100
committer Commit Bot <commit-bot@chromium.org> Mon Mar 04 10:31:40 2019 +0000
tree 0c7e71d853349cb49f8e9a3f1da74f852ca9e3ba
parent 8b8d01ada30bd2a5ba810fe7f2bc8577f973f6fc

Add ability to unwind stack for the current thread

Bug: webrtc:10308
Change-Id: Ia82cb7512524bede8da69bbc747ece6e718733ab
Reviewed-on: https://webrtc-review.googlesource.com/c/124993
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Commit-Queue: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26945}

sdk/android/native_api/stacktrace/stacktrace.cc

diff --git a/sdk/android/native_api/stacktrace/stacktrace.cc b/sdk/android/native_api/stacktrace/stacktrace.cc
index 8268ff5..64adf44 100644
--- a/sdk/android/native_api/stacktrace/stacktrace.cc
+++ b/sdk/android/native_api/stacktrace/stacktrace.cc
@@ -164,26 +164,9 @@
   return nullptr;
 }
 
-}  // namespace
-
-std::vector<StackTraceElement> GetStackTrace(int tid) {
-  // Only a thread itself can unwind its stack, so we will interrupt the given
-  // tid with a custom signal handler in order to unwind its stack. The stack
-  // will be recorded to |params| through the use of the global pointer
-  // |g_signal_handler_param|.
-  SignalHandlerOutputState params;
-
-  const char* error_string = CaptureRawStacktrace(getpid(), tid, &params);
-  if (error_string != nullptr) {
-    RTC_LOG(LS_ERROR) << error_string << ". tid: " << tid
-                      << ". errno: " << errno;
-    return {};
-  }
-
-  if (params.stack_size_counter >= kMaxStackSize)
-    RTC_LOG(LS_WARNING) << "Stack trace for thread " << tid << " was truncated";
-
-  // Translate addresses into symbolic information using dladdr().
+// Translate addresses into symbolic information using dladdr().
+std::vector<StackTraceElement> FormatStackTrace(
+    const SignalHandlerOutputState& params) {
   std::vector<StackTraceElement> stack_trace;
   for (size_t i = 0; i < params.stack_size_counter; ++i) {
     const uintptr_t address = params.addresses[i];
@@ -208,6 +191,36 @@
   return stack_trace;
 }
 
+}  // namespace
+
+std::vector<StackTraceElement> GetStackTrace(int tid) {
+  // Only a thread itself can unwind its stack, so we will interrupt the given
+  // tid with a custom signal handler in order to unwind its stack. The stack
+  // will be recorded to |params| through the use of the global pointer
+  // |g_signal_handler_param|.
+  SignalHandlerOutputState params;
+
+  const char* error_string = CaptureRawStacktrace(getpid(), tid, &params);
+  if (error_string != nullptr) {
+    RTC_LOG(LS_ERROR) << error_string << ". tid: " << tid
+                      << ". errno: " << errno;
+    return {};
+  }
+  if (params.stack_size_counter >= kMaxStackSize) {
+    RTC_LOG(LS_WARNING) << "Stack trace for thread " << tid << " was truncated";
+  }
+  return FormatStackTrace(params);
+}
+
+std::vector<StackTraceElement> GetStackTrace() {
+  SignalHandlerOutputState params;
+  _Unwind_Backtrace(&UnwindBacktrace, &params);
+  if (params.stack_size_counter >= kMaxStackSize) {
+    RTC_LOG(LS_WARNING) << "Stack trace was truncated";
+  }
+  return FormatStackTrace(params);
+}
+
 std::string StackTraceToString(
     const std::vector<StackTraceElement>& stack_trace) {
   rtc::StringBuilder string_builder;