generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 6880ec44: am d687905f: Merge "Display errors instead of running infinitely."

Browse Source 
* commit '6880ec44c339a720ebc9128fb6a11362ca7d5634':
  Display errors instead of running infinitely.
This commit is contained in:
Christopher Ferris
2015-02-07 02:30:28 +00:00
committed by Android Git Automerger
parent 5690237c6f 6880ec44c3
commit e66b2780a7
1 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
tests/stack_unwinding_test.cpp
View File

@@ -73,37 +73,47 @@ TEST(stack_unwinding, easy) {
ASSERT_EQ(count + 1, deeper_count); ASSERT_EQ(count + 1, deeper_count);
} }
static volatile bool signal_handler_run = false; struct UnwindData {
static int killer_count = 0; volatile bool signal_handler_complete = false;
static int handler_count = 0; int expected_frame_count = 0;
static int handler_one_deeper_count = 0; int handler_frame_count = 0;
int handler_one_deeper_frame_count = 0;
};
static UnwindData g_unwind_data;
static void noinline UnwindSignalHandler(int) { static void noinline UnwindSignalHandler(int) {
_Unwind_Backtrace(FrameCounter, &handler_count); _Unwind_Backtrace(FrameCounter, &g_unwind_data.handler_frame_count);
ASSERT_GT(handler_count, killer_count);
handler_one_deeper_count = unwind_one_frame_deeper(); g_unwind_data.handler_one_deeper_frame_count = unwind_one_frame_deeper();
ASSERT_EQ(handler_count + 1, handler_one_deeper_count); g_unwind_data.signal_handler_complete = true;
signal_handler_run = true; }
static void verify_unwind_data(const UnwindData& unwind_data) {
EXPECT_GT(unwind_data.handler_frame_count, unwind_data.expected_frame_count);
EXPECT_EQ(unwind_data.handler_frame_count + 1, unwind_data.handler_one_deeper_frame_count);
} }
TEST(stack_unwinding, unwind_through_signal_frame) { TEST(stack_unwinding, unwind_through_signal_frame) {
killer_count = handler_count = handler_one_deeper_count = 0; g_unwind_data = {};
ScopedSignalHandler ssh(SIGUSR1, UnwindSignalHandler); ScopedSignalHandler ssh(SIGUSR1, UnwindSignalHandler);
_Unwind_Backtrace(FrameCounter, &killer_count); _Unwind_Backtrace(FrameCounter, &g_unwind_data.expected_frame_count);
signal_handler_run = false;
ASSERT_EQ(0, kill(getpid(), SIGUSR1)); ASSERT_EQ(0, kill(getpid(), SIGUSR1));
while (!signal_handler_run) {} while (!g_unwind_data.signal_handler_complete) {}
verify_unwind_data(g_unwind_data);
} }
// On LP32, the SA_SIGINFO flag gets you __restore_rt instead of __restore. // On LP32, the SA_SIGINFO flag gets you __restore_rt instead of __restore.
TEST(stack_unwinding, unwind_through_signal_frame_SA_SIGINFO) { TEST(stack_unwinding, unwind_through_signal_frame_SA_SIGINFO) {
killer_count = handler_count = handler_one_deeper_count = 0; g_unwind_data = {};
ScopedSignalHandler ssh(SIGUSR1, UnwindSignalHandler, SA_SIGINFO); ScopedSignalHandler ssh(SIGUSR1, UnwindSignalHandler, SA_SIGINFO);
_Unwind_Backtrace(FrameCounter, &killer_count); _Unwind_Backtrace(FrameCounter, &g_unwind_data.expected_frame_count);
signal_handler_run = false;
ASSERT_EQ(0, kill(getpid(), SIGUSR1)); ASSERT_EQ(0, kill(getpid(), SIGUSR1));
while (!signal_handler_run) {} while (!g_unwind_data.signal_handler_complete) {}
verify_unwind_data(g_unwind_data);
} }