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

CLEANUP: mworker: rename mworker_pipe to mworker_sockpair

Browse Source 
The function mworker_pipe_register_per_thread() is called this way
because the master first used pipes instead of socketpairs.

Rename mworker_pipe_register_per_thread() to
mworker_sockpair_register_per_thread() in order to be more consistent.

Also update a comment inside the function.
This commit is contained in:
William Lallemand 2022-07-05 09:04:03 +02:00
parent 36d9097cf3
commit 2ee490f613
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/mworker.c
View File

@ -413,7 +413,7 @@ void mworker_accept_wrapper(int fd)
* worker. It's only handled by worker thread #0. Other threads and master do * worker. It's only handled by worker thread #0. Other threads and master do
* nothing here. It always returns 1 (success). * nothing here. It always returns 1 (success).
*/ */
static int mworker_pipe_register_per_thread() static int mworker_sockpair_register_per_thread()
{ {
if (!(global.mode & MODE_MWORKER) || master) if (!(global.mode & MODE_MWORKER) || master)
return 1; return 1;
@ -422,15 +422,13 @@ static int mworker_pipe_register_per_thread()
return 1; return 1;
fd_set_nonblock(proc_self->ipc_fd[1]); fd_set_nonblock(proc_self->ipc_fd[1]);
/* In multi-tread, we need only one thread to process /* register the wrapper to handle read 0 when the master exits */
* events on the pipe with master
*/
fdtab[proc_self->ipc_fd[1]].iocb = mworker_accept_wrapper; fdtab[proc_self->ipc_fd[1]].iocb = mworker_accept_wrapper;
fd_want_recv(proc_self->ipc_fd[1]); fd_want_recv(proc_self->ipc_fd[1]);
return 1; return 1;
} }
REGISTER_PER_THREAD_INIT(mworker_pipe_register_per_thread); REGISTER_PER_THREAD_INIT(mworker_sockpair_register_per_thread);
/* ----- proxies ----- */ /* ----- proxies ----- */
/* /*