in CHLD handler, stop looping through services when pid is found
function old new delta
reread_config_file 1072 1092 +20
retry_network_setup 55 69 +14
reap_child 132 130 -2
sigset_t omask;
unsigned n;
uint16_t port;
sigset_t omask;
unsigned n;
uint16_t port;
+ int save_errno = errno;
if (!reopen_config_file())
if (!reopen_config_file())
for (sep = serv_list; sep; sep = sep->se_next)
sep->se_checked = 0;
for (sep = serv_list; sep; sep = sep->se_next)
sep->se_checked = 0;
free(sep);
}
restore_sigmask(&omask);
free(sep);
}
restore_sigmask(&omask);
+ ret:
+ errno = save_errno;
}
static void reap_child(int sig UNUSED_PARAM)
}
static void reap_child(int sig UNUSED_PARAM)
pid = wait_any_nohang(&status);
if (pid <= 0)
break;
pid = wait_any_nohang(&status);
if (pid <= 0)
break;
- for (sep = serv_list; sep; sep = sep->se_next)
- if (sep->se_wait == pid) {
- /* One of our "wait" services */
- if (WIFEXITED(status) && WEXITSTATUS(status))
- bb_error_msg("%s: exit status 0x%x",
- sep->se_program, WEXITSTATUS(status));
- else if (WIFSIGNALED(status))
- bb_error_msg("%s: exit signal 0x%x",
- sep->se_program, WTERMSIG(status));
- sep->se_wait = 1;
- add_fd_to_set(sep->se_fd);
- }
+ for (sep = serv_list; sep; sep = sep->se_next) {
+ if (sep->se_wait != pid)
+ continue;
+ /* One of our "wait" services */
+ if (WIFEXITED(status) && WEXITSTATUS(status))
+ bb_error_msg("%s: exit status 0x%x",
+ sep->se_program, WEXITSTATUS(status));
+ else if (WIFSIGNALED(status))
+ bb_error_msg("%s: exit signal 0x%x",
+ sep->se_program, WTERMSIG(status));
+ sep->se_wait = 1;
+ add_fd_to_set(sep->se_fd);
+ break;
+ }
}
errno = save_errno;
}
static void retry_network_setup(int sig UNUSED_PARAM)
{
}
errno = save_errno;
}
static void retry_network_setup(int sig UNUSED_PARAM)
{
+ int save_errno = errno;
servtab_t *sep;
alarm_armed = 0;
servtab_t *sep;
alarm_armed = 0;
}
static void clean_up_and_exit(int sig UNUSED_PARAM)
}
static void clean_up_and_exit(int sig UNUSED_PARAM)