RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-01-19 20:20:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

REORG: include: move MAX_THREADS to defaults.h

Browse Source 
That's already where MAX_PROCS is set, and we already handle the case of
the default value so there is no reason for placing it in thread.h given
that most call places don't need the rest of the threads definitions. The
include was removed from global-t.h and activity.c.
This commit is contained in:
Willy Tarreau 2020-06-11 08:14:01 +02:00
parent 6784c99463
commit ca8b069aa7
4 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/haproxy/defaults.h
View File

@ -30,6 +30,23 @@
#define MAX_PROCS LONGBITS
#endif
/* MAX_THREADS defines the highest limit for the global nbthread value. It
* defaults to the number of bits in a long integer when threads are enabled
* but may be lowered to save resources on embedded systems.
*/
#ifndef USE_THREAD
/* threads disabled, 1 thread max */
#define MAX_THREADS 1
#define MAX_THREADS_MASK 1
#else
/* threads enabled, max_threads defaults to long bits */
#ifndef MAX_THREADS
#define MAX_THREADS LONGBITS
#endif
#define MAX_THREADS_MASK (~0UL >> (LONGBITS - MAX_THREADS))
#endif
/*
* BUFSIZE defines the size of a read and write buffer. It is the maximum
* amount of bytes which can be stored by the proxy for each stream. However,

1
include/haproxy/global-t.h
View File

@ -25,7 +25,6 @@
#include <haproxy/buf-t.h>
#include <haproxy/freq_ctr-t.h>
#include <haproxy/list-t.h>
#include <haproxy/thread-t.h>
#include <haproxy/api-t.h>
#include <haproxy/vars-t.h>

9
include/haproxy/thread-t.h
View File

@ -28,6 +28,7 @@
#endif
#include <time.h>
#include <haproxy/defaults.h>
/* Note: this file mainly contains 3 sections:
* - one used solely when USE_THREAD is *not* set
@ -40,8 +41,6 @@
/********************** THREADS DISABLED ************************/
#define THREAD_LOCAL /* empty */
#define MAX_THREADS 1
#define MAX_THREADS_MASK 1
/* These macros allow to make some struct fields or local variables optional */
#define __decl_thread(decl)
@ -56,12 +55,6 @@
#define THREAD_LOCAL __thread
#ifndef MAX_THREADS
#define MAX_THREADS LONGBITS
#endif
#define MAX_THREADS_MASK (~0UL >> (LONGBITS - MAX_THREADS))
#define __decl_thread(decl) decl
/* declare a self-initializing spinlock */

1
src/activity.c
View File

@ -16,7 +16,6 @@
#include <haproxy/cli.h>
#include <haproxy/stream_interface.h>
#include <haproxy/tools.h>
#include <haproxy/thread-t.h>
#include <haproxy/activity-t.h>
#include <haproxy/freq_ctr.h>