summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorChristopher Ferris <cferris@google.com>2014-05-09 16:42:31 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-09 16:42:31 +0000
commit3adbe79d2f14665ff55a9b0db245abebc105658d (patch)
tree02577f4d4fc955fb8324e10f5c205042ad0e50cd /include
parent0f072d1ec2c98abf7a31a8b2610e8342459563f8 (diff)
parent66e31dc51e0d8db595cc1514527c4db6f5cdeba7 (diff)
downloadsystem_core-3adbe79d2f14665ff55a9b0db245abebc105658d.zip
system_core-3adbe79d2f14665ff55a9b0db245abebc105658d.tar.gz
system_core-3adbe79d2f14665ff55a9b0db245abebc105658d.tar.bz2
am 66e31dc5: am 3a088524: Merge "Rewrite unwind thread handling."
* commit '66e31dc51e0d8db595cc1514527c4db6f5cdeba7': Rewrite unwind thread handling.
Diffstat (limited to 'include')
-rw-r--r--include/backtrace/Backtrace.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/backtrace/Backtrace.h b/include/backtrace/Backtrace.h
index 3c3a482..561dfeb 100644
--- a/include/backtrace/Backtrace.h
+++ b/include/backtrace/Backtrace.h
@@ -19,6 +19,7 @@
#include <inttypes.h>
#include <stdint.h>
+#include <ucontext.h>
#include <string>
#include <vector>
@@ -64,7 +65,7 @@ public:
virtual ~Backtrace();
// Get the current stack trace and store in the backtrace_ structure.
- virtual bool Unwind(size_t num_ignore_frames);
+ virtual bool Unwind(size_t num_ignore_frames, ucontext_t* context = NULL);
// Get the function name and offset into the function given the pc.
// If the string is empty, then no valid function name was found.