REORG: mworker: move signals functions to mworker.c

Move the following functions to mworker.c:

void mworker_block_signals();
void mworker_unblock_signals();

diff --git a/include/proto/mworker.h b/include/proto/mworker.h
index 13e5c273d10f17bade2ad45455defbfd0b0bad3b..87cbdd4eb1866a5efebda104c14fbd4ad1882acc 100644 (file)
--- a/include/proto/mworker.h
+++ b/include/proto/mworker.h
@@ -16,4 +16,8 @@
 void mworker_proc_list_to_env();
 void mworker_env_to_proc_list();
 
+
+void mworker_block_signals();
+void mworker_unblock_signals();
+
 #endif /* PROTO_MWORKER_H_ */

diff --git a/src/haproxy.c b/src/haproxy.c
index 85234720b2b169a010479e723cf00f117bcca101..c9da06cd295bac236146107fa9017bec242b5ca6 100644 (file)
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -511,23 +511,6 @@ int current_child(int pid)
        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.
  */

diff --git a/src/mworker.c b/src/mworker.c
index 2f0f09bf2677a2e62be2f333134e7511b8926dfe..da2323c7df216e8937aa84cdb1a430d3d3ba1f27 100644 (file)
--- a/src/mworker.c
+++ b/src/mworker.c
@@ -16,11 +16,11 @@
 #include <common/mini-clist.h>
 
 #include <proto/mworker.h>
+#include <proto/signal.h>
 
 #include <types/global.h>
 
 
-
 /*
  * serialize the proc list and put it in the environment
  */
@@ -86,3 +86,22 @@ void mworker_env_to_proc_list()
 
        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();
+}