lighttpd
/
lighttpd1.4
2
0
Fork 0
Code Issues Releases Wiki Activity

[core] remove redundant waitpid() on each backend 

remove redundant waitpid() on each backend
(performed each second during periodic maintenance)

Doing so is redundant with handle_waitpid hook since lighttpd 1.4.46
personal/stbuehler/tests-path
Glenn Strauss 2021-08-31 03:28:45 -04:00
parent e77bc3995c
commit f364c8ef36
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gw_backend.c
View File

@ -2724,9 +2724,11 @@ static void gw_handle_trigger_host(gw_host * const host, log_error_st * const er
unix_time64_t idle_timestamp;
int overload = 1;
#if 0 /* redundant w/ handle_waitpid hook since lighttpd 1.4.46 */
for (proc = host->first; proc; proc = proc->next) {
gw_proc_waitpid(host, proc, errh);
}
#endif
gw_restart_dead_procs(host, errh, debug, 1);
@ -2771,9 +2773,11 @@ static void gw_handle_trigger_host(gw_host * const host, log_error_st * const er
break;
}
#if 0 /* redundant w/ handle_waitpid hook since lighttpd 1.4.46 */
for (proc = host->unused_procs; proc; proc = proc->next) {
gw_proc_waitpid(host, proc, errh);
}
#endif
}
static void gw_handle_trigger_exts(gw_exts * const exts, log_error_st * const errh, const int debug) {
@ -2886,6 +2890,8 @@ handler_t gw_handle_waitpid_cb(server *srv, void *p_d, pid_t pid, int status) {
/* restart, but avoid spinning if child exits too quickly */
if (proc->disabled_until < cur_ts) {
/*(set state PROC_STATE_DIED above, so != KILLED here)*/
/*(PROC_STATE_KILLED belongs in unused_procs, anyway)*/
if (proc->state != PROC_STATE_KILLED)
proc->disabled_until = cur_ts;
if (gw_spawn_connection(host, proc, errh, debug)) {