You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by pq...@apache.org on 2008/04/07 12:00:34 UTC
svn commit: r645437 - in /httpd/httpd/trunk: include/ server/mpm/beos/
server/mpm/experimental/event/ server/mpm/experimental/leader/
server/mpm/mpmt_os2/ server/mpm/netware/ server/mpm/prefork/
server/mpm/winnt/ server/mpm/worker/
Author: pquerna
Date: Mon Apr 7 03:00:32 2008
New Revision: 645437
URL: http://svn.apache.org/viewvc?rev=645437&view=rev
Log:
Remove ap_graceful_stop_signalled from all MPMs.
Modified:
httpd/httpd/trunk/include/ap_mpm.h
httpd/httpd/trunk/server/mpm/beos/beos.c
httpd/httpd/trunk/server/mpm/experimental/event/event.c
httpd/httpd/trunk/server/mpm/experimental/leader/leader.c
httpd/httpd/trunk/server/mpm/mpmt_os2/mpmt_os2.c
httpd/httpd/trunk/server/mpm/netware/mpm_netware.c
httpd/httpd/trunk/server/mpm/prefork/prefork.c
httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c
httpd/httpd/trunk/server/mpm/worker/worker.c
Modified: httpd/httpd/trunk/include/ap_mpm.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/ap_mpm.h?rev=645437&r1=645436&r2=645437&view=diff
==============================================================================
--- httpd/httpd/trunk/include/ap_mpm.h (original)
+++ httpd/httpd/trunk/include/ap_mpm.h Mon Apr 7 03:00:32 2008
@@ -91,14 +91,6 @@
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
* @param newproc The resulting process handle.
Modified: httpd/httpd/trunk/server/mpm/beos/beos.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/beos/beos.c?rev=645437&r1=645436&r2=645437&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/beos/beos.c (original)
+++ httpd/httpd/trunk/server/mpm/beos/beos.c Mon Apr 7 03:00:32 2008
@@ -405,15 +405,6 @@
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)
{
Modified: httpd/httpd/trunk/server/mpm/experimental/event/event.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/experimental/event/event.c?rev=645437&r1=645436&r2=645437&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/experimental/event/event.c (original)
+++ httpd/httpd/trunk/server/mpm/experimental/event/event.c Mon Apr 7 03:00:32 2008
@@ -538,21 +538,6 @@
}
/*****************************************************************
- * 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.
*/
Modified: httpd/httpd/trunk/server/mpm/experimental/leader/leader.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/experimental/leader/leader.c?rev=645437&r1=645436&r2=645437&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/experimental/leader/leader.c (original)
+++ httpd/httpd/trunk/server/mpm/experimental/leader/leader.c Mon Apr 7 03:00:32 2008
@@ -579,14 +579,6 @@
* 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.
*/
Modified: httpd/httpd/trunk/server/mpm/mpmt_os2/mpmt_os2.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/mpmt_os2/mpmt_os2.c?rev=645437&r1=645436&r2=645437&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/mpmt_os2/mpmt_os2.c (original)
+++ httpd/httpd/trunk/server/mpm/mpmt_os2/mpmt_os2.c Mon Apr 7 03:00:32 2008
@@ -448,12 +448,6 @@
-int ap_graceful_stop_signalled(void)
-{
- return is_graceful;
-}
-
-
/* Configuration handling stuff */
Modified: httpd/httpd/trunk/server/mpm/netware/mpm_netware.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/netware/mpm_netware.c?rev=645437&r1=645436&r2=645437&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/netware/mpm_netware.c (original)
+++ httpd/httpd/trunk/server/mpm/netware/mpm_netware.c Mon Apr 7 03:00:32 2008
@@ -314,12 +314,6 @@
*/
-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;
Modified: httpd/httpd/trunk/server/mpm/prefork/prefork.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/prefork/prefork.c?rev=645437&r1=645436&r2=645437&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/prefork/prefork.c (original)
+++ httpd/httpd/trunk/server/mpm/prefork/prefork.c Mon Apr 7 03:00:32 2008
@@ -431,14 +431,6 @@
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;
Modified: httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c?rev=645437&r1=645436&r2=645437&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c (original)
+++ httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c Mon Apr 7 03:00:32 2008
@@ -207,13 +207,6 @@
"%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 @@
case SIGNAL_PARENT_RESTART:
case SIGNAL_PARENT_RESTART_GRACEFUL:
{
- is_graceful = 1;
SetEvent(restart_event);
break;
}
@@ -249,7 +241,6 @@
case SIGNAL_PARENT_RESTART_GRACEFUL:
{
signal_name = signal_restart_name;
- is_graceful = 1;
break;
}
default:
Modified: httpd/httpd/trunk/server/mpm/worker/worker.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/worker/worker.c?rev=645437&r1=645436&r2=645437&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/worker/worker.c (original)
+++ httpd/httpd/trunk/server/mpm/worker/worker.c Mon Apr 7 03:00:32 2008
@@ -512,17 +512,6 @@
* 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.
*/
Re: svn commit: r645437 - in /httpd/httpd/trunk: include/ server/mpm/beos/
server/mpm/experimental/event/ server/mpm/experimental/leader/ server/mpm/mpmt_os2/
server/mpm/netware/ server/mpm/prefork/ server/mpm/winnt/ server/mpm/worker/
Posted by Paul Querna <ch...@force-elite.com>.
Takashi Sato wrote:
> On Mon, 07 Apr 2008 10:00:34 -0000
> pquerna@apache.org wrote:
>
>> Author: pquerna
>> Date: Mon Apr 7 03:00:32 2008
>> New Revision: 645437
>>
>> URL: http://svn.apache.org/viewvc?rev=645437&view=rev
>> Log:
>> Remove ap_graceful_stop_signalled from all MPMs.
> (snip)
....
> Doesn't this require a major bump?
Well, I thought it didn't.
I thought it was hidden behind CORE_PRIVATE.
But I guess it wasn't.
Added major bump in r645551.
Thanks,
-Paul
Re: svn commit: r645437 - in /httpd/httpd/trunk: include/
server/mpm/beos/ server/mpm/experimental/event/
server/mpm/experimental/leader/ server/mpm/mpmt_os2/ server/mpm/netware/
server/mpm/prefork/ server/mpm/winnt/ server/mpm/worker/
Posted by Takashi Sato <se...@lans-tv.com>.
On Mon, 07 Apr 2008 10:00:34 -0000
pquerna@apache.org wrote:
> Author: pquerna
> Date: Mon Apr 7 03:00:32 2008
> New Revision: 645437
>
> URL: http://svn.apache.org/viewvc?rev=645437&view=rev
> Log:
> Remove ap_graceful_stop_signalled from all MPMs.
(snip)
> Modified: httpd/httpd/trunk/include/ap_mpm.h
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/ap_mpm.h?rev=645437&r1=645436&r2=645437&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/include/ap_mpm.h (original)
> +++ httpd/httpd/trunk/include/ap_mpm.h Mon Apr 7 03:00:32 2008
> @@ -91,14 +91,6 @@
> 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
> * @param newproc The resulting process handle.
>
Doesn't this require a major bump?