RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-01-09 23:39:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: thread: use a dedicated static pthread_t array in thread.c

Browse Source 
This removes the thread identifiers from struct thread_info and moves
them only in static array in thread.c since it's now the only file that
needs to touch it. It's also the only file that needs to include
pthread.h, beyond haproxy.c which needs it to start the poll loop. As
a result, much less system includes are needed and the LoC reduced by
around 3%.
This commit is contained in:
Willy Tarreau 2021-10-06 22:53:51 +02:00
parent 4eeb88363c
commit 5e03dfaaf6
4 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,10 +23,6 @@
#ifndef _HAPROXY_THREAD_T_H
#define _HAPROXY_THREAD_T_H
#ifdef USE_THREAD
#include <pthread.h>
#endif
#include <haproxy/defaults.h>
/* Note: this file mainly contains 3 sections:

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

@ -33,7 +33,6 @@
* the pthread identifier which does not exist).
*/
struct thread_info {
__decl_thread(pthread_t pthread);
clockid_t clock_id;
timer_t wd_timer; /* valid timer or TIMER_INVALID if not set */
uint64_t prev_cpu_time; /* previous per thread CPU time */

4
src/haproxy.c
View File

@ -51,6 +51,10 @@
#include <syslog.h>
#include <grp.h>
#ifdef USE_THREAD
#include <pthread.h>
#endif
#ifdef USE_CPU_AFFINITY
#include <sched.h>
#if defined(__FreeBSD__) || defined(__DragonFly__)

21
src/thread.c
View File

@ -15,6 +15,10 @@
#include <stdlib.h>
#include <fcntl.h>
#ifdef USE_THREAD
# include <pthread.h>
#endif
#ifdef USE_CPU_AFFINITY
# include <sched.h>
# if defined(__FreeBSD__) || defined(__DragonFly__)
@ -53,6 +57,7 @@ volatile unsigned long all_threads_mask __read_mostly = 1; // nbthread 1 assume
THREAD_LOCAL unsigned int tid = 0;
THREAD_LOCAL unsigned long tid_bit = (1UL << 0);
int thread_cpus_enabled_at_boot = 1;
static pthread_t ha_pthread[MAX_THREADS] = { };
/* Marks the thread as harmless until the last thread using the rendez-vous
* point quits, excluding the current one. Thus an isolated thread may be safely
@ -198,9 +203,9 @@ void setup_extra_threads(void *(*handler)(void *))
pthread_sigmask(SIG_SETMASK, &blocked_sig, &old_sig);
/* Create nbthread-1 thread. The first thread is the current process */
ha_thread_info[0].pthread = pthread_self();
ha_pthread[0] = pthread_self();
for (i = 1; i < global.nbthread; i++)
pthread_create(&ha_thread_info[i].pthread, NULL, handler, (void *)(long)i);
pthread_create(&ha_pthread[i], NULL, handler, (void *)(long)i);
}
/* waits for all threads to terminate. Does nothing when threads are
@ -212,7 +217,7 @@ void wait_for_threads_completion()
/* Wait the end of other threads */
for (i = 1; i < global.nbthread; i++)
pthread_join(ha_thread_info[i].pthread, NULL);
pthread_join(ha_pthread[i], NULL);
#if defined(DEBUG_THREAD) || defined(DEBUG_FULL)
show_lock_stats();
@ -241,14 +246,14 @@ void set_thread_cpu_affinity()
thread_affinity_policy_data_t cpu_set = { j - 1 };
thread_port_t mthread;
mthread = pthread_mach_thread_np(ha_thread_info[tid].pthread);
mthread = pthread_mach_thread_np(ha_pthread[tid]);
thread_policy_set(mthread, THREAD_AFFINITY_POLICY, (thread_policy_t)&cpu_set, 1);
set &= ~(1UL << (j - 1));
}
# else
struct hap_cpuset *set = &cpu_map.thread[tid];
pthread_setaffinity_np(ha_thread_info[tid].pthread, sizeof(set->cpuset), &set->cpuset);
pthread_setaffinity_np(ha_pthread[tid], sizeof(set->cpuset), &set->cpuset);
# endif
}
#endif /* USE_CPU_AFFINITY */
@ -273,7 +278,7 @@ unsigned long long ha_get_pthread_id(unsigned int thr)
unsigned char c;
} u = { 0 };
u.t = ha_thread_info[thr].pthread;
u.t = ha_pthread[thr];
if (sizeof(u.t) <= sizeof(u.c))
return u.c;
@ -287,7 +292,7 @@ unsigned long long ha_get_pthread_id(unsigned int thr)
/* send signal <sig> to thread <thr> */
void ha_tkill(unsigned int thr, int sig)
{
pthread_kill(ha_thread_info[thr].pthread, sig);
pthread_kill(ha_pthread[thr], sig);
}
/* send signal <sig> to all threads. The calling thread is signaled last in
@ -302,7 +307,7 @@ void ha_tkillall(int sig)
continue;
if (thr == tid)
continue;
pthread_kill(ha_thread_info[thr].pthread, sig);
pthread_kill(ha_pthread[thr], sig);
}
raise(sig);
}