httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rede...@apache.org
Subject cvs commit: httpd-2.0/server/mpm/winnt mpm_winnt.c
Date Wed, 18 Jul 2001 20:29:00 GMT
rederpj     01/07/18 13:29:00

  Modified:    .        CHANGES
               include  ap_mpm.h
               modules/generators mod_info.c
               server   mpm_common.c scoreboard.c
               server/mpm/beos beos.c
               server/mpm/perchild perchild.c
               server/mpm/prefork prefork.c
               server/mpm/spmt_os2 spmt_os2.c
               server/mpm/threaded threaded.c
               server/mpm/winnt mpm_winnt.c
  Log:
  Changed AP_MPMQ_MAX_DAEMONS to refer to MaxClients and
  added an AP_MPMQ_MAX_DAEMON_USED to refer to the highest
  daemon index actually used in the scoreboard. I also
  updated the pertinent calls.
  
  Paul J. Reder
  
  Revision  Changes    Path
  1.248     +5 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.247
  retrieving revision 1.248
  diff -u -r1.247 -r1.248
  --- CHANGES	2001/07/13 18:46:13	1.247
  +++ CHANGES	2001/07/18 20:28:58	1.248
  @@ -1,5 +1,10 @@
   Changes with Apache 2.0.21-dev
   
  +  *) Changed AP_MPMQ_MAX_DAEMONS to refer to MaxClients and
  +     added an AP_MPMQ_MAX_DAEMON_USED to refer to the highest
  +     daemon index actually used in the scoreboard. I also
  +     updated the pertinent calls. [Paul J. Reder]
  +
     *) Win32: Prevent listening sockets from being inherited by
        the Apache child process, CGI scripts, rotatelog process
        etc.  If the Apache child process segfaults, any processes 
  
  
  
  1.28      +3 -2      httpd-2.0/include/ap_mpm.h
  
  Index: ap_mpm.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/include/ap_mpm.h,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- ap_mpm.h	2001/06/27 17:43:28	1.27
  +++ ap_mpm.h	2001/07/18 20:28:59	1.28
  @@ -158,17 +158,18 @@
                                         /* an MPM is using a dynamic #  */
                                         /* threads or daemons.          */
   
  -#define AP_MPMQ_MAX_DAEMONS           1  /* Max # of daemons             */
  +#define AP_MPMQ_MAX_DAEMON_USED       1  /* Max # of daemons used so far */
   #define AP_MPMQ_IS_THREADED           2  /* MPM can do threading         */
   #define AP_MPMQ_IS_FORKED             3  /* MPM can do forking           */
   #define AP_MPMQ_HARD_LIMIT_DAEMONS    4  /* The compiled max # deamons   */
   #define AP_MPMQ_HARD_LIMIT_THREADS    5  /* The compiled max # threads   */
  -#define AP_MPMQ_MAX_THREADS           6  /* Max # of threads             */
  +#define AP_MPMQ_MAX_THREADS           6  /* # of threads/child by config */
   #define AP_MPMQ_MIN_SPARE_DEAMONS     7  /* Min # of spare daemons       */
   #define AP_MPMQ_MIN_SPARE_THREADS     8  /* Min # of spare threads       */
   #define AP_MPMQ_MAX_SPARE_DAEMONS     9  /* Max # of spare daemons       */
   #define AP_MPMQ_MAX_SPARE_THREADS    10  /* Max # of spare threads       */
   #define AP_MPMQ_MAX_REQUESTS_DEAMON  11  /* Max # of requests per daemon */
  +#define AP_MPMQ_MAX_DAEMONS          12  /* Max # of daemons by config   */
   
   
   /**
  
  
  
  1.38      +1 -1      httpd-2.0/modules/generators/mod_info.c
  
  Index: mod_info.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/generators/mod_info.c,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- mod_info.c	2001/05/17 13:58:52	1.37
  +++ mod_info.c	2001/07/18 20:28:59	1.38
  @@ -415,7 +415,7 @@
                           "<tt>connection: %d &nbsp;&nbsp; "
                           "keep-alive: %d</tt><br>",
                           serv->timeout, serv->keep_alive_timeout);
  -            ap_mpm_query(AP_MPMQ_MAX_DAEMONS, &max_daemons);
  +            ap_mpm_query(AP_MPMQ_MAX_DAEMON_USED, &max_daemons);
               ap_mpm_query(AP_MPMQ_IS_THREADED, &threaded);
               ap_mpm_query(AP_MPMQ_IS_FORKED, &forked);
               ap_rprintf(r, "MPM used is %s<br>\n", ap_show_mpm());
  
  
  
  1.58      +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.57
  retrieving revision 1.58
  diff -u -r1.57 -r1.58
  --- mpm_common.c	2001/07/18 16:56:55	1.57
  +++ mpm_common.c	2001/07/18 20:28:59	1.58
  @@ -97,7 +97,7 @@
       int not_dead_yet;
       int max_daemons;
   
  -    ap_mpm_query(AP_MPMQ_MAX_DAEMONS, &max_daemons);
  +    ap_mpm_query(AP_MPMQ_MAX_DAEMON_USED, &max_daemons);
       MPM_SYNC_CHILD_TABLE();
   
       for (tries = terminate ? 4 : 1; tries <= 9; ++tries) {
  
  
  
  1.28      +1 -1      httpd-2.0/server/scoreboard.c
  
  Index: scoreboard.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/scoreboard.c,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- scoreboard.c	2001/07/16 02:29:33	1.27
  +++ scoreboard.c	2001/07/18 20:28:59	1.28
  @@ -255,7 +255,7 @@
       int i;
       int max_daemons_limit;
   
  -    ap_mpm_query(AP_MPMQ_MAX_DAEMONS, &max_daemons_limit);
  +    ap_mpm_query(AP_MPMQ_MAX_DAEMON_USED, &max_daemons_limit);
   
       for (i = 0; i < max_daemons_limit; ++i)
   	if (ap_scoreboard_image->parent[i].pid == pid->pid)
  
  
  
  1.54      +4 -1      httpd-2.0/server/mpm/beos/beos.c
  
  Index: beos.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/beos/beos.c,v
  retrieving revision 1.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- beos.c	2001/06/27 17:43:33	1.53
  +++ beos.c	2001/07/18 20:28:59	1.54
  @@ -653,7 +653,7 @@
   AP_DECLARE(apr_status_t) ap_mpm_query(int query_code, int *result)
   {
       switch(query_code){
  -        case AP_MPMQ_MAX_DAEMONS:
  +        case AP_MPMQ_MAX_DAEMON_USED:
               *result = ap_max_child_assigned;
               return APR_SUCCESS;
           case AP_MPMQ_IS_THREADED:
  @@ -685,6 +685,9 @@
               return APR_SUCCESS;
           case AP_MPMQ_MAX_REQUESTS_DEAMON:
               *result = ap_max_requests_per_child;
  +            return APR_SUCCESS;
  +        case AP_MPMQ_MAX_DAEMONS:
  +            *result = ap_thread_limit;
               return APR_SUCCESS;
       }
       return APR_ENOTIMPL;
  
  
  
  1.70      +4 -1      httpd-2.0/server/mpm/perchild/perchild.c
  
  Index: perchild.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/perchild/perchild.c,v
  retrieving revision 1.69
  retrieving revision 1.70
  diff -u -r1.69 -r1.70
  --- perchild.c	2001/06/27 17:43:36	1.69
  +++ perchild.c	2001/07/18 20:28:59	1.70
  @@ -222,7 +222,7 @@
   AP_DECLARE(apr_status_t) ap_mpm_query(int query_code, int *result)
   {
       switch(query_code){
  -        case AP_MPMQ_MAX_DAEMONS:
  +        case AP_MPMQ_MAX_DAEMON_USED:
               *result = ap_max_daemons_limit;
               return APR_SUCCESS;
           case AP_MPMQ_IS_THREADED:
  @@ -255,6 +255,9 @@
           case AP_MPMQ_MAX_REQUESTS_DEAMON:
               *result = max_requests_per_child;
               return APR_SUCCESS; 
  +        case AP_MPMQ_MAX_DAEMONS:
  +            *result = num_daemons;
  +            return APR_SUCCESS;
       }
       return APR_ENOTIMPL;
   }
  
  
  
  1.191     +4 -1      httpd-2.0/server/mpm/prefork/prefork.c
  
  Index: prefork.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/prefork/prefork.c,v
  retrieving revision 1.190
  retrieving revision 1.191
  diff -u -r1.190 -r1.191
  --- prefork.c	2001/07/16 02:29:33	1.190
  +++ prefork.c	2001/07/18 20:28:59	1.191
  @@ -315,7 +315,7 @@
   AP_DECLARE(apr_status_t) ap_mpm_query(int query_code, int *result)
   {
       switch(query_code){
  -        case AP_MPMQ_MAX_DAEMONS:
  +        case AP_MPMQ_MAX_DAEMON_USED:
               *result = ap_daemons_limit;
               return APR_SUCCESS;
           case AP_MPMQ_IS_THREADED:
  @@ -347,6 +347,9 @@
               return APR_SUCCESS;
           case AP_MPMQ_MAX_REQUESTS_DEAMON:
               *result = ap_max_requests_per_child;
  +            return APR_SUCCESS;
  +        case AP_MPMQ_MAX_DAEMONS:
  +            *result = ap_daemons_limit;
               return APR_SUCCESS;
       }
       return APR_ENOTIMPL;
  
  
  
  1.97      +4 -1      httpd-2.0/server/mpm/spmt_os2/spmt_os2.c
  
  Index: spmt_os2.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/spmt_os2/spmt_os2.c,v
  retrieving revision 1.96
  retrieving revision 1.97
  diff -u -r1.96 -r1.97
  --- spmt_os2.c	2001/06/27 17:43:43	1.96
  +++ spmt_os2.c	2001/07/18 20:28:59	1.97
  @@ -878,7 +878,7 @@
   AP_DECLARE(apr_status_t) ap_mpm_query(int query_code, int *result)
   {
       switch(query_code){
  -        case AP_MPMQ_MAX_DAEMONS:
  +        case AP_MPMQ_MAX_DAEMON_USED:
               *result = max_daemons_limit;
               return APR_SUCCESS;
           case AP_MPMQ_IS_THREADED:
  @@ -911,6 +911,9 @@
           case AP_MPMQ_MAX_REQUESTS_DEAMON:
               *result = ap_max_requests_per_child;
               return APR_SUCCESS; 
  +        case AP_MPMQ_MAX_DAEMONS:
  +            *result = ap_daemons_limit;
  +            return APR_SUCCESS;
       }
       return APR_ENOTIMPL;
   } 
  
  
  
  1.45      +4 -1      httpd-2.0/server/mpm/threaded/threaded.c
  
  Index: threaded.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/threaded/threaded.c,v
  retrieving revision 1.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- threaded.c	2001/07/03 13:58:10	1.44
  +++ threaded.c	2001/07/18 20:28:59	1.45
  @@ -192,7 +192,7 @@
   AP_DECLARE(apr_status_t) ap_mpm_query(int query_code, int *result)
   {
       switch(query_code){
  -        case AP_MPMQ_MAX_DAEMONS:
  +        case AP_MPMQ_MAX_DAEMON_USED:
               *result = ap_max_daemons_limit;
               return APR_SUCCESS;
           case AP_MPMQ_IS_THREADED:
  @@ -224,6 +224,9 @@
               return APR_SUCCESS;
           case AP_MPMQ_MAX_REQUESTS_DEAMON:
               *result = ap_max_requests_per_child;
  +            return APR_SUCCESS;
  +        case AP_MPMQ_MAX_DAEMONS:
  +            *result = ap_daemons_limit;
               return APR_SUCCESS;
       }
       return APR_ENOTIMPL;
  
  
  
  1.165     +4 -1      httpd-2.0/server/mpm/winnt/mpm_winnt.c
  
  Index: mpm_winnt.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/winnt/mpm_winnt.c,v
  retrieving revision 1.164
  retrieving revision 1.165
  diff -u -r1.164 -r1.165
  --- mpm_winnt.c	2001/07/18 16:56:55	1.164
  +++ mpm_winnt.c	2001/07/18 20:29:00	1.165
  @@ -1563,7 +1563,7 @@
   AP_DECLARE(apr_status_t) ap_mpm_query(int query_code, int *result)
   {
       switch(query_code){
  -        case AP_MPMQ_MAX_DAEMONS:
  +        case AP_MPMQ_MAX_DAEMON_USED:
               *result = MAXIMUM_WAIT_OBJECTS;
               return APR_SUCCESS;
           case AP_MPMQ_IS_THREADED:
  @@ -1595,6 +1595,9 @@
               return APR_SUCCESS;
           case AP_MPMQ_MAX_REQUESTS_DEAMON:
               *result = ap_max_requests_per_child;
  +            return APR_SUCCESS;
  +        case AP_MPMQ_MAX_DAEMONS:
  +            *result = 0;
               return APR_SUCCESS;
       }
       return APR_ENOTIMPL;
  
  
  

Mime
View raw message