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

MINOR: threads: make use of thread_mask() to simplify some thread calculations

Browse Source 
By doing so it's visible that some fd_insert() calls were relying on
MAX_THREADS while all_threads_mask should have been more suitable.
This commit is contained in:
Willy Tarreau 2019-02-02 18:00:17 +01:00
parent 6daac19b3f
commit 3d95717b58
4 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cfgparse.c
View File

@ -2287,8 +2287,8 @@ int check_config_validity()
/* detect and address thread affinity inconsistencies */ /* detect and address thread affinity inconsistencies */
nbproc = my_ffsl(proc_mask(bind_conf->bind_proc)) - 1; nbproc = my_ffsl(proc_mask(bind_conf->bind_proc)) - 1;
mask = bind_conf->bind_thread[nbproc]; mask = thread_mask(bind_conf->bind_thread[nbproc]);
if (mask && !(mask & all_threads_mask)) { if (!(mask & all_threads_mask)) {
unsigned long new_mask = 0; unsigned long new_mask = 0;
while (mask) { while (mask) {

3
src/proto_sockpair.c
View File

@ -153,8 +153,7 @@ static int sockpair_bind_listener(struct listener *listener, char *errmsg, int e
listener->state = LI_LISTEN; listener->state = LI_LISTEN;
fd_insert(fd, listener, listener->proto->accept, fd_insert(fd, listener, listener->proto->accept,
listener->bind_conf->bind_thread[relative_pid-1] ? thread_mask(listener->bind_conf->bind_thread[relative_pid-1]));
listener->bind_conf->bind_thread[relative_pid-1] : MAX_THREADS_MASK);
return err; return err;

3
src/proto_tcp.c
View File

@ -1076,8 +1076,7 @@ int tcp_bind_listener(struct listener *listener, char *errmsg, int errlen)
listener->state = LI_LISTEN; listener->state = LI_LISTEN;
fd_insert(fd, listener, listener->proto->accept, fd_insert(fd, listener, listener->proto->accept,
listener->bind_conf->bind_thread[relative_pid-1] ? thread_mask(listener->bind_conf->bind_thread[relative_pid-1]));
listener->bind_conf->bind_thread[relative_pid-1] : MAX_THREADS_MASK);
tcp_return: tcp_return:
if (msg && errlen) { if (msg && errlen) {

3
src/proto_uxst.c
View File

@ -340,8 +340,7 @@ static int uxst_bind_listener(struct listener *listener, char *errmsg, int errle
listener->state = LI_LISTEN; listener->state = LI_LISTEN;
fd_insert(fd, listener, listener->proto->accept, fd_insert(fd, listener, listener->proto->accept,
listener->bind_conf->bind_thread[relative_pid-1] ? thread_mask(listener->bind_conf->bind_thread[relative_pid-1]));
listener->bind_conf->bind_thread[relative_pid-1] : MAX_THREADS_MASK);
return err; return err;