httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b..@apache.org
Subject cvs commit: httpd-2.0/server/mpm/threaded mpm.h
Date Mon, 19 Mar 2001 13:07:29 GMT
bjh         01/03/19 05:07:28

  Modified:    include  mpm_common.h
               server   mpm_common.c
               server/mpm/beos mpm.h
               server/mpm/perchild mpm.h
               server/mpm/prefork mpm.h
               server/mpm/threaded mpm.h
  Log:
  Declaration of ap_reclaim_child_processes() in exports.c needs to be
  conditional in the same way that the function's definition is so give it a
  suitable macro that will be recogized by the scripts that make exports.c.
  
  Revision  Changes    Path
  1.19      +2 -0      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.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- mpm_common.h	2001/03/17 15:58:09	1.18
  +++ mpm_common.h	2001/03/19 13:07:26	1.19
  @@ -110,7 +110,9 @@
    *  MPM_NOTE_CHILD_KILLED -- Note the child died in the scoreboard
    * </PRE>
    */
  +#if AP_MPM_NEEDS_RECLAIM_CHILD_PROCESSES
   void ap_reclaim_child_processes(int terminate);
  +#endif
   
   /**
    * Determine if any child process has died.  If no child process died, then
  
  
  
  1.44      +1 -1      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.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- mpm_common.c	2001/03/02 22:46:31	1.43
  +++ mpm_common.c	2001/03/19 13:07:26	1.44
  @@ -86,7 +86,7 @@
   #include <grp.h>
   #endif
   
  -#ifdef MPM_NEEDS_RECLAIM_CHILD_PROCESSES
  +#ifdef AP_MPM_NEEDS_RECLAIM_CHILD_PROCESSES
   void ap_reclaim_child_processes(int terminate)
   {
       int i;
  
  
  
  1.7       +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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- mpm.h	2001/02/16 04:26:50	1.6
  +++ mpm.h	2001/03/19 13:07:27	1.7
  @@ -62,7 +62,7 @@
   #define BEOS_MPM
   #include "scoreboard.h"
   
  -#define MPM_NEEDS_RECLAIM_CHILD_PROCESSES 1
  +#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)
  
  
  
  1.6       +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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- mpm.h	2001/02/16 04:26:50	1.5
  +++ mpm.h	2001/03/19 13:07:27	1.6
  @@ -65,7 +65,7 @@
   
   #define PERCHILD_MPM
   
  -#define MPM_NEEDS_RECLAIM_CHILD_PROCESSES 1
  +#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.10      +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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- mpm.h	2001/03/02 18:51:56	1.9
  +++ mpm.h	2001/03/19 13:07:28	1.10
  @@ -66,7 +66,7 @@
   
   #define PREFORK_MPM
   
  -#define MPM_NEEDS_RECLAIM_CHILD_PROCESSES 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.3       +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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mpm.h	2001/03/02 18:52:19	1.2
  +++ mpm.h	2001/03/19 13:07:28	1.3
  @@ -63,7 +63,7 @@
   
   #define THREADED_MPM
   
  -#define MPM_NEEDS_RECLAIM_CHILD_PROCESSES 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)
  
  
  

Mime
View raw message