diff options
| author | William Hubbs <w.d.hubbs@gmail.com> | 2018-12-05 18:11:40 -0600 |
|---|---|---|
| committer | William Hubbs <w.d.hubbs@gmail.com> | 2018-12-06 16:22:15 -0600 |
| commit | bebc604438f9586f26d0cad8bd72749ae84b4335 (patch) | |
| tree | d225494a360991397b4a0fab8c7ae588427e7e61 /src/rc | |
| parent | 9dae4f2e38ceae227933673e25db9583e8f610a6 (diff) | |
supervise-daemon: fix busy loop
This fixes #264.
Diffstat (limited to 'src/rc')
| -rw-r--r-- | src/rc/supervise-daemon.c | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/src/rc/supervise-daemon.c b/src/rc/supervise-daemon.c index 0d477a54..276ff2fb 100644 --- a/src/rc/supervise-daemon.c +++ b/src/rc/supervise-daemon.c @@ -184,13 +184,22 @@ static void re_exec_supervisor(void) static void handle_signal(int sig) { int serrno = errno; + pid_t pid; switch (sig) { case SIGALRM: do_healthcheck = 1; break; case SIGCHLD: - while (waitpid((pid_t)(-1), NULL, WNOHANG) > 0) {} + if (exiting) + while (waitpid((pid_t)(-1), NULL, WNOHANG) > 0) {} + else { + while ((pid = waitpid((pid_t)(-1), NULL, WNOHANG|WNOWAIT)) > 0) { + if (pid == child_pid) + break; + pid = waitpid(pid, NULL, WNOHANG); + } + } break; case SIGTERM: exiting = 1; @@ -451,6 +460,7 @@ static void supervisor(char *exec, char **argv) int healthcheck_respawn; int i; int nkilled; + int ready; int sig_send; pid_t health_pid; pid_t wait_pid; @@ -498,18 +508,18 @@ static void supervisor(char *exec, char **argv) alarm(healthcheckdelay); else if (healthchecktimer) alarm(healthchecktimer); - fifo_fd = open(fifopath, O_RDONLY |O_NONBLOCK); failing = 0; while (!exiting) { healthcheck_respawn = 0; - wait_pid = waitpid(child_pid, &i, WNOHANG); - memset(buf, 0, sizeof(buf)); - if (fifo_fd >= 0) { + fifo_fd = open(fifopath, O_RDONLY); + if (fifo_fd > 0) { + memset(buf, 0, sizeof(buf)); count = read(fifo_fd, buf, sizeof(buf) - 1); + close(fifo_fd); if (count != -1) buf[count] = 0; - } - if (strlen(buf) > 0) { + if (count == 0) + continue; syslog(LOG_DEBUG, "Received %s from fifo", buf); if (strncasecmp(buf, "sig", 3) == 0) { if ((sscanf(buf, "%s %d", cmd, &sig_send) == 2) @@ -521,6 +531,7 @@ static void supervisor(char *exec, char **argv) sig_send, child_pid); } } + continue; } if (do_healthcheck) { do_healthcheck = 0; @@ -553,6 +564,7 @@ static void supervisor(char *exec, char **argv) syslog(LOG_INFO, "killed %d processes", nkilled); continue; } + wait_pid = waitpid(child_pid, &i, WNOHANG); if (wait_pid == child_pid) { if (WIFEXITED(i)) syslog(LOG_WARNING, "%s, pid %d, exited with return code %d", |