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

Fix pthread_attr_getstack__main_thread.

Browse Source 
There were two problems here:

* This would fail when run with unlimited stack, because it didn't know
  that bionic reports unlimited stacks as 8MiB.

* This would leave RLIMIT_STACK small, causing failures to exec (so the
  popen and system tests would fail).

Change-Id: I5b92dc64ca089400223b2d9a3743e9b9d57c1bc2
This commit is contained in:
Elliott Hughes 2014-09-04 16:09:25 -07:00
parent c74a7680a4
commit 27a9aed819
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/pthread_test.cpp
View File

@ -27,6 +27,7 @@
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>
#include "private/ScopeGuard.h"
#include "ScopedSignalHandler.h" #include "ScopedSignalHandler.h"
TEST(pthread, pthread_key_create) { TEST(pthread, pthread_key_create) {
@ -862,8 +863,19 @@ TEST(pthread, pthread_attr_getstack__main_thread) {
// 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;
#if defined(__BIONIC__)
if (rl.rlim_cur == RLIM_INFINITY) {
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 = create_scope_guard([&rl, original_rlim_cur]() {
rl.rlim_cur = original_rlim_cur;
ASSERT_EQ(0, setrlimit(RLIMIT_STACK, &rl));
});
// The high address of the /proc/self/maps [stack] region should equal stack_base + stack_size. // 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 // Remember that the stack grows down (and is mapped in on demand), so the low address of the
// region isn't very interesting. // region isn't very interesting.