diff options
| -rw-r--r-- | INSTALL | 2 | ||||
| -rw-r--r-- | NEWS | 5 | ||||
| -rw-r--r-- | doc/index.html | 4 | ||||
| -rw-r--r-- | doc/upgrade.html | 7 | ||||
| -rw-r--r-- | package/info | 2 | ||||
| -rw-r--r-- | src/supervision/s6-svscan.c | 158 | ||||
| -rw-r--r-- | src/supervision/s6-svscanctl.c | 19 |
7 files changed, 101 insertions, 96 deletions
@@ -7,7 +7,7 @@ Build Instructions - A POSIX-compliant C development environment - GNU make version 3.81 or later - skalibs version 2.9.4.0 or later: http://skarnet.org/software/skalibs/ - - Optional: execline version 2.6.1.1 or later: http://skarnet.org/software/execline/ + - Optional: execline version 2.7.0.0 or later: http://skarnet.org/software/execline/ This software will run on any operating system that implements POSIX.1-2008, available at: @@ -1,9 +1,10 @@ Changelog for s6. -In 2.9.2.1 ----------- +In 2.10.0.0 +----------- - Bugfixes. + - Changes to s6-svscan and s6-svscanctl. In 2.9.2.0 diff --git a/doc/index.html b/doc/index.html index 60884b1..9587d5d 100644 --- a/doc/index.html +++ b/doc/index.html @@ -87,7 +87,7 @@ with s6</a> </li> requirement if you link against the shared version of the skalibs library. </li> <li> Optional: <a href="//skarnet.org/software/execline/">execline</a> version -2.6.1.1 or later. When s6 is built with execline support (which is the default), +2.7.0.0 or later. When s6 is built with execline support (which is the default), execline is a build-time requirement, and also a run-time requirement for certain binaries that spawn scripts interpreted with <a href="//skarnet.org/software/execline/execlineb.html">execlineb</a>. </li> @@ -103,7 +103,7 @@ certain binaries that spawn scripts interpreted with <h3> Download </h3> <ul> - <li> The current released version of s6 is <a href="s6-2.9.2.1.tar.gz">2.9.2.1</a>. </li> + <li> The current released version of s6 is <a href="s6-2.10.0.0.tar.gz">2.10.0.0</a>. </li> <li> Alternatively, you can checkout a copy of the <a href="//git.skarnet.org/cgi-bin/cgit.cgi/s6/">s6 git repository</a>: diff --git a/doc/upgrade.html b/doc/upgrade.html index 7408d83..ef257eb 100644 --- a/doc/upgrade.html +++ b/doc/upgrade.html @@ -18,14 +18,15 @@ <h1> What has changed in s6 </h1> -<h2> in 2.9.2.1 </h2> +<h2> in 2.10.0.0 </h2> <ul> <li> <a href="//skarnet.org/software/skalibs/">skalibs</a> dependency bumped to 2.9.4.0. </li> <li> <a href="//skarnet.org/software/execline/">execline</a> -dependency bumped to 2.6.1.1. </li> - <li> New <tt>-d</tt> option to <a href="s6-sudod.html">s6-sudod</a>. </li> +dependency bumped to 2.7.0.0. </li> + <li> <a href="s6-svscan.html">s6-svscan</a> and +<a href="s6-svscanctl.html">s6-svscanctl</a> have changed. </li> </ul> <h2> in 2.9.2.0 </h2> diff --git a/package/info b/package/info index 0ba3d91..7ab4bfc 100644 --- a/package/info +++ b/package/info @@ -1,4 +1,4 @@ package=s6 -version=2.9.2.1 +version=2.10.0.0 category=admin package_macro_name=S6 diff --git a/src/supervision/s6-svscan.c b/src/supervision/s6-svscan.c index bf338d5..7016236 100644 --- a/src/supervision/s6-svscan.c +++ b/src/supervision/s6-svscan.c @@ -23,7 +23,7 @@ #include <s6/config.h> #include <s6/s6-supervise.h> -#define USAGE "s6-svscan [ -S | -s ] [ -c maxservices ] [ -t timeout ] [ -d notif ] [ -X consoleholder ] [ dir ]" +#define USAGE "s6-svscan [ -c maxservices ] [ -t timeout ] [ -d notif ] [ -X consoleholder ] [ dir ]" #define dieusage() strerr_dieusage(100, USAGE) #define FINISH_PROG S6_SVSCAN_CTLDIR "/finish" @@ -50,11 +50,11 @@ static struct svinfo_s *services ; static unsigned int max = 500 ; static unsigned int n = 0 ; static tain_t deadline, defaulttimeout ; -static char const *finish_arg = "reboot" ; static int wantreap = 1 ; static int wantscan = 1 ; static unsigned int wantkill = 0 ; static int cont = 1 ; +static int waitall = 1 ; static unsigned int consoleholder = 0 ; static void restore_console (void) @@ -102,56 +102,69 @@ static void killthem (void) wantkill = 0 ; } -static void term (void) +static inline void closethem (void) { - cont = 0 ; - wantkill = 3 ; + unsigned int i = 0 ; + for (; i < n ; i++) if (services[i].flaglog) + { + if (services[i].p[1] >= 0) close(services[i].p[1]) ; + if (services[i].p[0] >= 0) close(services[i].p[0]) ; + } } -static void hup (void) +static inline void waitthem (void) { - cont = 0 ; - wantkill = 1 ; + unsigned int m = 0 ; + unsigned int i = 0 ; + pid_t pids[n << 1] ; + for (; i < n ; i++) + { + if (services[i].pid[0]) + pids[m++] = services[i].pid[0] ; + if (services[i].flaglog && services[i].pid[1]) + pids[m++] = services[i].pid[1] ; + } + if (!waitn(pids, m)) + strerr_warnwu1sys("wait for all s6-supervise processes") ; } -static void quit (void) +static inline void chld (void) +{ + wantreap = 1 ; +} + +static inline void alrm (void) +{ + wantscan = 1 ; +} + +static inline void abrt (void) { cont = 0 ; - wantkill = 7 ; + waitall = 0 ; } -static void intr (void) +static void hup (void) { - finish_arg = "reboot" ; - term() ; + wantkill = 2 ; + wantscan = 1 ; } -static void usr1 (void) +static void term (void) { - finish_arg = "poweroff" ; - term() ; + cont = 0 ; + waitall = 1 ; + wantkill = 3 ; } -static void handle_signals (void) +static void quit (void) { - for (;;) - { - switch (selfpipe_read()) - { - case -1 : panic("selfpipe_read") ; - case 0 : return ; - case SIGCHLD : wantreap = 1 ; break ; - case SIGALRM : wantscan = 1 ; break ; - case SIGABRT : cont = 0 ; break ; - case SIGTERM : term() ; break ; - case SIGHUP : hup() ; break ; - case SIGQUIT : quit() ; break ; - case SIGINT : intr() ; break ; - } - } + cont = 0 ; + waitall = 1 ; + wantkill = 7 ; } -static void handle_diverted_signals (void) +static void handle_signals (void) { for (;;) { @@ -160,9 +173,9 @@ static void handle_diverted_signals (void) { case -1 : panic("selfpipe_read") ; case 0 : return ; - case SIGCHLD : wantreap = 1 ; break ; - case SIGALRM : wantscan = 1 ; break ; - case SIGABRT : cont = 0 ; break ; + case SIGCHLD : chld() ; break ; + case SIGALRM : alrm() ; break ; + case SIGABRT : abrt() ; break ; default : { char const *name = sig_name(sig) ; @@ -172,7 +185,16 @@ static void handle_diverted_signals (void) memcpy(fn, SIGNAL_PROG, SIGNAL_PROG_LEN) ; memcpy(fn + SIGNAL_PROG_LEN, name, len + 1) ; if (!child_spawn0(newargv[0], newargv, (char const **)environ)) - strerr_warnwu2sys("spawn ", newargv[0]) ; + { + if (errno != ENOENT) strerr_warnwu2sys("spawn ", newargv[0]) ; + switch (sig) + { + case SIGHUP : hup() ; break ; + case SIGINT : + case SIGTERM : term() ; break ; + case SIGQUIT : quit() ; break ; + } + } } } } @@ -188,22 +210,15 @@ static void handle_control (int fd) else if (!r) break ; else switch (c) { - case 'p' : finish_arg = "poweroff" ; break ; - case 'h' : hup() ; return ; - case 'r' : finish_arg = "reboot" ; break ; - case 'a' : wantscan = 1 ; break ; - case 't' : term() ; return ; - case 's' : finish_arg = "halt" ; break ; - case 'z' : wantreap = 1 ; break ; - case 'b' : cont = 0 ; return ; + case 'z' : chld() ; break ; + case 'a' : alrm() ; break ; + case 'b' : abrt() ; break ; + case 'h' : hup() ; break ; + case 'i' : + case 't' : term() ; break ; + case 'q' : quit() ; break ; case 'n' : wantkill = 2 ; break ; case 'N' : wantkill = 6 ; break ; - case '6' : - case 'i' : intr() ; return ; - case 'q' : quit() ; return ; - case '0' : finish_arg = "halt" ; term() ; return ; - case '7' : usr1() ; return ; - case '8' : finish_arg = "other" ; term() ; return ; default : { char s[2] = { c, 0 } ; @@ -329,7 +344,7 @@ static void retrydirlater (void) if (tain_less(&a, &deadline)) deadline = a ; } -static void check (char const *name) +static inline void check (char const *name) { struct stat st ; size_t namelen ; @@ -420,7 +435,7 @@ static void check (char const *name) } } -static void scan (void) +static inline void scan (void) { unsigned int i = 0 ; DIR *dir ; @@ -468,7 +483,6 @@ static void scan (void) int main (int argc, char const *const *argv) { iopause_fd x[2] = { { -1, IOPAUSE_READ, 0 }, { -1, IOPAUSE_READ, 0 } } ; - int divertsignals = 0 ; unsigned int notif = 0 ; PROG = "s6-svscan" ; { @@ -476,14 +490,12 @@ int main (int argc, char const *const *argv) unsigned int t = 0 ; for (;;) { - int opt = subgetopt_r(argc, argv, "Sst:c:d:X:", &l) ; + int opt = subgetopt_r(argc, argv, "c:t:d:X:", &l) ; if (opt == -1) break ; switch (opt) { - case 'S' : divertsignals = 0 ; break ; - case 's' : divertsignals = 1 ; break ; - case 't' : if (uint0_scan(l.arg, &t)) break ; case 'c' : if (uint0_scan(l.arg, &max)) break ; + case 't' : if (uint0_scan(l.arg, &t)) break ; case 'd' : if (!uint0_scan(l.arg, ¬if)) dieusage() ; if (notif < 3) strerr_dief1x(100, "notification fd must be 3 or more") ; @@ -521,22 +533,19 @@ int main (int argc, char const *const *argv) sigemptyset(&set) ; sigaddset(&set, SIGCHLD) ; sigaddset(&set, SIGALRM) ; - sigaddset(&set, SIGTERM) ; - sigaddset(&set, SIGHUP) ; - sigaddset(&set, SIGQUIT) ; sigaddset(&set, SIGABRT) ; + sigaddset(&set, SIGHUP) ; sigaddset(&set, SIGINT) ; - if (divertsignals) - { - sigaddset(&set, SIGUSR1) ; - sigaddset(&set, SIGUSR2) ; + sigaddset(&set, SIGTERM) ; + sigaddset(&set, SIGQUIT) ; + sigaddset(&set, SIGUSR1) ; + sigaddset(&set, SIGUSR2) ; #ifdef SIGPWR - sigaddset(&set, SIGPWR) ; + sigaddset(&set, SIGPWR) ; #endif #ifdef SIGWINCH - sigaddset(&set, SIGWINCH) ; + sigaddset(&set, SIGWINCH) ; #endif - } if (selfpipe_trapset(&set) < 0) strerr_diefu1sys(111, "trap signals") ; } if (notif) @@ -572,8 +581,7 @@ int main (int argc, char const *const *argv) errno = EIO ; panic("check internal pipes") ; } - if (x[0].revents & IOPAUSE_READ) - divertsignals ? handle_diverted_signals() : handle_signals() ; + if (x[0].revents & IOPAUSE_READ) handle_signals() ; if (x[1].revents & IOPAUSE_READ) handle_control(x[1].fd) ; } } @@ -581,14 +589,16 @@ int main (int argc, char const *const *argv) /* Finish phase. */ - selfpipe_finish() ; killthem() ; + closethem() ; restore_console() ; - reap() ; + if (waitall) waitthem() ; else { chld() ; reap() ; } + selfpipe_finish() ; } { - char const *eargv[3] = { FINISH_PROG, finish_arg, 0 } ; + char const *eargv[2] = { FINISH_PROG, 0 } ; execv(eargv[0], (char **)eargv) ; + if (errno != ENOENT) panicnosp("exec finish script " FINISH_PROG) ; } - panicnosp("exec finish script " FINISH_PROG) ; + _exit(0) ; } diff --git a/src/supervision/s6-svscanctl.c b/src/supervision/s6-svscanctl.c index 3339c67..0d7a65d 100644 --- a/src/supervision/s6-svscanctl.c +++ b/src/supervision/s6-svscanctl.c @@ -4,7 +4,7 @@ #include <skalibs/strerr2.h> #include <s6/s6-supervise.h> -#define USAGE "s6-svscanctl [ -phratszbnNiq0678 ] svscandir" +#define USAGE "s6-svscanctl [ -zabhitqnN ] svscandir" #define dieusage() strerr_dieusage(100, USAGE) #define DATASIZE 64 @@ -22,22 +22,15 @@ int main (int argc, char const *const *argv) if (opt == -1) break ; switch (opt) { - case 'p' : - case 'h' : - case 'r' : - case 'a' : - case 't' : - case 's' : case 'z' : + case 'a' : case 'b' : - case 'n' : - case 'N' : + case 'h' : case 'i' : + case 't' : case 'q' : - case '0' : - case '6' : - case '7' : - case '8' : + case 'n' : + case 'N' : { if (datalen >= DATASIZE) strerr_dief1x(100, "too many commands") ; data[datalen++] = opt ; |