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/svlogd.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/svlogd.c')
-rw-r--r-- | runit/svlogd.c | 16 |
1 files changed, 9 insertions, 7 deletions
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 | ||