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

Simplify main thread stack size initialization

Browse Source 
Change-Id: Iec09433d9de501031cce09dc75848a5e8f3d96bf
This commit is contained in:
Brian Carlstrom
2013-09-13 16:34:43 -07:00
parent 322e7bce23
commit 50af69e8f3
3 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libc/bionic/libc_init_common.cpp
View File

@@ -64,19 +64,15 @@ uintptr_t __stack_chk_guard = 0;
unsigned int __page_size = PAGE_SIZE;
unsigned int __page_shift = PAGE_SHIFT;
static size_t get_stack_size() {
const size_t minimal_stack_size = 128 * 1024;
size_t stack_size = minimal_stack_size;
struct rlimit stack_limit;
static size_t get_main_thread_stack_size() {
rlimit stack_limit;
int rlimit_result = getrlimit(RLIMIT_STACK, &stack_limit);
if ((rlimit_result == 0) && (stack_limit.rlim_cur != RLIM_INFINITY)) {
stack_size = stack_limit.rlim_cur;
stack_size = (stack_size & ~(PAGE_SIZE - 1));
if (stack_size < minimal_stack_size) {
stack_size = minimal_stack_size;
}
if ((rlimit_result == 0) &&
(stack_limit.rlim_cur != RLIM_INFINITY) &&
(stack_limit.rlim_cur > PTHREAD_STACK_MIN)) {
return (stack_limit.rlim_cur & ~(PAGE_SIZE - 1));
}
return stack_size;
return PTHREAD_STACK_SIZE_DEFAULT;
}
/* Init TLS for the initial thread. Called by the linker _before_ libc is mapped
@@ -94,7 +90,7 @@ void __libc_init_tls(KernelArgumentBlock& args) {
__libc_auxv = args.auxv;
uintptr_t stack_top = (__get_sp() & ~(PAGE_SIZE - 1)) + PAGE_SIZE;
size_t stack_size = get_stack_size();
size_t stack_size = get_main_thread_stack_size();
uintptr_t stack_bottom = stack_top - stack_size;
static void* tls[BIONIC_TLS_SLOTS];