httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/include mpm_common.h
Date Mon, 13 Aug 2001 18:24:54 GMT
trawick     01/08/13 11:24:53

  Modified:    server   mpm_common.c
               server/mpm/beos mpm.h
               server/mpm/perchild mpm.h
               server/mpm/prefork mpm.h
               server/mpm/threaded mpm.h
               server/mpm/worker mpm.h
               include  mpm_common.h
  Log:
  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
  
  Revision  Changes    Path
  1.63      +2 -2      httpd-2.0/server/mpm_common.c
  
  Index: mpm_common.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm_common.c,v
  retrieving revision 1.62
  retrieving revision 1.63
  diff -u -r1.62 -r1.63
  --- mpm_common.c	2001/08/13 16:42:13	1.62
  +++ mpm_common.c	2001/08/13 18:24:53	1.63
  @@ -93,7 +93,7 @@
   #include <grp.h>
   #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 @@
           }
       }
   }
  -#endif /* AP_MPM_NEEDS_RECLAIM_CHILD_PROCESSES */
  +#endif /* AP_MPM_WANT_RECLAIM_CHILD_PROCESSES */
   
   #ifdef AP_MPM_WANT_WAIT_OR_TIMEOUT
   
  
  
  
  1.11      +1 -1      httpd-2.0/server/mpm/beos/mpm.h
  
  Index: mpm.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/beos/mpm.h,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- mpm.h	2001/08/13 15:44:00	1.10
  +++ mpm.h	2001/08/13 18:24:53	1.11
  @@ -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
  
  
  
  1.10      +1 -1      httpd-2.0/server/mpm/perchild/mpm.h
  
  Index: mpm.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/perchild/mpm.h,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- mpm.h	2001/08/13 15:44:00	1.9
  +++ mpm.h	2001/08/13 18:24:53	1.10
  @@ -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)
  
  
  
  1.15      +1 -1      httpd-2.0/server/mpm/prefork/mpm.h
  
  Index: mpm.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/prefork/mpm.h,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- mpm.h	2001/08/13 15:44:00	1.14
  +++ mpm.h	2001/08/13 18:24:53	1.15
  @@ -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)
  
  
  
  1.8       +1 -1      httpd-2.0/server/mpm/threaded/mpm.h
  
  Index: mpm.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/threaded/mpm.h,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- mpm.h	2001/08/13 15:44:00	1.7
  +++ mpm.h	2001/08/13 18:24:53	1.8
  @@ -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)
  
  
  
  1.4       +1 -1      httpd-2.0/server/mpm/worker/mpm.h
  
  Index: mpm.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/worker/mpm.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- mpm.h	2001/08/13 15:44:00	1.3
  +++ mpm.h	2001/08/13 18:24:53	1.4
  @@ -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)
  
  
  
  1.27      +2 -2      httpd-2.0/include/mpm_common.h
  
  Index: mpm_common.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/include/mpm_common.h,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- mpm_common.h	2001/08/13 16:42:13	1.26
  +++ mpm_common.h	2001/08/13 18:24:53	1.27
  @@ -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 @@
    *  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
   
  
  
  

Mime
View raw message