mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-23 14:51:27 +02:00
Code Issues Projects Releases Wiki Activity

CLEANUP: threads: really move thread_info to hathreads.c

Browse Source 
Commit 5a6e2245f ("REORG: threads: move the struct thread_info from
global.h to hathreads.h") didn't hold its promise well, as the thread_info
struct was still declared and initialized in haproxy.c in addition to being
in hathreads.c. Let's move it for real now.
This commit is contained in:
Willy Tarreau 2019-05-22 06:42:27 +02:00
parent ddd8533f1b
commit 05ed14cfc4
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/haproxy.c
View File

@ -138,8 +138,6 @@ int relative_pid = 1; /* process id starting at 1 */
unsigned long pid_bit = 1; /* bit corresponding to the process id */ unsigned long pid_bit = 1; /* bit corresponding to the process id */
unsigned long all_proc_mask = 1; /* mask of all processes */ unsigned long all_proc_mask = 1; /* mask of all processes */
struct thread_info thread_info[MAX_THREADS] = { };
volatile unsigned long sleeping_thread_mask; /* Threads that are about to sleep in poll() */ volatile unsigned long sleeping_thread_mask; /* Threads that are about to sleep in poll() */
/* global options */ /* global options */
struct global global = { struct global global = {

2
src/hathreads.c
View File

@ -29,7 +29,7 @@
#include <types/global.h> #include <types/global.h>
#include <proto/fd.h> #include <proto/fd.h>
struct thread_info thread_info[MAX_THREADS]; struct thread_info thread_info[MAX_THREADS] = { };
THREAD_LOCAL struct thread_info *ti = &thread_info[0]; THREAD_LOCAL struct thread_info *ti = &thread_info[0];
#ifdef USE_THREAD #ifdef USE_THREAD