You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2011/03/03 00:17:22 UTC
svn commit: r1076454 - /httpd/httpd/trunk/server/mpm/prefork/prefork.c
Author: trawick
Date: Wed Mar 2 23:17:22 2011
New Revision: 1076454
URL: http://svn.apache.org/viewvc?rev=1076454&view=rev
Log:
prefork in ONE_PROCESS mode:
child_main() called clean_child_exit() in almost all paths,
and returned to the caller in one infrequent path; just
call clean_child_exit() always
Modified:
httpd/httpd/trunk/server/mpm/prefork/prefork.c
Modified: httpd/httpd/trunk/server/mpm/prefork/prefork.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/prefork/prefork.c?rev=1076454&r1=1076453&r2=1076454&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/prefork/prefork.c (original)
+++ httpd/httpd/trunk/server/mpm/prefork/prefork.c Wed Mar 2 23:17:22 2011
@@ -585,16 +585,12 @@ static void child_main(int child_num_arg
/* check for termination first so we don't sleep for a while in
* poll if already signalled
*/
- if (one_process && shutdown_pending) {
- SAFE_ACCEPT(accept_mutex_off());
- return;
- }
- else if (die_now) {
- /* In graceful stop/restart; drop the mutex
- * and terminate the child. */
+ if (die_now /* in graceful stop/restart */
+ || (one_process && shutdown_pending)) {
SAFE_ACCEPT(accept_mutex_off());
clean_child_exit(0);
}
+
/* timeout == 10 seconds to avoid a hang at graceful restart/stop
* caused by the closing of sockets by the signal handler
*/
@@ -710,7 +706,7 @@ static int make_child(server_rec *s, int
apr_signal(SIGTERM, sig_term);
ap_scoreboard_image->parent[slot].pid = getpid();
child_main(slot);
- return 0;
+ /* NOTREACHED */
}
(void) ap_update_child_status_from_indexes(slot, 0, SERVER_STARTING,
@@ -934,6 +930,7 @@ static int prefork_run(apr_pool_t *_pcon
if (one_process) {
AP_MONCONTROL(1);
make_child(ap_server_conf, 0);
+ /* NOTREACHED */
}
else {
if (ap_daemons_max_free < ap_daemons_min_free + 1) /* Don't thrash... */