ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Offset stack-size by current TLS #8200

Browse Source 
Some libraries use thread locals and hence increase the min
requirement.

This is seen on void-linux for example:

> linking a minimal program against cairo gives a
> __static_tls_size of 43008 bytes.
> Doing the same on Ubuntu focal and Debian bullseye,
> __static_tls_size is only 4608.
This commit is contained in:
Robin Gareus 2020-06-06 19:04:26 +02:00
parent 09aa0a3d1a
commit e0548fa798
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
1 changed files with 44 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
libs/pbd/pthread_utils.cc
View File

@ -23,6 +23,10 @@
#include <cstring> #include <cstring>
#include <stdint.h> #include <stdint.h>
#ifndef PLATFORM_WINDOWS
#include <dlfcn.h>
#endif
#include "pbd/pthread_utils.h" #include "pbd/pthread_utils.h"
#ifdef WINE_THREAD_SUPPORT #ifdef WINE_THREAD_SUPPORT
#include <fst.h> #include <fst.h>
@ -222,6 +226,44 @@ pthread_cancel_one (pthread_t thread)
pthread_mutex_unlock (&thread_map_lock); pthread_mutex_unlock (&thread_map_lock);
} }
static size_t pbd_stack_size ()
{
size_t rv = 0;
#ifndef PLATFORM_WINDOWS
size_t pt_min_stack = 16384;
#ifdef PTHREAD_STACK_MIN
pt_min_stack = PTHREAD_STACK_MIN;
#endif
void *handle = dlopen (NULL, RTLD_LAZY);
/* This function is internal (it has a GLIBC_PRIVATE) version, but
* available via weak symbol, or dlsym, and returns
*
* GLRO(dl_pagesize) + __static_tls_size + PTHREAD_STACK_MIN
*/
size_t (*__pthread_get_minstack)(const pthread_attr_t* attr) =
(size_t (*)(const pthread_attr_t*)) dlsym(handle, "__pthread_get_minstack");
if (__pthread_get_minstack != NULL) {
pthread_attr_t attr;
pthread_attr_init(&attr);
rv = __pthread_get_minstack(&attr);
#ifndef NDEBUG
printf("TLS of parent thread: %zd Bytes (pthread min-stack: %zu)\n", rv, pt_min_stack);
#endif
assert (rc >= pt_min_stack);
rv -= pt_min_stack;
pthread_attr_destroy(&attr);
}
dlclose(handle);
#endif
return rv;
}
int int
pbd_pthread_create ( pbd_pthread_create (
const size_t stacksize, const size_t stacksize,
@ -233,7 +275,7 @@ pbd_pthread_create (
pthread_attr_t attr; pthread_attr_t attr;
pthread_attr_init (&attr); pthread_attr_init (&attr);
pthread_attr_setstacksize (&attr, stacksize); pthread_attr_setstacksize (&attr, stacksize + pbd_stack_size ());
rv = pthread_create (thread, &attr, start_routine, arg); rv = pthread_create (thread, &attr, start_routine, arg);
pthread_attr_destroy (&attr); pthread_attr_destroy (&attr);
return rv; return rv;
@ -282,7 +324,7 @@ pbd_realtime_pthread_create (
pthread_attr_setschedparam (&attr, &parm); pthread_attr_setschedparam (&attr, &parm);
pthread_attr_setscope (&attr, PTHREAD_SCOPE_SYSTEM); pthread_attr_setscope (&attr, PTHREAD_SCOPE_SYSTEM);
pthread_attr_setinheritsched (&attr, PTHREAD_EXPLICIT_SCHED); pthread_attr_setinheritsched (&attr, PTHREAD_EXPLICIT_SCHED);
pthread_attr_setstacksize (&attr, stacksize); pthread_attr_setstacksize (&attr, stacksize + pbd_stack_size ());
rv = pthread_create (thread, &attr, start_routine, arg); rv = pthread_create (thread, &attr, start_routine, arg);
pthread_attr_destroy (&attr); pthread_attr_destroy (&attr);
return rv; return rv;