Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/runit/runsvdir.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/runit/runsvdir.c (modified) (13 diffs)

branches/3.3/mindi-busybox/runit/runsvdir.c

@@ -27 +27 @@
 
 /* Busyboxed by Denys Vlasenko <vda.linux@googlemail.com> */
-/* TODO: depends on runit_lib.c - review and reduce/eliminate */
+
+//config:config RUNSVDIR
+//config:   bool "runsvdir"
+//config:   default y
+//config:   help
+//config:     runsvdir starts a runsv process for each subdirectory, or symlink to
+//config:     a directory, in the services directory dir, up to a limit of 1000
+//config:     subdirectories, and restarts a runsv process if it terminates.
+//config:
+//config:config FEATURE_RUNSVDIR_LOG
+//config:   bool "Enable scrolling argument log"
+//config:   depends on RUNSVDIR
+//config:   default n
+//config:   help
+//config:     Enable feature where second parameter of runsvdir holds last error
+//config:     message (viewable via top/ps). Otherwise (feature is off
+//config:     or no parameter), error messages go to stderr only.
+
+//applet:IF_RUNSVDIR(APPLET(runsvdir, BB_DIR_USR_BIN, BB_SUID_DROP))
+
+//kbuild:lib-$(CONFIG_RUNSVDIR) += runsvdir.o
 
 //usage:#define runsvdir_trivial_usage
@@ -36 +56 @@
 //usage:     "\n    -s SCRIPT   Run SCRIPT <signo> after signal is processed"
 
-#include <sys/poll.h>
 #include <sys/file.h>
 #include "libbb.h"
+#include "common_bufsiz.h"
 #include "runit_lib.h"
 
@@ -61 +81 @@
 #if ENABLE_FEATURE_RUNSVDIR_LOG
     char *rplog;
-    int rploglen;
     struct fd_pair logpipe;
     struct pollfd pfd[1];
@@ -67 +86 @@
 #endif
 } FIX_ALIASING;
-#define G (*(struct globals*)&bb_common_bufsiz1)
+#define G (*(struct globals*)bb_common_bufsiz1)
 #define sv          (G.sv          )
 #define svdir       (G.svdir       )
 #define svnum       (G.svnum       )
 #define rplog       (G.rplog       )
-#define rploglen    (G.rploglen    )
 #define logpipe     (G.logpipe     )
 #define pfd         (G.pfd         )
 #define stamplog    (G.stamplog    )
-#define INIT_G() do { } while (0)
+#define INIT_G() do { setup_common_bufsiz(); } while (0)
 
 static void fatal2_cannot(const char *m1, const char *m2)
@@ -221 +239 @@
     dev_t last_dev = last_dev; /* for gcc */
     ino_t last_ino = last_ino; /* for gcc */
-    time_t last_mtime = 0;
-    int wstat;
+    time_t last_mtime;
     int curdir;
-    pid_t pid;
-    unsigned deadline;
-    unsigned now;
     unsigned stampcheck;
     int i;
-    int need_rescan = 1;
+    int need_rescan;
+    bool i_am_init;
     char *opt_s_argv[3];
 
@@ -240 +255 @@
     argv += optind;
 
+    i_am_init = (getpid() == 1);
     bb_signals(0
         | (1 << SIGTERM)
         | (1 << SIGHUP)
         /* For busybox's init, SIGTERM == reboot,
-         * SIGUSR1 == halt
-         * SIGUSR2 == poweroff
-         * so we need to intercept SIGUSRn too.
+         * SIGUSR1 == halt,
+         * SIGUSR2 == poweroff,
+         * Ctlr-ALt-Del sends SIGINT to init,
+         * so we need to intercept SIGUSRn and SIGINT too.
          * Note that we do not implement actual reboot
          * (killall(TERM) + umount, etc), we just pause
          * respawing and avoid exiting (-> making kernel oops).
-         * The user is responsible for the rest. */
-        | (getpid() == 1 ? ((1 << SIGUSR1) | (1 << SIGUSR2)) : 0)
+         * The user is responsible for the rest.
+         */
+        | (i_am_init ? ((1 << SIGUSR1) | (1 << SIGUSR2) | (1 << SIGINT)) : 0)
         , record_signo);
     svdir = *argv++;
@@ -259 +277 @@
     if (*argv) {
         rplog = *argv;
-        rploglen = strlen(rplog);
-        if (rploglen < 7) {
+        if (strlen(rplog) < 7) {
             warnx("log must have at least seven characters");
         } else if (piped_pair(logpipe)) {
@@ -289 +306 @@
 
     stampcheck = monotonic_sec();
+    need_rescan = 1;
+    last_mtime = 0;
 
     for (;;) {
+        unsigned now;
+        unsigned sig;
+
         /* collect children */
         for (;;) {
-            pid = wait_any_nohang(&wstat);
+            pid_t pid = wait_any_nohang(NULL);
             if (pid <= 0)
                 break;
@@ -347 +369 @@
         pfd[0].revents = 0;
 #endif
-        deadline = (need_rescan ? 1 : 5);
-        sig_block(SIGCHLD);
-#if ENABLE_FEATURE_RUNSVDIR_LOG
-        if (rplog)
-            poll(pfd, 1, deadline*1000);
-        else
-#endif
-            sleep(deadline);
-        sig_unblock(SIGCHLD);
+        {
+            unsigned deadline = (need_rescan ? 1 : 5);
+#if ENABLE_FEATURE_RUNSVDIR_LOG
+            if (rplog)
+                poll(pfd, 1, deadline*1000);
+            else
+#endif
+                sleep(deadline);
+        }
 
 #if ENABLE_FEATURE_RUNSVDIR_LOG
@@ -363 +385 @@
                 if (ch < ' ')
                     ch = ' ';
-                for (i = 6; i < rploglen; i++)
+                for (i = 6; rplog[i] != '\0'; i++)
                     rplog[i-1] = rplog[i];
-                rplog[rploglen-1] = ch;
-            }
-        }
-#endif
-        if (!bb_got_signal)
+                rplog[i-1] = ch;
+            }
+        }
+#endif
+        sig = bb_got_signal;
+        if (!sig)
             continue;
+        bb_got_signal = 0;
 
         /* -s SCRIPT: useful if we are init.
@@ -376 +400 @@
          * it halts/powers off/reboots the system. */
         if (opt_s_argv[0]) {
+            pid_t pid;
+
             /* Single parameter: signal# */
-            opt_s_argv[1] = utoa(bb_got_signal);
+            opt_s_argv[1] = utoa(sig);
             pid = spawn(opt_s_argv);
             if (pid > 0) {
@@ -387 +413 @@
         }
 
-        if (bb_got_signal == SIGHUP) {
+        if (sig == SIGHUP) {
             for (i = 0; i < svnum; i++)
                 if (sv[i].pid)
@@ -394 +420 @@
         /* SIGHUP or SIGTERM (or SIGUSRn if we are init) */
         /* Exit unless we are init */
-        if (getpid() != 1)
-            return (SIGHUP == bb_got_signal) ? 111 : EXIT_SUCCESS;
+        if (!i_am_init)
+            return (SIGHUP == sig) ? 111 : EXIT_SUCCESS;
 
         /* init continues to monitor services forever */
-        bb_got_signal = 0;
     } /* for (;;) */
 }