denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

starter: Only handle SIGCHLD asynchronously and the rest in pselect(2).

Browse Source
This commit is contained in:
Tobias Brunner
2012-06-06 14:23:25 +02:00
parent 21043198ff
commit b200fa573b
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/starter/starter.c
+17 -8
View File
@@ -12,6 +12,7 @@
* for more details. * for more details.
*/ */
#include <sys/select.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <sys/stat.h> #include <sys/stat.h>
@@ -292,7 +293,7 @@ int main (int argc, char **argv)
int i; int i;
int id = 1; int id = 1;
struct timeval tv; struct timespec ts;
unsigned long auto_update = 0; unsigned long auto_update = 0;
time_t last_reload; time_t last_reload;
bool no_fork = FALSE; bool no_fork = FALSE;
@@ -494,7 +495,7 @@ int main (int argc, char **argv)
} }
/* we handle these signals in the main thread, so we don't want any /* we handle these signals in the main thread, so we don't want any
* of the others to catch them. install a handler for fatal signals. */ * of the others to catch them */
memset(&action, 0, sizeof(action)); memset(&action, 0, sizeof(action));
sigemptyset(&action.sa_mask); sigemptyset(&action.sa_mask);
sigaddset(&action.sa_mask, SIGHUP); sigaddset(&action.sa_mask, SIGHUP);
@@ -506,6 +507,7 @@ int main (int argc, char **argv)
sigaddset(&action.sa_mask, SIGUSR1); sigaddset(&action.sa_mask, SIGUSR1);
pthread_sigmask(SIG_SETMASK, &action.sa_mask, NULL); pthread_sigmask(SIG_SETMASK, &action.sa_mask, NULL);
/* install a handler for fatal signals */
action.sa_handler = fatal_signal_handler; action.sa_handler = fatal_signal_handler;
sigaction(SIGSEGV, &action, NULL); sigaction(SIGSEGV, &action, NULL);
sigaction(SIGILL, &action, NULL); sigaction(SIGILL, &action, NULL);
@@ -518,8 +520,7 @@ int main (int argc, char **argv)
lib->settings->get_int(lib->settings, "starter.threads", lib->settings->get_int(lib->settings, "starter.threads",
DEFAULT_THREADS)); DEFAULT_THREADS));
/* enable signals for main thread and install signal handler */ /* install signal handler for main thread */
pthread_sigmask(SIG_UNBLOCK, &action.sa_mask, NULL);
action.sa_handler = signal_handler; action.sa_handler = signal_handler;
sigaction(SIGHUP, &action, NULL); sigaction(SIGHUP, &action, NULL);
sigaction(SIGINT, &action, NULL); sigaction(SIGINT, &action, NULL);
@@ -529,6 +530,13 @@ int main (int argc, char **argv)
sigaction(SIGCHLD, &action, NULL); sigaction(SIGCHLD, &action, NULL);
sigaction(SIGUSR1, &action, NULL); sigaction(SIGUSR1, &action, NULL);
/* the only signal we want to receive asynchronously is SIGCHLD */
sigemptyset(&action.sa_mask);
sigaddset(&action.sa_mask, SIGCHLD);
pthread_sigmask(SIG_UNBLOCK, &action.sa_mask, NULL);
/* the rest is unblocked in pselect() below */
sigemptyset(&action.sa_mask);
for (;;) for (;;)
{ {
/* /*
@@ -854,15 +862,16 @@ int main (int argc, char **argv)
{ {
time_t now = time_monotonic(NULL); time_t now = time_monotonic(NULL);
tv.tv_sec = (now < last_reload + auto_update) ts.tv_sec = (now < last_reload + auto_update) ?
? (last_reload + auto_update-now) : 0; (last_reload + auto_update - now) : 0;
tv.tv_usec = 0; ts.tv_nsec = 0;
} }
/* /*
* Wait for something to happen * Wait for something to happen
*/ */
if (select(0, NULL, NULL, NULL, auto_update ? &tv : NULL) == 0) if (pselect(0, NULL, NULL, NULL, auto_update ? &ts : NULL,
&action.sa_mask) == 0)
{ {
/* timeout -> auto_update */ /* timeout -> auto_update */
_action_ |= FLAG_ACTION_UPDATE; _action_ |= FLAG_ACTION_UPDATE;