diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-02-16 22:58:56 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-02-16 22:58:56 +0000 |
| commit | 25591c322c9305bd54d3ab80cfaf01ef87640d77 (patch) | |
| tree | 66ce77758e35f4faa2d5f611d0535365f2cba00a /runit | |
| parent | 7fc294cdfe1e7f4a12c44f984a698b0c0f609075 (diff) | |
| download | busybox-w32-25591c322c9305bd54d3ab80cfaf01ef87640d77.tar.gz busybox-w32-25591c322c9305bd54d3ab80cfaf01ef87640d77.tar.bz2 busybox-w32-25591c322c9305bd54d3ab80cfaf01ef87640d77.zip | |
libbb: introduce bb_signals and bb_signals_recursive,
which sets same handler for many signals. sig_catch is nuked
(bb_signals_recursive is more descriptive name).
*: use them as appropriate.
function old new delta
bb_signals_recursive - 95 +95
bb_signals - 52 +52
run_command 258 273 +15
svlogd_main 1368 1377 +9
runsv_main 1746 1752 +6
runsvdir_main 1643 1646 +3
UNSPEC_print 64 66 +2
time_main 1128 1127 -1
...
resize_main 246 210 -36
sig_catch 63 - -63
set_fatal_sighandler 85 14 -71
------------------------------------------------------------------------------
(add/remove: 2/1 grow/shrink: 5/24 up/down: 182/-548) Total: -366 bytes
Diffstat (limited to 'runit')
| -rw-r--r-- | runit/runsv.c | 10 | ||||
| -rw-r--r-- | runit/runsvdir.c | 10 | ||||
| -rw-r--r-- | runit/svlogd.c | 16 |
3 files changed, 21 insertions, 15 deletions
diff --git a/runit/runsv.c b/runit/runsv.c index e1d99e2df..02271d68b 100644 --- a/runit/runsv.c +++ b/runit/runsv.c | |||
| @@ -345,8 +345,10 @@ static void startservice(struct svdir *s) | |||
| 345 | xdup2(logpipe.wr, 1); | 345 | xdup2(logpipe.wr, 1); |
| 346 | } | 346 | } |
| 347 | } | 347 | } |
| 348 | signal(SIGCHLD, SIG_DFL); | 348 | bb_signals(0 |
| 349 | signal(SIGTERM, SIG_DFL); | 349 | + (1 << SIGCHLD) |
| 350 | + (1 << SIGTERM) | ||
| 351 | , SIG_DFL); | ||
| 350 | sig_unblock(SIGCHLD); | 352 | sig_unblock(SIGCHLD); |
| 351 | sig_unblock(SIGTERM); | 353 | sig_unblock(SIGTERM); |
| 352 | execvp(*run, run); | 354 | execvp(*run, run); |
| @@ -460,9 +462,9 @@ int runsv_main(int argc, char **argv) | |||
| 460 | ndelay_on(selfpipe.wr); | 462 | ndelay_on(selfpipe.wr); |
| 461 | 463 | ||
| 462 | sig_block(SIGCHLD); | 464 | sig_block(SIGCHLD); |
| 463 | sig_catch(SIGCHLD, s_child); | 465 | bb_signals_recursive(1 << SIGCHLD, s_child); |
| 464 | sig_block(SIGTERM); | 466 | sig_block(SIGTERM); |
| 465 | sig_catch(SIGTERM, s_term); | 467 | bb_signals_recursive(1 << SIGTERM, s_term); |
| 466 | 468 | ||
| 467 | xchdir(dir); | 469 | xchdir(dir); |
| 468 | /* bss: svd[0].pid = 0; */ | 470 | /* bss: svd[0].pid = 0; */ |
diff --git a/runit/runsvdir.c b/runit/runsvdir.c index 4225ac101..3ff1d4c23 100644 --- a/runit/runsvdir.c +++ b/runit/runsvdir.c | |||
| @@ -100,8 +100,10 @@ static void runsv(int no, const char *name) | |||
| 100 | /* child */ | 100 | /* child */ |
| 101 | if (set_pgrp) | 101 | if (set_pgrp) |
| 102 | setsid(); | 102 | setsid(); |
| 103 | signal(SIGHUP, SIG_DFL); | 103 | bb_signals(0 |
| 104 | signal(SIGTERM, SIG_DFL); | 104 | + (1 << SIGHUP) |
| 105 | + (1 << SIGTERM) | ||
| 106 | , SIG_DFL); | ||
| 105 | execvp(prog[0], prog); | 107 | execvp(prog[0], prog); |
| 106 | fatal2_cannot("start runsv ", name); | 108 | fatal2_cannot("start runsv ", name); |
| 107 | } | 109 | } |
| @@ -232,8 +234,8 @@ int runsvdir_main(int argc, char **argv) | |||
| 232 | bb_show_usage(); | 234 | bb_show_usage(); |
| 233 | } | 235 | } |
| 234 | 236 | ||
| 235 | sig_catch(SIGTERM, s_term); | 237 | bb_signals_recursive(1 << SIGTERM, s_term); |
| 236 | sig_catch(SIGHUP, s_hangup); | 238 | bb_signals_recursive(1 << SIGHUP, s_hangup); |
| 237 | svdir = *argv++; | 239 | svdir = *argv++; |
| 238 | if (argv && *argv) { | 240 | if (argv && *argv) { |
| 239 | rplog = *argv; | 241 | rplog = *argv; |
diff --git a/runit/svlogd.c b/runit/svlogd.c index 9c169da1f..73570dad0 100644 --- a/runit/svlogd.c +++ b/runit/svlogd.c | |||
| @@ -222,9 +222,11 @@ static unsigned processorstart(struct logdir *ld) | |||
| 222 | int fd; | 222 | int fd; |
| 223 | 223 | ||
| 224 | /* child */ | 224 | /* child */ |
| 225 | signal(SIGTERM, SIG_DFL); | 225 | bb_signals(0 |
| 226 | signal(SIGALRM, SIG_DFL); | 226 | + (1 << SIGTERM) |
| 227 | signal(SIGHUP, SIG_DFL); | 227 | + (1 << SIGALRM) |
| 228 | + (1 << SIGHUP) | ||
| 229 | , SIG_DFL); | ||
| 228 | sig_unblock(SIGTERM); | 230 | sig_unblock(SIGTERM); |
| 229 | sig_unblock(SIGALRM); | 231 | sig_unblock(SIGALRM); |
| 230 | sig_unblock(SIGHUP); | 232 | sig_unblock(SIGHUP); |
| @@ -903,10 +905,10 @@ int svlogd_main(int argc, char **argv) | |||
| 903 | sigaddset(&blocked_sigset, SIGALRM); | 905 | sigaddset(&blocked_sigset, SIGALRM); |
| 904 | sigaddset(&blocked_sigset, SIGHUP); | 906 | sigaddset(&blocked_sigset, SIGHUP); |
| 905 | sigprocmask(SIG_BLOCK, &blocked_sigset, NULL); | 907 | sigprocmask(SIG_BLOCK, &blocked_sigset, NULL); |
| 906 | sig_catch(SIGTERM, sig_term_handler); | 908 | bb_signals_recursive(1 << SIGTERM, sig_term_handler); |
| 907 | sig_catch(SIGCHLD, sig_child_handler); | 909 | bb_signals_recursive(1 << SIGCHLD, sig_child_handler); |
| 908 | sig_catch(SIGALRM, sig_alarm_handler); | 910 | bb_signals_recursive(1 << SIGALRM, sig_alarm_handler); |
| 909 | sig_catch(SIGHUP, sig_hangup_handler); | 911 | bb_signals_recursive(1 << SIGHUP, sig_hangup_handler); |
| 910 | 912 | ||
| 911 | logdirs_reopen(); | 913 | logdirs_reopen(); |
| 912 | 914 | ||