diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2023-11-20 14:57:36 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska@appnovation.com> | 2023-11-20 14:57:36 +0000 |
| commit | 8d032b7ff814b08aba0b23c03cdd589eae98d22a (patch) | |
| tree | 468d2fa922978ba08b04bdd7a171399098c68113 /src | |
| parent | fc0a5ac48bd417336f6d3333ac7846d8134579eb (diff) | |
| download | s6-8d032b7ff814b08aba0b23c03cdd589eae98d22a.tar.gz s6-8d032b7ff814b08aba0b23c03cdd589eae98d22a.tar.xz s6-8d032b7ff814b08aba0b23c03cdd589eae98d22a.zip | |
Prepare for 2.12.0.2; fix scheduling of rescans/restarts in s6-svscan
Signed-off-by: Laurent Bercot <ska@appnovation.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/supervision/s6-svscan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/supervision/s6-svscan.c b/src/supervision/s6-svscan.c index cbf9e05..9c3a02f 100644 --- a/src/supervision/s6-svscan.c +++ b/src/supervision/s6-svscan.c @@ -748,8 +748,6 @@ int main (int argc, char const *const *argv) int r ; tain deadline = scan_deadline ; tain_earliest1(&deadline, &start_deadline) ; - killthem(&what) ; - reap(&what) ; r = iopause_g(x, 2, &deadline) ; if (r < 0) panic("iopause") ; else if (!r) @@ -767,6 +765,8 @@ int main (int argc, char const *const *argv) if (x[0].revents & IOPAUSE_READ) handle_signals(&what) ; if (x[1].revents & IOPAUSE_READ) handle_control(x[1].fd, &what) ; } + killthem(&what) ; + reap(&what) ; } /* Finish phase. */ |