mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 06:11:32 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: threads: make MAX_THREADS configurable at build time

Browse Source 
There's some value in being able to limit MAX_THREADS, either to save
precious resources in embedded environments, or to protect certain
deployments against accidently incorrect settings.

With this patch, if MAX_THREADS is defined at build time, it will be
used. However, given that LONGBITS is not a macro but is defined
according to sizeof(long), we can't check the value range at build
time and instead we need to perform the check at early boot time.
However, the compiler is able to optimize away the constant comparisons
and doesn't even emit the check code when values are correct.

The output message regarding threading support was improved to report
the number of threads.
This commit is contained in:
Willy Tarreau 2019-01-26 13:35:03 +01:00
parent c9a82e48bf
commit f5809cde7a
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/common/hathreads.h
View File

@ -168,8 +168,11 @@ static inline unsigned long thread_isolated()
#include <pthread.h> #include <pthread.h>
#include <import/plock.h> #include <import/plock.h>
#ifndef MAX_THREADS
#define MAX_THREADS LONGBITS #define MAX_THREADS LONGBITS
#define MAX_THREADS_MASK ((unsigned long)-1) #endif
#define MAX_THREADS_MASK (~0UL >> (LONGBITS - MAX_THREADS))
#define __decl_hathreads(decl) decl #define __decl_hathreads(decl) decl

13
src/hathreads.c
View File

@ -108,13 +108,22 @@ void ha_rwlock_init(HA_RWLOCK_T *l)
__attribute__((constructor)) __attribute__((constructor))
static void __hathreads_init(void) static void __hathreads_init(void)
{ {
char *ptr = NULL;
if (MAX_THREADS < 1 || MAX_THREADS > LONGBITS) {
ha_alert("MAX_THREADS value must be between 1 and %d inclusive; "
"HAProxy was built with value %d, please fix it and rebuild.\n",
LONGBITS, MAX_THREADS);
exit(1);
}
memprintf(&ptr, "Built with multi-threading support (MAX_THREADS=%d).", MAX_THREADS);
hap_register_build_opts(ptr, 1);
#if defined(DEBUG_THREAD) || defined(DEBUG_FULL) #if defined(DEBUG_THREAD) || defined(DEBUG_FULL)
memset(lock_stats, 0, sizeof(lock_stats)); memset(lock_stats, 0, sizeof(lock_stats));
#endif #endif
} }
REGISTER_BUILD_OPTS("Built with multi-threading support.");
#else #else
REGISTER_BUILD_OPTS("Built without multi-threading support (USE_THREAD not set)."); REGISTER_BUILD_OPTS("Built without multi-threading support (USE_THREAD not set).");