httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bnicho...@apache.org
Subject cvs commit: httpd-2.0/server/mpm/netware mpm_netware.c
Date Tue, 16 Dec 2003 20:55:04 GMT
bnicholes    2003/12/16 12:55:04

  Modified:    server/mpm/netware mpm_netware.c
  Log:
  Added mpm_state to ap_mpm_query() for the NetWare MPM
  
  Revision  Changes    Path
  1.78      +8 -0      httpd-2.0/server/mpm/netware/mpm_netware.c
  
  Index: mpm_netware.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/netware/mpm_netware.c,v
  retrieving revision 1.77
  retrieving revision 1.78
  diff -u -r1.77 -r1.78
  --- mpm_netware.c	4 Dec 2003 21:26:50 -0000	1.77
  +++ mpm_netware.c	16 Dec 2003 20:55:04 -0000	1.78
  @@ -154,6 +154,7 @@
   static int ap_threads_min_free=0;
   static int ap_threads_max_free=0;
   static int ap_threads_limit=0;
  +static int mpm_state = AP_MPMQ_STARTING;
   
   /*
    * The max child slot ever assigned, preserved across restarts.  Necessary
  @@ -268,6 +269,9 @@
           case AP_MPMQ_MAX_DAEMONS:
               *result = 1;
               return APR_SUCCESS;
  +        case AP_MPMQ_MPM_STATE:
  +            *result = mpm_state;
  +            return APR_SUCCESS;
       }
       return APR_ENOTIMPL;
   }
  @@ -946,6 +950,7 @@
   #endif
       show_server_data();
   
  +    mpm_state = AP_MPMQ_RUNNING;
       while (!restart_pending && !shutdown_pending) {
           perform_idle_server_maintenance(pconf);
           if (show_settings)
  @@ -953,6 +958,7 @@
           apr_thread_yield();
           apr_sleep(SCOREBOARD_MAINTENANCE_INTERVAL);
       }
  +    mpm_state = AP_MPMQ_STOPPING;
   
   
       /* Shutdown the listen sockets so that we don't get stuck in a blocking call. 
  @@ -997,6 +1003,8 @@
   {
       int debug;
       char *addrname = NULL;
  +
  +    mpm_state = AP_MPMQ_STARTING;
   
       debug = ap_exists_config_define("DEBUG");
   
  
  
  

Mime
View raw message