VladPolskiy/apache-http-server
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-10 02:56:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

clean up the scoreboard properly after threaded processes die gracefully.

Browse Source 
find_child_by_pid() failed to do its job, because ap_max_daemons_used was
too low.  There was some recent breakage in threaded that contributes to
the problem.

However, find_child_by_pid() should not be using the current number of
daemons.  It could have been recently reduced, which makes it fail to
find the exiting process.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90015 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Greg Ames
2001-08-07 22:28:51 +00:00
parent 1d500be519
commit a2f4e88595
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/mpm/threaded/threaded.c
View File

@ -1047,9 +1047,11 @@ static void perform_idle_server_maintenance(void)
}
++free_length;
}
if (!all_dead_threads) {
last_non_dead = i;
}
/* XXX if (!ps->quiescing) is probably more reliable GLA */
if (!any_dying_threads) {
last_non_dead = i;
++total_non_dead;
}
}

2
server/scoreboard.c
View File

@ -266,7 +266,7 @@ AP_DECLARE(int) find_child_by_pid(apr_proc_t *pid)
int i;
int max_daemons_limit;
ap_mpm_query(AP_MPMQ_MAX_DAEMON_USED, &max_daemons_limit);
ap_mpm_query(AP_MPMQ_MAX_DAEMONS, &max_daemons_limit);
for (i = 0; i < max_daemons_limit; ++i)
if (ap_scoreboard_image->parent[i].pid == pid->pid)