diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2023-09-03 21:11:09 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2023-09-03 21:11:29 +0200 |
| commit | 807690610916df8aef17cd14bfadd5d4b6e699a9 (patch) | |
| tree | 68cab9abda1b2d152859db64630b431a268e1a97 | |
| parent | 89ade8d8cb4c4f015942ab9b1319397b223012cf (diff) | |
htl: Fix stack information for main thread
We can easily directly ask the kernel with vm_region rather than
assuming a one-page stack.
| -rw-r--r-- | sysdeps/mach/hurd/htl/pt-sysdep.c | 30 |
1 files changed, 27 insertions, 3 deletions
diff --git a/sysdeps/mach/hurd/htl/pt-sysdep.c b/sysdeps/mach/hurd/htl/pt-sysdep.c index 030a7c7a9e..afef7841f8 100644 --- a/sysdeps/mach/hurd/htl/pt-sysdep.c +++ b/sysdeps/mach/hurd/htl/pt-sysdep.c @@ -60,12 +60,36 @@ _init_routine (void *stack) if (stack != NULL) { - /* We are getting initialized due to dlopening a library using libpthread - while the main program was not linked against libpthread. */ + /* We are given a stack, use it. */ + + /* Get the stack area information */ + vm_address_t addr = (vm_address_t) stack; + vm_size_t vm_size; + vm_prot_t prot, max_prot; + vm_inherit_t inherit; + boolean_t is_shared; + memory_object_name_t obj; + vm_offset_t offset; + + if (vm_region (__mach_task_self (), &addr, + &vm_size, &prot, &max_prot, &inherit, &is_shared, + &obj, &offset) == KERN_SUCCESS) + __mach_port_deallocate (__mach_task_self (), obj); + else + { + /* Uh. Assume at least a page. */ + vm_size = __vm_page_size; +#if _STACK_GROWS_DOWN + addr = (vm_address_t) stack - vm_size; +#else + addr = (vm_address_t) stack + vm_size; +#endif + } + /* Avoid allocating another stack */ attrp = &attr; __pthread_attr_init (attrp); - __pthread_attr_setstack (attrp, stack, __vm_page_size); + __pthread_attr_setstack (attrp, (void *) addr, vm_size); } /* Create the pthread structure for the main thread (i.e. us). */ |