Replace usages of sigwait(3) with sigwaitinfo(2)

This is basically the same call, but it has the advantage of being
supported by FreeBSD's valgrind, which sigwait() is not.

References #1106.
This commit is contained in:
Tobias Brunner
2015-10-29 15:38:37 +01:00
parent c6aa606a65
commit 858148092d
9 changed files with 31 additions and 36 deletions
+4 -7
View File
@@ -17,9 +17,7 @@
*/
#include <stdio.h>
#define _POSIX_PTHREAD_SEMANTICS /* for two param sigwait on OpenSolaris */
#include <signal.h>
#undef _POSIX_PTHREAD_SEMANTICS
#include <pthread.h>
#include <sys/stat.h>
#include <sys/types.h>
@@ -110,12 +108,11 @@ static void run()
while (TRUE)
{
int sig;
int error;
error = sigwait(&set, &sig);
if (error)
sig = sigwaitinfo(&set, NULL);
if (sig == -1)
{
DBG1(DBG_DMN, "error %d while waiting for a signal", error);
DBG1(DBG_DMN, "waiting for signal failed: %s", strerror(errno));
return;
}
switch (sig)
@@ -434,7 +431,7 @@ int main(int argc, char *argv[])
}
/* add handler for SEGV and ILL,
* INT, TERM and HUP are handled by sigwait() in run() */
* INT, TERM and HUP are handled by sigwaitinfo() in run() */
action.sa_handler = segv_handler;
action.sa_flags = 0;
sigemptyset(&action.sa_mask);