diff options
| author | Andreas Gampe <agampe@google.com> | 2015-01-08 17:38:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-01-08 17:38:02 +0000 |
| commit | 553727e466942a10e11ee39dcb67e3f9562b471e (patch) | |
| tree | 3071b04254e7e61d4060a6db473a14529f848da4 /runtime/utils.cc | |
| parent | 97d091d0a1667592e15bac44e21dc94f9fc032fc (diff) | |
| parent | 628a61ac52a8a314e74ab445397add60b4e72a5b (diff) | |
| download | art-553727e466942a10e11ee39dcb67e3f9562b471e.tar.gz art-553727e466942a10e11ee39dcb67e3f9562b471e.tar.bz2 art-553727e466942a10e11ee39dcb67e3f9562b471e.zip | |
Merge "ART: Pass ucontext to Backtrace in Stack Dump"
Diffstat (limited to 'runtime/utils.cc')
| -rw-r--r-- | runtime/utils.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/utils.cc b/runtime/utils.cc index 1211547a5..7234ec095 100644 --- a/runtime/utils.cc +++ b/runtime/utils.cc @@ -1118,7 +1118,7 @@ std::string GetSchedulerGroupName(pid_t tid) { } void DumpNativeStack(std::ostream& os, pid_t tid, const char* prefix, - mirror::ArtMethod* current_method) { + mirror::ArtMethod* current_method, void* ucontext_ptr) { #if __linux__ // b/18119146 if (RUNNING_ON_VALGRIND != 0) { @@ -1134,7 +1134,7 @@ void DumpNativeStack(std::ostream& os, pid_t tid, const char* prefix, #endif std::unique_ptr<Backtrace> backtrace(Backtrace::Create(BACKTRACE_CURRENT_PROCESS, tid)); - if (!backtrace->Unwind(0)) { + if (!backtrace->Unwind(0, reinterpret_cast<ucontext*>(ucontext_ptr))) { os << prefix << "(backtrace::Unwind failed for thread " << tid << ")\n"; return; } else if (backtrace->NumFrames() == 0) { |