From: Jeff Trawick Date: Mon, 13 Aug 2001 18:24:53 +0000 (+0000) Subject: change the name of AP_MPM_NEEDS_RECLAIM_CHILD_PROCESSES to X-Git-Tag: 2.0.24~109 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c8809eb467a162b31cfe08af4665f9797f2ab280;p=apache change the name of AP_MPM_NEEDS_RECLAIM_CHILD_PROCESSES to be more consistent with similar names added recently; this also cleans up an #if/#ifdef discrepency git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90141 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/include/mpm_common.h b/include/mpm_common.h index bbc28cd2a0..9cca64c041 100644 --- a/include/mpm_common.h +++ b/include/mpm_common.h @@ -76,7 +76,7 @@ #include /* for TCP_NODELAY */ #endif -#include "mpm.h" /* for AP_MPM_NEEDS_RECLAIM_CHILD_PROCESSES setting */ +#include "mpm.h" #ifdef __cplusplus extern "C" { @@ -112,7 +112,7 @@ extern "C" { * MPM_NOTE_CHILD_KILLED -- Note the child died in the scoreboard * */ -#if AP_MPM_NEEDS_RECLAIM_CHILD_PROCESSES +#ifdef AP_MPM_WANT_RECLAIM_CHILD_PROCESSES void ap_reclaim_child_processes(int terminate); #endif diff --git a/server/mpm/beos/mpm.h b/server/mpm/beos/mpm.h index bdeb82ef8f..e7faf2e324 100644 --- a/server/mpm/beos/mpm.h +++ b/server/mpm/beos/mpm.h @@ -63,11 +63,11 @@ #include "scoreboard.h" #define MPM_NAME "Beos" -#define AP_MPM_NEEDS_RECLAIM_CHILD_PROCESSES 1 #define MPM_SYNC_CHILD_TABLE() #define MPM_CHILD_PID(i) (ap_scoreboard_image->servers[0][i].tid) #define MPM_NOTE_CHILD_KILLED(i) (MPM_CHILD_PID(i) = 0) +#define AP_MPM_WANT_RECLAIM_CHILD_PROCESSES #define AP_MPM_WANT_WAIT_OR_TIMEOUT #define AP_MPM_WANT_PROCESS_CHILD_STATUS #define AP_MPM_WANT_SET_PIDFILE diff --git a/server/mpm/experimental/perchild/mpm.h b/server/mpm/experimental/perchild/mpm.h index 0a8df316b9..c1bbf0ae8f 100644 --- a/server/mpm/experimental/perchild/mpm.h +++ b/server/mpm/experimental/perchild/mpm.h @@ -67,6 +67,7 @@ #define MPM_NAME "Perchild" +#define AP_MPM_WANT_RECLAIM_CHILD_PROCESSES #define AP_MPM_WANT_WAIT_OR_TIMEOUT #define AP_MPM_WANT_PROCESS_CHILD_STATUS #define AP_MPM_WANT_SET_PIDFILE @@ -76,7 +77,6 @@ #define AP_MPM_WANT_SET_COREDUMPDIR #define AP_MPM_WANT_SET_ACCEPT_LOCK_MECH -#define AP_MPM_NEEDS_RECLAIM_CHILD_PROCESSES 1 #define MPM_SYNC_CHILD_TABLE() #define MPM_CHILD_PID(i) (ap_child_table[i].pid) #define MPM_NOTE_CHILD_KILLED(i) (MPM_CHILD_PID(i) = 0) diff --git a/server/mpm/perchild/mpm.h b/server/mpm/perchild/mpm.h index 0a8df316b9..c1bbf0ae8f 100644 --- a/server/mpm/perchild/mpm.h +++ b/server/mpm/perchild/mpm.h @@ -67,6 +67,7 @@ #define MPM_NAME "Perchild" +#define AP_MPM_WANT_RECLAIM_CHILD_PROCESSES #define AP_MPM_WANT_WAIT_OR_TIMEOUT #define AP_MPM_WANT_PROCESS_CHILD_STATUS #define AP_MPM_WANT_SET_PIDFILE @@ -76,7 +77,6 @@ #define AP_MPM_WANT_SET_COREDUMPDIR #define AP_MPM_WANT_SET_ACCEPT_LOCK_MECH -#define AP_MPM_NEEDS_RECLAIM_CHILD_PROCESSES 1 #define MPM_SYNC_CHILD_TABLE() #define MPM_CHILD_PID(i) (ap_child_table[i].pid) #define MPM_NOTE_CHILD_KILLED(i) (MPM_CHILD_PID(i) = 0) diff --git a/server/mpm/prefork/mpm.h b/server/mpm/prefork/mpm.h index 5dbac99c42..48a5a3df88 100644 --- a/server/mpm/prefork/mpm.h +++ b/server/mpm/prefork/mpm.h @@ -68,6 +68,7 @@ #define MPM_NAME "Prefork" +#define AP_MPM_WANT_RECLAIM_CHILD_PROCESSES #define AP_MPM_WANT_WAIT_OR_TIMEOUT #define AP_MPM_WANT_PROCESS_CHILD_STATUS #define AP_MPM_WANT_SET_PIDFILE @@ -78,7 +79,6 @@ #define AP_MPM_WANT_SET_ACCEPT_LOCK_MECH #define AP_MPM_USES_POD 1 -#define AP_MPM_NEEDS_RECLAIM_CHILD_PROCESSES 1 #define MPM_SYNC_CHILD_TABLE() (ap_sync_scoreboard_image()) #define MPM_CHILD_PID(i) (ap_scoreboard_image->parent[i].pid) #define MPM_NOTE_CHILD_KILLED(i) (MPM_CHILD_PID(i) = 0) diff --git a/server/mpm/threaded/mpm.h b/server/mpm/threaded/mpm.h index 49d01ecb7f..fdd87263e9 100644 --- a/server/mpm/threaded/mpm.h +++ b/server/mpm/threaded/mpm.h @@ -65,6 +65,7 @@ #define MPM_NAME "Threaded" +#define AP_MPM_WANT_RECLAIM_CHILD_PROCESSES #define AP_MPM_WANT_WAIT_OR_TIMEOUT #define AP_MPM_WANT_PROCESS_CHILD_STATUS #define AP_MPM_WANT_SET_PIDFILE @@ -74,7 +75,6 @@ #define AP_MPM_WANT_SET_COREDUMPDIR #define AP_MPM_WANT_SET_ACCEPT_LOCK_MECH -#define AP_MPM_NEEDS_RECLAIM_CHILD_PROCESSES 1 #define MPM_SYNC_CHILD_TABLE() (ap_sync_scoreboard_image()) #define MPM_CHILD_PID(i) (ap_scoreboard_image->parent[i].pid) #define MPM_NOTE_CHILD_KILLED(i) (MPM_CHILD_PID(i) = 0) diff --git a/server/mpm/worker/mpm.h b/server/mpm/worker/mpm.h index 571a00cc2b..a9a91455ec 100644 --- a/server/mpm/worker/mpm.h +++ b/server/mpm/worker/mpm.h @@ -65,6 +65,7 @@ #define MPM_NAME "Worker" +#define AP_MPM_WANT_RECLAIM_CHILD_PROCESSES #define AP_MPM_WANT_WAIT_OR_TIMEOUT #define AP_MPM_WANT_PROCESS_CHILD_STATUS #define AP_MPM_WANT_SET_PIDFILE @@ -74,7 +75,6 @@ #define AP_MPM_WANT_SET_COREDUMPDIR #define AP_MPM_WANT_SET_ACCEPT_LOCK_MECH -#define AP_MPM_NEEDS_RECLAIM_CHILD_PROCESSES 1 #define MPM_SYNC_CHILD_TABLE() (ap_sync_scoreboard_image()) #define MPM_CHILD_PID(i) (ap_scoreboard_image->parent[i].pid) #define MPM_NOTE_CHILD_KILLED(i) (MPM_CHILD_PID(i) = 0) diff --git a/server/mpm_common.c b/server/mpm_common.c index 883db93294..234382884e 100644 --- a/server/mpm_common.c +++ b/server/mpm_common.c @@ -93,7 +93,7 @@ #include #endif -#ifdef AP_MPM_NEEDS_RECLAIM_CHILD_PROCESSES +#ifdef AP_MPM_WANT_RECLAIM_CHILD_PROCESSES void ap_reclaim_child_processes(int terminate) { int i; @@ -186,7 +186,7 @@ void ap_reclaim_child_processes(int terminate) } } } -#endif /* AP_MPM_NEEDS_RECLAIM_CHILD_PROCESSES */ +#endif /* AP_MPM_WANT_RECLAIM_CHILD_PROCESSES */ #ifdef AP_MPM_WANT_WAIT_OR_TIMEOUT