technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixing build with glibc 2.34.

Browse Source 
Explicitly using the sysconf() call to obtain the minimum thread stack size
instead of the PTHREAD_STACK_MIN macro.

This closes #576 PR on GitHub.
This commit is contained in:
Max Romanov
2021-09-14 19:35:49 +03:00
parent a336928e10
commit d21ebcce83
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/changes.xml
View File

@@ -31,6 +31,12 @@ NGINX Unit updated to 1.26.0.
date="" time="" date="" time=""
packager="Andrei Belov <defan@nginx.com>"> packager="Andrei Belov <defan@nginx.com>">
<change type="bugfix">
<para>
fixed building with glibc 2.34, notably Fedora 35.
</para>
</change>
</changes> </changes>

7
src/nxt_conf_validation.c
View File

@@ -1733,14 +1733,15 @@ static nxt_int_t
nxt_conf_vldt_thread_stack_size(nxt_conf_validation_t *vldt, nxt_conf_vldt_thread_stack_size(nxt_conf_validation_t *vldt,
nxt_conf_value_t *value, void *data) nxt_conf_value_t *value, void *data)
{ {
int64_t size; int64_t size, min_size;
size = nxt_conf_get_number(value); size = nxt_conf_get_number(value);
min_size = sysconf(_SC_THREAD_STACK_MIN);
if (size < NXT_THREAD_STACK_MIN) { if (size < min_size) {
return nxt_conf_vldt_error(vldt, "The \"thread_stack_size\" number " return nxt_conf_vldt_error(vldt, "The \"thread_stack_size\" number "
"must be equal to or greater than %d.", "must be equal to or greater than %d.",
NXT_THREAD_STACK_MIN); min_size);
} }
if ((size % nxt_pagesize) != 0) { if ((size % nxt_pagesize) != 0) {

8
src/nxt_thread.h
View File

@@ -142,14 +142,6 @@ nxt_thread_yield() \
#endif #endif
#if (PTHREAD_STACK_MIN)
#define NXT_THREAD_STACK_MIN PTHREAD_STACK_MIN
#else
#define NXT_THREAD_STACK_MIN sysconf(_SC_THREAD_STACK_MIN)
#endif
struct nxt_thread_s { struct nxt_thread_s {
nxt_log_t *log; nxt_log_t *log;
nxt_log_t main_log; nxt_log_t main_log;