22542eca18
function old new delta vgetopt32 1318 1392 +74 runsvdir_main 703 713 +10 bb_make_directory 423 425 +2 collect_cpu 546 545 -1 opt_chars 3 - -3 opt_complementary 4 - -4 tftpd_main 567 562 -5 ntp_init 476 471 -5 zcip_main 1266 1256 -10 xxd_main 428 418 -10 whois_main 140 130 -10 who_main 463 453 -10 which_main 212 202 -10 wget_main 2535 2525 -10 watchdog_main 291 281 -10 watch_main 222 212 -10 vlock_main 399 389 -10 uuencode_main 332 322 -10 uudecode_main 316 306 -10 unlink_main 45 35 -10 udhcpd_main 1482 1472 -10 udhcpc_main 2762 2752 -10 tune2fs_main 290 280 -10 tunctl_main 366 356 -10 truncate_main 218 208 -10 tr_main 518 508 -10 time_main 1134 1124 -10 tftp_main 286 276 -10 telnetd_main 1873 1863 -10 tcpudpsvd_main 1785 1775 -10 taskset_main 521 511 -10 tar_main 1009 999 -10 tail_main 1644 1634 -10 syslogd_main 1967 1957 -10 switch_root_main 368 358 -10 svlogd_main 1454 1444 -10 sv 1296 1286 -10 stat_main 104 94 -10 start_stop_daemon_main 1028 1018 -10 split_main 542 532 -10 sort_main 796 786 -10 slattach_main 624 614 -10 shuf_main 504 494 -10 setsid_main 96 86 -10 setserial_main 1132 1122 -10 setfont_main 388 378 -10 setconsole_main 78 68 -10 sendmail_main 1209 1199 -10 sed_main 677 667 -10 script_main 1077 1067 -10 run_parts_main 325 315 -10 rtcwake_main 454 444 -10 rm_main 175 165 -10 reformime_main 119 109 -10 readlink_main 123 113 -10 rdate_main 246 236 -10 pwdx_main 189 179 -10 pstree_main 317 307 -10 pscan_main 663 653 -10 popmaildir_main 818 808 -10 pmap_main 80 70 -10 nc_main 1042 1032 -10 mv_main 558 548 -10 mountpoint_main 477 467 -10 mount_main 1264 1254 -10 modprobe_main 768 758 -10 modinfo_main 333 323 -10 mktemp_main 200 190 -10 mkswap_main 324 314 -10 mkfs_vfat_main 1489 1479 -10 microcom_main 715 705 -10 md5_sha1_sum_main 521 511 -10 man_main 867 857 -10 makedevs_main 1052 1042 -10 ls_main 563 553 -10 losetup_main 432 422 -10 loadfont_main 89 79 -10 ln_main 524 514 -10 link_main 75 65 -10 ipcalc_main 544 534 -10 iostat_main 2397 2387 -10 install_main 768 758 -10 id_main 480 470 -10 i2cset_main 1239 1229 -10 i2cget_main 380 370 -10 i2cdump_main 1482 1472 -10 i2cdetect_main 682 672 -10 hwclock_main 406 396 -10 httpd_main 741 731 -10 grep_main 837 827 -10 getty_main 1559 1549 -10 fuser_main 297 287 -10 ftpgetput_main 345 335 -10 ftpd_main 2232 2222 -10 fstrim_main 251 241 -10 fsfreeze_main 77 67 -10 fsck_minix_main 2921 2911 -10 flock_main 314 304 -10 flashcp_main 740 730 -10 flash_eraseall_main 833 823 -10 fdformat_main 532 522 -10 expand_main 680 670 -10 eject_main 335 325 -10 dumpleases_main 630 620 -10 du_main 314 304 -10 dos2unix_main 441 431 -10 diff_main 1350 1340 -10 df_main 1064 1054 -10 date_main 1095 1085 -10 cut_main 961 951 -10 cryptpw_main 228 218 -10 crontab_main 575 565 -10 crond_main 1149 1139 -10 cp_main 370 360 -10 common_traceroute_main 3834 3824 -10 common_ping_main 1767 1757 -10 comm_main 239 229 -10 cmp_main 655 645 -10 chrt_main 379 369 -10 chpst_main 704 694 -10 chpasswd_main 308 298 -10 chown_main 171 161 -10 chmod_main 158 148 -10 cat_main 428 418 -10 bzip2_main 120 110 -10 blkdiscard_main 264 254 -10 base64_main 221 211 -10 arping_main 1665 1655 -10 ar_main 556 546 -10 adjtimex_main 406 396 -10 adduser_main 882 872 -10 addgroup_main 411 401 -10 acpid_main 1198 1188 -10 optstring 11 - -11 opt_string 18 - -18 OPT_STR 25 - -25 ubi_tools_main 1288 1258 -30 ls_options 31 - -31 ------------------------------------------------------------------------------ (add/remove: 0/6 grow/shrink: 3/129 up/down: 86/-1383) Total: -1297 bytes text data bss dec hex filename 915428 485 6876 922789 e14a5 busybox_old 914629 485 6872 921986 e1182 busybox_unstripped Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
427 lines
11 KiB
C
427 lines
11 KiB
C
/*
|
|
Copyright (c) 2001-2006, Gerrit Pape
|
|
All rights reserved.
|
|
|
|
Redistribution and use in source and binary forms, with or without
|
|
modification, are permitted provided that the following conditions are met:
|
|
|
|
1. Redistributions of source code must retain the above copyright notice,
|
|
this list of conditions and the following disclaimer.
|
|
2. Redistributions in binary form must reproduce the above copyright
|
|
notice, this list of conditions and the following disclaimer in the
|
|
documentation and/or other materials provided with the distribution.
|
|
3. The name of the author may not be used to endorse or promote products
|
|
derived from this software without specific prior written permission.
|
|
|
|
THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
|
|
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
|
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
|
|
EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
|
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
|
|
OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
|
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
|
|
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
|
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
/* Busyboxed by Denys Vlasenko <vda.linux@googlemail.com> */
|
|
|
|
//config:config RUNSVDIR
|
|
//config: bool "runsvdir (6 kb)"
|
|
//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
|
|
//usage: "[-P] [-s SCRIPT] DIR"
|
|
//usage:#define runsvdir_full_usage "\n\n"
|
|
//usage: "Start a runsv process for each subdirectory. If it exits, restart it.\n"
|
|
//usage: "\n -P Put each runsv in a new session"
|
|
//usage: "\n -s SCRIPT Run SCRIPT <signo> after signal is processed"
|
|
|
|
#include <sys/file.h>
|
|
#include "libbb.h"
|
|
#include "common_bufsiz.h"
|
|
#include "runit_lib.h"
|
|
|
|
#define MAXSERVICES 1000
|
|
|
|
/* Should be not needed - all dirs are on same FS, right? */
|
|
#define CHECK_DEVNO_TOO 0
|
|
|
|
struct service {
|
|
#if CHECK_DEVNO_TOO
|
|
dev_t dev;
|
|
#endif
|
|
ino_t ino;
|
|
pid_t pid;
|
|
smallint isgone;
|
|
};
|
|
|
|
struct globals {
|
|
struct service *sv;
|
|
char *svdir;
|
|
int svnum;
|
|
#if ENABLE_FEATURE_RUNSVDIR_LOG
|
|
char *rplog;
|
|
struct fd_pair logpipe;
|
|
struct pollfd pfd[1];
|
|
unsigned stamplog;
|
|
#endif
|
|
} FIX_ALIASING;
|
|
#define G (*(struct globals*)bb_common_bufsiz1)
|
|
#define sv (G.sv )
|
|
#define svdir (G.svdir )
|
|
#define svnum (G.svnum )
|
|
#define rplog (G.rplog )
|
|
#define logpipe (G.logpipe )
|
|
#define pfd (G.pfd )
|
|
#define stamplog (G.stamplog )
|
|
#define INIT_G() do { setup_common_bufsiz(); } while (0)
|
|
|
|
static void fatal2_cannot(const char *m1, const char *m2)
|
|
{
|
|
bb_perror_msg_and_die("%s: fatal: can't %s%s", svdir, m1, m2);
|
|
/* was exiting 100 */
|
|
}
|
|
static void warn3x(const char *m1, const char *m2, const char *m3)
|
|
{
|
|
bb_error_msg("%s: warning: %s%s%s", svdir, m1, m2, m3);
|
|
}
|
|
static void warn2_cannot(const char *m1, const char *m2)
|
|
{
|
|
warn3x("can't ", m1, m2);
|
|
}
|
|
#if ENABLE_FEATURE_RUNSVDIR_LOG
|
|
static void warnx(const char *m1)
|
|
{
|
|
warn3x(m1, "", "");
|
|
}
|
|
#endif
|
|
|
|
/* inlining + vfork -> bigger code */
|
|
static NOINLINE pid_t runsv(const char *name)
|
|
{
|
|
pid_t pid;
|
|
|
|
/* If we got signaled, stop spawning children at once! */
|
|
if (bb_got_signal)
|
|
return 0;
|
|
|
|
pid = vfork();
|
|
if (pid == -1) {
|
|
warn2_cannot("vfork", "");
|
|
return 0;
|
|
}
|
|
if (pid == 0) {
|
|
/* child */
|
|
if (option_mask32 & 1) /* -P option? */
|
|
setsid();
|
|
/* man execv:
|
|
* "Signals set to be caught by the calling process image
|
|
* shall be set to the default action in the new process image."
|
|
* Therefore, we do not need this: */
|
|
#if 0
|
|
bb_signals(0
|
|
| (1 << SIGHUP)
|
|
| (1 << SIGTERM)
|
|
, SIG_DFL);
|
|
#endif
|
|
execlp("runsv", "runsv", name, (char *) NULL);
|
|
fatal2_cannot("start runsv ", name);
|
|
}
|
|
return pid;
|
|
}
|
|
|
|
/* gcc 4.3.0 does better with NOINLINE */
|
|
static NOINLINE int do_rescan(void)
|
|
{
|
|
DIR *dir;
|
|
struct dirent *d;
|
|
int i;
|
|
struct stat s;
|
|
int need_rescan = 0;
|
|
|
|
dir = opendir(".");
|
|
if (!dir) {
|
|
warn2_cannot("open directory ", svdir);
|
|
return 1; /* need to rescan again soon */
|
|
}
|
|
for (i = 0; i < svnum; i++)
|
|
sv[i].isgone = 1;
|
|
|
|
while (1) {
|
|
errno = 0;
|
|
d = readdir(dir);
|
|
if (!d)
|
|
break;
|
|
if (d->d_name[0] == '.')
|
|
continue;
|
|
if (stat(d->d_name, &s) == -1) {
|
|
warn2_cannot("stat ", d->d_name);
|
|
continue;
|
|
}
|
|
if (!S_ISDIR(s.st_mode))
|
|
continue;
|
|
/* Do we have this service listed already? */
|
|
for (i = 0; i < svnum; i++) {
|
|
if (sv[i].ino == s.st_ino
|
|
#if CHECK_DEVNO_TOO
|
|
&& sv[i].dev == s.st_dev
|
|
#endif
|
|
) {
|
|
if (sv[i].pid == 0) /* restart if it has died */
|
|
goto run_ith_sv;
|
|
sv[i].isgone = 0; /* "we still see you" */
|
|
goto next_dentry;
|
|
}
|
|
}
|
|
{ /* Not found, make new service */
|
|
struct service *svnew = realloc(sv, (i+1) * sizeof(*sv));
|
|
if (!svnew) {
|
|
warn2_cannot("start runsv ", d->d_name);
|
|
need_rescan = 1;
|
|
continue;
|
|
}
|
|
sv = svnew;
|
|
svnum++;
|
|
#if CHECK_DEVNO_TOO
|
|
sv[i].dev = s.st_dev;
|
|
#endif
|
|
sv[i].ino = s.st_ino;
|
|
run_ith_sv:
|
|
sv[i].pid = runsv(d->d_name);
|
|
sv[i].isgone = 0;
|
|
}
|
|
next_dentry: ;
|
|
}
|
|
i = errno;
|
|
closedir(dir);
|
|
if (i) { /* readdir failed */
|
|
warn2_cannot("read directory ", svdir);
|
|
return 1; /* need to rescan again soon */
|
|
}
|
|
|
|
/* Send SIGTERM to runsv whose directories
|
|
* were no longer found (-> must have been removed) */
|
|
for (i = 0; i < svnum; i++) {
|
|
if (!sv[i].isgone)
|
|
continue;
|
|
if (sv[i].pid)
|
|
kill(sv[i].pid, SIGTERM);
|
|
svnum--;
|
|
sv[i] = sv[svnum];
|
|
i--; /* so that we don't skip new sv[i] (bug was here!) */
|
|
}
|
|
return need_rescan;
|
|
}
|
|
|
|
int runsvdir_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
|
int runsvdir_main(int argc UNUSED_PARAM, char **argv)
|
|
{
|
|
struct stat s;
|
|
dev_t last_dev = last_dev; /* for gcc */
|
|
ino_t last_ino = last_ino; /* for gcc */
|
|
time_t last_mtime;
|
|
int curdir;
|
|
unsigned stampcheck;
|
|
int i;
|
|
int need_rescan;
|
|
bool i_am_init;
|
|
char *opt_s_argv[3];
|
|
|
|
INIT_G();
|
|
|
|
opt_s_argv[0] = NULL;
|
|
opt_s_argv[2] = NULL;
|
|
getopt32(argv, "^" "Ps:" "\0" "-1", &opt_s_argv[0]);
|
|
argv += optind;
|
|
|
|
i_am_init = (getpid() == 1);
|
|
bb_signals(0
|
|
| (1 << SIGTERM)
|
|
| (1 << SIGHUP)
|
|
/* For busybox's init, SIGTERM == reboot,
|
|
* 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.
|
|
*/
|
|
| (i_am_init ? ((1 << SIGUSR1) | (1 << SIGUSR2) | (1 << SIGINT)) : 0)
|
|
, record_signo);
|
|
svdir = *argv++;
|
|
|
|
#if ENABLE_FEATURE_RUNSVDIR_LOG
|
|
/* setup log */
|
|
if (*argv) {
|
|
rplog = *argv;
|
|
if (strlen(rplog) < 7) {
|
|
warnx("log must have at least seven characters");
|
|
} else if (piped_pair(logpipe)) {
|
|
warnx("can't create pipe for log");
|
|
} else {
|
|
close_on_exec_on(logpipe.rd);
|
|
close_on_exec_on(logpipe.wr);
|
|
ndelay_on(logpipe.rd);
|
|
ndelay_on(logpipe.wr);
|
|
if (dup2(logpipe.wr, 2) == -1) {
|
|
warnx("can't set filedescriptor for log");
|
|
} else {
|
|
pfd[0].fd = logpipe.rd;
|
|
pfd[0].events = POLLIN;
|
|
stamplog = monotonic_sec();
|
|
goto run;
|
|
}
|
|
}
|
|
rplog = NULL;
|
|
warnx("log service disabled");
|
|
}
|
|
run:
|
|
#endif
|
|
curdir = open(".", O_RDONLY|O_NDELAY);
|
|
if (curdir == -1)
|
|
fatal2_cannot("open current directory", "");
|
|
close_on_exec_on(curdir);
|
|
|
|
stampcheck = monotonic_sec();
|
|
need_rescan = 1;
|
|
last_mtime = 0;
|
|
|
|
for (;;) {
|
|
unsigned now;
|
|
unsigned sig;
|
|
|
|
/* collect children */
|
|
for (;;) {
|
|
pid_t pid = wait_any_nohang(NULL);
|
|
if (pid <= 0)
|
|
break;
|
|
for (i = 0; i < svnum; i++) {
|
|
if (pid == sv[i].pid) {
|
|
/* runsv has died */
|
|
sv[i].pid = 0;
|
|
need_rescan = 1;
|
|
}
|
|
}
|
|
}
|
|
|
|
now = monotonic_sec();
|
|
if ((int)(now - stampcheck) >= 0) {
|
|
/* wait at least a second */
|
|
stampcheck = now + 1;
|
|
|
|
if (stat(svdir, &s) != -1) {
|
|
if (need_rescan || s.st_mtime != last_mtime
|
|
|| s.st_ino != last_ino || s.st_dev != last_dev
|
|
) {
|
|
/* svdir modified */
|
|
if (chdir(svdir) != -1) {
|
|
last_mtime = s.st_mtime;
|
|
last_dev = s.st_dev;
|
|
last_ino = s.st_ino;
|
|
/* if the svdir changed this very second, wait until the
|
|
* next second, because we won't be able to detect more
|
|
* changes within this second */
|
|
while (time(NULL) == last_mtime)
|
|
usleep(100000);
|
|
need_rescan = do_rescan();
|
|
while (fchdir(curdir) == -1) {
|
|
warn2_cannot("change directory, pausing", "");
|
|
sleep(5);
|
|
}
|
|
} else {
|
|
warn2_cannot("change directory to ", svdir);
|
|
}
|
|
}
|
|
} else {
|
|
warn2_cannot("stat ", svdir);
|
|
}
|
|
}
|
|
|
|
#if ENABLE_FEATURE_RUNSVDIR_LOG
|
|
if (rplog) {
|
|
if ((int)(now - stamplog) >= 0) {
|
|
write(logpipe.wr, ".", 1);
|
|
stamplog = now + 900;
|
|
}
|
|
}
|
|
pfd[0].revents = 0;
|
|
#endif
|
|
{
|
|
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
|
|
if (pfd[0].revents & POLLIN) {
|
|
char ch;
|
|
while (read(logpipe.rd, &ch, 1) > 0) {
|
|
if (ch < ' ')
|
|
ch = ' ';
|
|
for (i = 6; rplog[i] != '\0'; i++)
|
|
rplog[i-1] = rplog[i];
|
|
rplog[i-1] = ch;
|
|
}
|
|
}
|
|
#endif
|
|
sig = bb_got_signal;
|
|
if (!sig)
|
|
continue;
|
|
bb_got_signal = 0;
|
|
|
|
/* -s SCRIPT: useful if we are init.
|
|
* In this case typically script never returns,
|
|
* it halts/powers off/reboots the system. */
|
|
if (opt_s_argv[0]) {
|
|
pid_t pid;
|
|
|
|
/* Single parameter: signal# */
|
|
opt_s_argv[1] = utoa(sig);
|
|
pid = spawn(opt_s_argv);
|
|
if (pid > 0) {
|
|
/* Remembering to wait for _any_ children,
|
|
* not just pid */
|
|
while (wait(NULL) != pid)
|
|
continue;
|
|
}
|
|
}
|
|
|
|
if (sig == SIGHUP) {
|
|
for (i = 0; i < svnum; i++)
|
|
if (sv[i].pid)
|
|
kill(sv[i].pid, SIGTERM);
|
|
}
|
|
/* SIGHUP or SIGTERM (or SIGUSRn if we are init) */
|
|
/* Exit unless we are init */
|
|
if (!i_am_init)
|
|
return (SIGHUP == sig) ? 111 : EXIT_SUCCESS;
|
|
|
|
/* init continues to monitor services forever */
|
|
} /* for (;;) */
|
|
}
|