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

Merge "Fix pthread_attr_getstack__main_thread failure on glibc."

Browse Source
This commit is contained in:
Yabin Cui
2015-05-20 22:52:38 +00:00
committed by Gerrit Code Review
parent c02bdc76a2 b0c6f2dba2
commit 4fc106d34b
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/pthread_test.cpp
View File

@@ -1154,6 +1154,7 @@ TEST(pthread, pthread_attr_getstack__main_thread) {
// The two methods of asking for the stack size should agree. // The two methods of asking for the stack size should agree.
EXPECT_EQ(stack_size, stack_size2); EXPECT_EQ(stack_size, stack_size2);
#if defined(__BIONIC__)
// What does /proc/self/maps' [stack] line say? // What does /proc/self/maps' [stack] line say?
void* maps_stack_hi = NULL; void* maps_stack_hi = NULL;
FILE* fp = fopen("/proc/self/maps", "r"); FILE* fp = fopen("/proc/self/maps", "r");
@@ -1170,15 +1171,18 @@ TEST(pthread, pthread_attr_getstack__main_thread) {
} }
fclose(fp); fclose(fp);
// The high address of the /proc/self/maps [stack] region should equal stack_base + stack_size.
// Remember that the stack grows down (and is mapped in on demand), so the low address of the
// region isn't very interesting.
EXPECT_EQ(maps_stack_hi, reinterpret_cast<uint8_t*>(stack_base) + stack_size);
// The stack size should correspond to RLIMIT_STACK. // The stack size should correspond to RLIMIT_STACK.
rlimit rl; rlimit rl;
ASSERT_EQ(0, getrlimit(RLIMIT_STACK, &rl)); ASSERT_EQ(0, getrlimit(RLIMIT_STACK, &rl));
uint64_t original_rlim_cur = rl.rlim_cur; uint64_t original_rlim_cur = rl.rlim_cur;
#if defined(__BIONIC__)
if (rl.rlim_cur == RLIM_INFINITY) { if (rl.rlim_cur == RLIM_INFINITY) {
rl.rlim_cur = 8 * 1024 * 1024; // Bionic reports unlimited stacks as 8MiB. rl.rlim_cur = 8 * 1024 * 1024; // Bionic reports unlimited stacks as 8MiB.
} }
#endif
EXPECT_EQ(rl.rlim_cur, stack_size); EXPECT_EQ(rl.rlim_cur, stack_size);
auto guard = make_scope_guard([&rl, original_rlim_cur]() { auto guard = make_scope_guard([&rl, original_rlim_cur]() {
@@ -1186,11 +1190,6 @@ TEST(pthread, pthread_attr_getstack__main_thread) {
ASSERT_EQ(0, setrlimit(RLIMIT_STACK, &rl)); ASSERT_EQ(0, setrlimit(RLIMIT_STACK, &rl));
}); });
// The high address of the /proc/self/maps [stack] region should equal stack_base + stack_size.
// Remember that the stack grows down (and is mapped in on demand), so the low address of the
// region isn't very interesting.
EXPECT_EQ(maps_stack_hi, reinterpret_cast<uint8_t*>(stack_base) + stack_size);
// //
// What if RLIMIT_STACK is smaller than the stack's current extent? // What if RLIMIT_STACK is smaller than the stack's current extent?
// //
@@ -1218,6 +1217,7 @@ TEST(pthread, pthread_attr_getstack__main_thread) {
EXPECT_EQ(stack_size, stack_size2); EXPECT_EQ(stack_size, stack_size2);
ASSERT_EQ(6666U, stack_size); ASSERT_EQ(6666U, stack_size);
#endif
} }
static void pthread_attr_getstack_18908062_helper(void*) { static void pthread_attr_getstack_18908062_helper(void*) {