From: Paul Querna Date: Mon, 7 Apr 2008 10:00:32 +0000 (+0000) Subject: Remove ap_graceful_stop_signalled from all MPMs. X-Git-Tag: 2.3.0~790 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5fa2bbbdeb901279685d12b4fd29026720b6e825;p=apache Remove ap_graceful_stop_signalled from all MPMs. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@645437 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/include/ap_mpm.h b/include/ap_mpm.h index ca8b625623..eb3ef51663 100644 --- a/include/ap_mpm.h +++ b/include/ap_mpm.h @@ -90,14 +90,6 @@ extern "C" { */ AP_DECLARE(int) ap_mpm_run(apr_pool_t *pconf, apr_pool_t *plog, server_rec *server_conf); -/** - * predicate indicating if a graceful stop has been requested ... - * used by the connection loop - * @return 1 if a graceful stop has been requested, 0 otherwise - * @fn int ap_graceful_stop_signalled(*void) - */ -AP_DECLARE(int) ap_graceful_stop_signalled(void); - /** * Spawn a process with privileges that another module has requested * @param r The request_rec of the current request diff --git a/server/mpm/beos/beos.c b/server/mpm/beos/beos.c index 7c97d941d1..896116a839 100644 --- a/server/mpm/beos/beos.c +++ b/server/mpm/beos/beos.c @@ -405,15 +405,6 @@ static void set_signals(void) ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, "sigaction(" AP_SIG_GRACEFUL_STRING ")"); } -/***************************************************************** - * Here follows a long bunch of generic server bookkeeping stuff... - */ - -int ap_graceful_stop_signalled(void) -{ - return is_graceful; -} - /* This is the thread that actually does all the work. */ static int32 worker_thread(void *dummy) { diff --git a/server/mpm/experimental/event/event.c b/server/mpm/experimental/event/event.c index 290b58fe23..12f7f405c4 100644 --- a/server/mpm/experimental/event/event.c +++ b/server/mpm/experimental/event/event.c @@ -537,21 +537,6 @@ static void set_signals(void) #endif } -/***************************************************************** - * Here follows a long bunch of generic server bookkeeping stuff... - */ - -int ap_graceful_stop_signalled(void) - /* XXX this is really a bad confusing obsolete name - * maybe it should be ap_mpm_process_exiting? - */ -{ - /* note: for a graceful termination, listener_may_exit will be set before - * workers_may_exit, so check listener_may_exit - */ - return listener_may_exit; -} - /***************************************************************** * Child process main loop. */ diff --git a/server/mpm/experimental/leader/leader.c b/server/mpm/experimental/leader/leader.c index 69ad1b8243..abc4338fae 100644 --- a/server/mpm/experimental/leader/leader.c +++ b/server/mpm/experimental/leader/leader.c @@ -579,14 +579,6 @@ static void set_signals(void) * Here follows a long bunch of generic server bookkeeping stuff... */ -int ap_graceful_stop_signalled(void) - /* XXX this is really a bad confusing obsolete name - * maybe it should be ap_mpm_process_exiting? - */ -{ - return workers_may_exit; -} - /***************************************************************** * Child process main loop. */ diff --git a/server/mpm/mpmt_os2/mpmt_os2.c b/server/mpm/mpmt_os2/mpmt_os2.c index a5636cefda..0759416321 100644 --- a/server/mpm/mpmt_os2/mpmt_os2.c +++ b/server/mpm/mpmt_os2/mpmt_os2.c @@ -448,12 +448,6 @@ AP_DECLARE(apr_status_t) ap_mpm_query(int query_code, int *result) -int ap_graceful_stop_signalled(void) -{ - return is_graceful; -} - - /* Configuration handling stuff */ diff --git a/server/mpm/netware/mpm_netware.c b/server/mpm/netware/mpm_netware.c index b2417ee899..42d821ecae 100644 --- a/server/mpm/netware/mpm_netware.c +++ b/server/mpm/netware/mpm_netware.c @@ -314,12 +314,6 @@ int nlmUnloadSignaled(int wait) */ -int ap_graceful_stop_signalled(void) -{ - /* not ever called anymore... */ - return 0; -} - #define MAX_WB_RETRIES 3 #ifdef DBINFO_ON static int would_block = 0; diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c index 1f7ca1e543..8948c43c4a 100644 --- a/server/mpm/prefork/prefork.c +++ b/server/mpm/prefork/prefork.c @@ -431,14 +431,6 @@ static void set_signals(void) static int requests_this_child; static int num_listensocks = 0; - -int ap_graceful_stop_signalled(void) -{ - /* not ever called anymore... */ - return 0; -} - - static void child_main(int child_num_arg) { apr_pool_t *ptrans; diff --git a/server/mpm/winnt/mpm_winnt.c b/server/mpm/winnt/mpm_winnt.c index 715310e013..59ee8dc8de 100644 --- a/server/mpm/winnt/mpm_winnt.c +++ b/server/mpm/winnt/mpm_winnt.c @@ -207,13 +207,6 @@ void setup_signal_names(char *prefix) "%s_restart", signal_name_prefix); } -int volatile is_graceful = 0; - -AP_DECLARE(int) ap_graceful_stop_signalled(void) -{ - return is_graceful; -} - AP_DECLARE(void) ap_signal_parent(ap_signal_parent_e type) { HANDLE e; @@ -230,7 +223,6 @@ AP_DECLARE(void) ap_signal_parent(ap_signal_parent_e type) case SIGNAL_PARENT_RESTART: case SIGNAL_PARENT_RESTART_GRACEFUL: { - is_graceful = 1; SetEvent(restart_event); break; } @@ -249,7 +241,6 @@ AP_DECLARE(void) ap_signal_parent(ap_signal_parent_e type) case SIGNAL_PARENT_RESTART_GRACEFUL: { signal_name = signal_restart_name; - is_graceful = 1; break; } default: diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c index dbf021541d..65b7436c3b 100644 --- a/server/mpm/worker/worker.c +++ b/server/mpm/worker/worker.c @@ -512,17 +512,6 @@ static void set_signals(void) * Here follows a long bunch of generic server bookkeeping stuff... */ -int ap_graceful_stop_signalled(void) - /* XXX this is really a bad confusing obsolete name - * maybe it should be ap_mpm_process_exiting? - */ -{ - /* note: for a graceful termination, listener_may_exit will be set before - * workers_may_exit, so check listener_may_exit - */ - return listener_may_exit; -} - /***************************************************************** * Child process main loop. */