diff options
author | Christopher Ferris <cferris@google.com> | 2013-11-12 10:54:16 -0800 |
---|---|---|
committer | Christopher Ferris <cferris@google.com> | 2013-11-12 12:14:51 -0800 |
commit | 242b1a8c7a5ec73172bac811e51acbc27201f22c (patch) | |
tree | 70cb208192056547eefc28288ef393ede693a50b /libbacktrace | |
parent | 230e98bfea49f542c145ad5eff57d29feef0cdf9 (diff) | |
download | system_core-242b1a8c7a5ec73172bac811e51acbc27201f22c.zip system_core-242b1a8c7a5ec73172bac811e51acbc27201f22c.tar.gz system_core-242b1a8c7a5ec73172bac811e51acbc27201f22c.tar.bz2 |
Move BACKTRACE_NO_TID to BACKTRACE_CURRENT_THREAD.
Use a bit better name for this. The other name was a bit confusing.
Change-Id: I1261f2ee3854a9c8b82133ad0bfbbbe48b43c9ac
Diffstat (limited to 'libbacktrace')
-rw-r--r-- | libbacktrace/Backtrace.cpp | 4 | ||||
-rw-r--r-- | libbacktrace/backtrace_test.cpp | 31 |
2 files changed, 21 insertions, 14 deletions
diff --git a/libbacktrace/Backtrace.cpp b/libbacktrace/Backtrace.cpp index b22d301..0348d78 100644 --- a/libbacktrace/Backtrace.cpp +++ b/libbacktrace/Backtrace.cpp @@ -214,12 +214,12 @@ bool BacktracePtrace::ReadWord(uintptr_t ptr, uint32_t* out_value) { Backtrace* Backtrace::Create(pid_t pid, pid_t tid) { if (pid == BACKTRACE_CURRENT_PROCESS || pid == getpid()) { - if (tid == BACKTRACE_NO_TID || tid == gettid()) { + if (tid == BACKTRACE_CURRENT_THREAD || tid == gettid()) { return CreateCurrentObj(); } else { return CreateThreadObj(tid); } - } else if (tid == BACKTRACE_NO_TID) { + } else if (tid == BACKTRACE_CURRENT_THREAD) { return CreatePtraceObj(pid, pid); } else { return CreatePtraceObj(pid, tid); diff --git a/libbacktrace/backtrace_test.cpp b/libbacktrace/backtrace_test.cpp index 2603e1f..b894446 100644 --- a/libbacktrace/backtrace_test.cpp +++ b/libbacktrace/backtrace_test.cpp @@ -143,7 +143,8 @@ void VerifyLevelDump(const backtrace_t* backtrace) { void VerifyLevelBacktrace(void*) { backtrace_context_t context; - ASSERT_TRUE(backtrace_create_context(&context, BACKTRACE_CURRENT_PROCESS, BACKTRACE_NO_TID, 0)); + ASSERT_TRUE(backtrace_create_context(&context, BACKTRACE_CURRENT_PROCESS, + BACKTRACE_CURRENT_THREAD, 0)); VerifyLevelDump(context.backtrace); @@ -165,7 +166,8 @@ void VerifyMaxDump(const backtrace_t* backtrace) { void VerifyMaxBacktrace(void*) { backtrace_context_t context; - ASSERT_TRUE(backtrace_create_context(&context, BACKTRACE_CURRENT_PROCESS, BACKTRACE_NO_TID, 0)); + ASSERT_TRUE(backtrace_create_context(&context, BACKTRACE_CURRENT_PROCESS, + BACKTRACE_CURRENT_THREAD, 0)); VerifyMaxDump(context.backtrace); @@ -232,15 +234,18 @@ void VerifyIgnoreFrames( void VerifyLevelIgnoreFrames(void*) { backtrace_context_t all; - ASSERT_TRUE(backtrace_create_context(&all, BACKTRACE_CURRENT_PROCESS, BACKTRACE_NO_TID, 0)); + ASSERT_TRUE(backtrace_create_context(&all, BACKTRACE_CURRENT_PROCESS, + BACKTRACE_CURRENT_THREAD, 0)); ASSERT_TRUE(all.backtrace != NULL); backtrace_context_t ign1; - ASSERT_TRUE(backtrace_create_context(&ign1, BACKTRACE_CURRENT_PROCESS, BACKTRACE_NO_TID, 1)); + ASSERT_TRUE(backtrace_create_context(&ign1, BACKTRACE_CURRENT_PROCESS, + BACKTRACE_CURRENT_THREAD, 1)); ASSERT_TRUE(ign1.backtrace != NULL); backtrace_context_t ign2; - ASSERT_TRUE(backtrace_create_context(&ign2, BACKTRACE_CURRENT_PROCESS, BACKTRACE_NO_TID, 2)); + ASSERT_TRUE(backtrace_create_context(&ign2, BACKTRACE_CURRENT_PROCESS, + BACKTRACE_CURRENT_THREAD, 2)); ASSERT_TRUE(ign2.backtrace != NULL); VerifyIgnoreFrames(all.backtrace, ign1.backtrace, ign2.backtrace, @@ -296,7 +301,7 @@ TEST(libbacktrace, ptrace_trace) { ASSERT_NE(test_level_one(1, 2, 3, 4, NULL, NULL), 0); exit(1); } - VerifyProcTest(pid, BACKTRACE_NO_TID, ReadyLevelBacktrace, VerifyLevelDump); + VerifyProcTest(pid, BACKTRACE_CURRENT_THREAD, ReadyLevelBacktrace, VerifyLevelDump); kill(pid, SIGKILL); int status; @@ -309,7 +314,7 @@ TEST(libbacktrace, ptrace_max_trace) { ASSERT_NE(test_recursive_call(MAX_BACKTRACE_FRAMES+10, NULL, NULL), 0); exit(1); } - VerifyProcTest(pid, BACKTRACE_NO_TID, ReadyMaxBacktrace, VerifyMaxDump); + VerifyProcTest(pid, BACKTRACE_CURRENT_THREAD, ReadyMaxBacktrace, VerifyMaxDump); kill(pid, SIGKILL); int status; @@ -320,11 +325,11 @@ void VerifyProcessIgnoreFrames(const backtrace_t* bt_all) { pid_t pid = bt_all->pid; backtrace_context_t ign1; - ASSERT_TRUE(backtrace_create_context(&ign1, pid, BACKTRACE_NO_TID, 1)); + ASSERT_TRUE(backtrace_create_context(&ign1, pid, BACKTRACE_CURRENT_THREAD, 1)); ASSERT_TRUE(ign1.backtrace != NULL); backtrace_context_t ign2; - ASSERT_TRUE(backtrace_create_context(&ign2, pid, BACKTRACE_NO_TID, 2)); + ASSERT_TRUE(backtrace_create_context(&ign2, pid, BACKTRACE_CURRENT_THREAD, 2)); ASSERT_TRUE(ign2.backtrace != NULL); VerifyIgnoreFrames(bt_all, ign1.backtrace, ign2.backtrace, NULL); @@ -339,7 +344,7 @@ TEST(libbacktrace, ptrace_ignore_frames) { ASSERT_NE(test_level_one(1, 2, 3, 4, NULL, NULL), 0); exit(1); } - VerifyProcTest(pid, BACKTRACE_NO_TID, ReadyLevelBacktrace, VerifyProcessIgnoreFrames); + VerifyProcTest(pid, BACKTRACE_CURRENT_THREAD, ReadyLevelBacktrace, VerifyProcessIgnoreFrames); kill(pid, SIGKILL); int status; @@ -614,10 +619,12 @@ TEST(libbacktrace, thread_multiple_dump) { TEST(libbacktrace, format_test) { backtrace_context_t context; - ASSERT_TRUE(backtrace_create_context(&context, BACKTRACE_CURRENT_PROCESS, BACKTRACE_NO_TID, 0)); + ASSERT_TRUE(backtrace_create_context(&context, BACKTRACE_CURRENT_PROCESS, + BACKTRACE_CURRENT_THREAD, 0)); ASSERT_TRUE(context.backtrace != NULL); - backtrace_frame_data_t* frame = const_cast<backtrace_frame_data_t*>(&context.backtrace->frames[1]); + backtrace_frame_data_t* frame = + const_cast<backtrace_frame_data_t*>(&context.backtrace->frames[1]); backtrace_frame_data_t save_frame = *frame; memset(frame, 0, sizeof(backtrace_frame_data_t)); |