mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-12-11 04:31:01 +01:00
Code Issues Projects Releases Wiki Activity

REORG: mworker: move signals functions to mworker.c

Browse Source 
Move the following functions to mworker.c:

void mworker_block_signals();
void mworker_unblock_signals();
This commit is contained in:
William Lallemand 2019-04-01 11:29:54 +02:00 committed by Willy Tarreau
parent 48dfbbdea9
commit 3cd95d2f1b
3 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/proto/mworker.h
View File

@ -16,4 +16,8 @@
void mworker_proc_list_to_env(); void mworker_proc_list_to_env();
void mworker_env_to_proc_list(); void mworker_env_to_proc_list();
void mworker_block_signals();
void mworker_unblock_signals();
#endif /* PROTO_MWORKER_H_ */ #endif /* PROTO_MWORKER_H_ */

17
src/haproxy.c
View File

@ -511,23 +511,6 @@ int current_child(int pid)
return 0; return 0;
} }
static void mworker_block_signals()
{
sigset_t set;
sigemptyset(&set);
sigaddset(&set, SIGUSR1);
sigaddset(&set, SIGUSR2);
sigaddset(&set, SIGHUP);
sigaddset(&set, SIGCHLD);
ha_sigmask(SIG_SETMASK, &set, NULL);
}
static void mworker_unblock_signals()
{
haproxy_unblock_signals();
}
/* /*
* Send signal to every known children. * Send signal to every known children.
*/ */

21
src/mworker.c
View File

@ -16,11 +16,11 @@
#include <common/mini-clist.h> #include <common/mini-clist.h>
#include <proto/mworker.h> #include <proto/mworker.h>
#include <proto/signal.h>
#include <types/global.h> #include <types/global.h>
/* /*
* serialize the proc list and put it in the environment * serialize the proc list and put it in the environment
*/ */
@ -86,3 +86,22 @@ void mworker_env_to_proc_list()
unsetenv("HAPROXY_PROCESSES"); unsetenv("HAPROXY_PROCESSES");
} }
/* Signal blocking and unblocking */
void mworker_block_signals()
{
sigset_t set;
sigemptyset(&set);
sigaddset(&set, SIGUSR1);
sigaddset(&set, SIGUSR2);
sigaddset(&set, SIGHUP);
sigaddset(&set, SIGCHLD);
ha_sigmask(SIG_SETMASK, &set, NULL);
}
void mworker_unblock_signals()
{
haproxy_unblock_signals();
}