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/runsv.c | |
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/runsv.c')
-rw-r--r-- | runit/runsv.c | 10 |
1 files changed, 6 insertions, 4 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; */ |