BUG/MINOR: signals: ha_sigmask macro for multithreading
The behavior of sigprocmask in an multithreaded environment is
undefined.
The new macro ha_sigmask() calls either pthreads_sigmask() or
sigprocmask() if haproxy was built with thread support or not.
This should be backported to 1.8.
diff --git a/src/checks.c b/src/checks.c
index 3f4c0e1..3cae94d 100644
--- a/src/checks.c
+++ b/src/checks.c
@@ -1618,7 +1618,7 @@
sigset_t set;
sigemptyset(&set);
sigaddset(&set, SIGCHLD);
- assert(sigprocmask(SIG_BLOCK, &set, NULL) == 0);
+ assert(ha_sigmask(SIG_BLOCK, &set, NULL) == 0);
}
void unblock_sigchld(void)
@@ -1626,7 +1626,7 @@
sigset_t set;
sigemptyset(&set);
sigaddset(&set, SIGCHLD);
- assert(sigprocmask(SIG_UNBLOCK, &set, NULL) == 0);
+ assert(ha_sigmask(SIG_UNBLOCK, &set, NULL) == 0);
}
static struct pid_list *pid_list_add(pid_t pid, struct task *t)
diff --git a/src/haproxy.c b/src/haproxy.c
index 96b8abc..1c0455c 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -508,7 +508,7 @@
sigaddset(&set, SIGHUP);
sigaddset(&set, SIGINT);
sigaddset(&set, SIGTERM);
- sigprocmask(SIG_SETMASK, &set, NULL);
+ ha_sigmask(SIG_SETMASK, &set, NULL);
}
static void mworker_unblock_signals()
@@ -521,7 +521,7 @@
sigaddset(&set, SIGHUP);
sigaddset(&set, SIGINT);
sigaddset(&set, SIGTERM);
- sigprocmask(SIG_UNBLOCK, &set, NULL);
+ ha_sigmask(SIG_UNBLOCK, &set, NULL);
}
static void mworker_unregister_signals()
diff --git a/src/signal.c b/src/signal.c
index 0dadd76..4bee7d7 100644
--- a/src/signal.c
+++ b/src/signal.c
@@ -13,6 +13,8 @@
#include <signal.h>
#include <string.h>
+#include <common/hathreads.h>
+
#include <proto/signal.h>
#include <proto/log.h>
#include <proto/task.h>
@@ -71,7 +73,7 @@
sigset_t old_sig;
/* block signal delivery during processing */
- sigprocmask(SIG_SETMASK, &blocked_sig, &old_sig);
+ ha_sigmask(SIG_SETMASK, &blocked_sig, &old_sig);
/* It is important that we scan the queue forwards so that we can
* catch any signal that would have been queued by another signal
@@ -95,7 +97,7 @@
signal_queue_len = 0;
/* restore signal delivery */
- sigprocmask(SIG_SETMASK, &old_sig, NULL);
+ ha_sigmask(SIG_SETMASK, &old_sig, NULL);
}
/* perform minimal intializations, report 0 in case of error, 1 if OK. */
@@ -116,7 +118,7 @@
* parsing We don't want the process to be killed by an unregistered
* USR2 signal when the master-worker is reloading */
sigaddset(&blocked_sig, SIGUSR2);
- sigprocmask(SIG_SETMASK, &blocked_sig, NULL);
+ ha_sigmask(SIG_SETMASK, &blocked_sig, NULL);
sigfillset(&blocked_sig);
sigdelset(&blocked_sig, SIGPROF);