emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libbb: introduce and use safe_waitpid (loops in EINTR)

Browse Source 
*: use more approproate (shorter) versions of wait()

function                                             old     new   delta
safe_waitpid                                           -      48     +48
wait_any_nohang                                        -      17     +17
send_tree                                            365     369      +4
processorstop                                        432     435      +3
text_yank                                            110     108      -2
make_human_readable_str                              202     200      -2
crond_main                                          1368    1366      -2
handle_sigchld                                        49      43      -6
reapchild                                            166     159      -7
custom                                               260     250     -10
checkscript                                          191     177     -14
wait_nohang                                           17       -     -17
wait_pid                                              43       -     -43
------------------------------------------------------------------------------
(add/remove: 2/2 grow/shrink: 2/7 up/down: 72/-103)           Total: -31 bytes
This commit is contained in:
Denis Vlasenko
2008-01-02 19:55:04 +00:00
parent 27963980db
commit fb0eba706c
18 changed files with 51 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
runit/runsv.c
View File

@@ -282,8 +282,7 @@ static unsigned custom(struct svdir *s, char c)
execve(a, prog, environ);
fatal_cannot("run control/?");
}
while (wait_pid(&w, pid) == -1) {
if (errno == EINTR) continue;
while (safe_waitpid(pid, &w, 0) == -1) {
warn_cannot("wait for child control/?");
return 0;
}
@@ -593,7 +592,7 @@ int runsv_main(int argc, char **argv)
int child;
int wstat;
child = wait_nohang(&wstat);
child = wait_any_nohang(&wstat);
if (!child)
break;
if ((child == -1) && (errno != EINTR))

2
runit/runsvdir.c
View File

@@ -252,7 +252,7 @@ int runsvdir_main(int argc, char **argv)
for (;;) {
/* collect children */
for (;;) {
pid = wait_nohang(&wstat);
pid = wait_any_nohang(&wstat);
if (pid <= 0)
break;
for (i = 0; i < svnum; i++) {

3
runit/sv.c
View File

@@ -333,8 +333,7 @@ static int checkscript(void)
bb_perror_msg(WARN"cannot %s child %s/check", "run", *service);
return 0;
}
while (wait_pid(&w, pid) == -1) {
if (errno == EINTR) continue;
while (safe_waitpid(pid, &w, 0) == -1) {
bb_perror_msg(WARN"cannot %s child %s/check", "wait for", *service);
return 0;
}

4
runit/svlogd.c
View File

@@ -265,7 +265,7 @@ static unsigned processorstop(struct logdir *ld)
if (ld->ppid) {
sig_unblock(SIGHUP);
while (wait_pid(&wstat, ld->ppid) == -1)
while (safe_waitpid(ld->ppid, &wstat, 0) == -1)
pause2cannot("wait for processor", ld->name);
sig_block(SIGHUP);
ld->ppid = 0;
@@ -794,7 +794,7 @@ static void sig_child_handler(int sig_no)
if (verbose)
bb_error_msg(INFO"sig%s received", "child");
while ((pid = wait_nohang(&wstat)) > 0) {
while ((pid = wait_any_nohang(&wstat)) > 0) {
for (l = 0; l < dirn; ++l) {
if (dir[l].ppid == pid) {
dir[l].ppid = 0;