Commit 2a42b05f authored by Jeff Trawick's avatar Jeff Trawick
Browse files

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
parent 4fd4325e

include/mpm_common.h

+2 −2
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ 
#include <netinet/tcp.h>    /* 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

 * </pre>

 */

#if AP_MPM_NEEDS_RECLAIM_CHILD_PROCESSES

#ifdef AP_MPM_WANT_RECLAIM_CHILD_PROCESSES

void ap_reclaim_child_processes(int terminate);

#endif

server/mpm/beos/mpm.h

+1 −1
Original line number Diff line number Diff line
@@ -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

server/mpm/experimental/perchild/mpm.h

+1 −1
Original line number Diff line number Diff line
@@ -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)

server/mpm/perchild/mpm.h

+1 −1
Original line number Diff line number Diff line
@@ -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)

server/mpm/prefork/mpm.h

+1 −1
Original line number Diff line number Diff line
@@ -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)