tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am 2e47c8ac: am 1e1bae1b: am c2945850: Merge "Add some clarifying defines."

Browse source 
* commit '2e47c8ac74e070d62cfb46355c7c04797657c594':
  Add some clarifying defines.
This commit is contained in:
Christopher Ferris 2013-11-05 14:22:20 -08:00 committed by Android Git Automerger
commit 0186edee58
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/backtrace/backtrace.h
View file

@ -23,6 +23,14 @@
__BEGIN_DECLS
// When the pid to be traced is set to this value, then trace the current
// process. If the tid value is not BACKTRACE_NO_TID, then the specified
// thread from the current process will be traced.
#define BACKTRACE_CURRENT_PROCESS -1
// When the tid to be traced is set to this value, then trace the specified
// pid.
#define BACKTRACE_NO_TID -1
#define MAX_BACKTRACE_FRAMES 64
typedef struct backtrace_map_info {

6
libbacktrace/Backtrace.cpp
View file

@ -213,13 +213,13 @@ bool BacktracePtrace::ReadWord(uintptr_t ptr, uint32_t* out_value) {
}
Backtrace* Backtrace::Create(pid_t pid, pid_t tid) {
if (pid < 0 || pid == getpid()) {
if (tid < 0 || tid == gettid()) {
if (pid == BACKTRACE_CURRENT_PROCESS || pid == getpid()) {
if (tid == BACKTRACE_NO_TID || tid == gettid()) {
return CreateCurrentObj();
} else {
return CreateThreadObj(tid);
}
} else if (tid < 0) {
} else if (tid == BACKTRACE_NO_TID) {
return CreatePtraceObj(pid, pid);
} else {
return CreatePtraceObj(pid, tid);