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 Thu, 03 Oct 2002 00:30:54 GMT
bnicholes    2002/10/02 17:30:54

  Modified:    server/mpm/netware mpm_netware.c
  Log:
  Don't bother destroying the memory pools and buckets for each thread at
  during shutdown since it will all be cleaned up at termination anyway.
  
  Revision  Changes    Path
  1.60      +11 -9     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.59
  retrieving revision 1.60
  diff -u -r1.59 -r1.60
  --- mpm_netware.c	28 Aug 2002 19:56:32 -0000	1.59
  +++ mpm_netware.c	3 Oct 2002 00:30:54 -0000	1.60
  @@ -203,12 +203,21 @@
   #define DBPRINT2(s,v1,v2)
   #endif
   
  +/* volatile just in case */
  +static int volatile shutdown_pending;
  +static int volatile restart_pending;
  +static int volatile is_graceful;
  +static int volatile wait_to_finish=1;
  +ap_generation_t volatile ap_my_generation=0;
  +
   /* a clean exit from a child with proper cleanup */
   static void clean_child_exit(int code, int worker_num, apr_pool_t *ptrans, apr_bucket_alloc_t
*bucket_alloc) __attribute__ ((noreturn));
   static void clean_child_exit(int code, int worker_num, apr_pool_t *ptrans, apr_bucket_alloc_t
*bucket_alloc)
   {
  -    apr_bucket_alloc_destroy(bucket_alloc);
  -    apr_pool_destroy(ptrans);
  +    if (!shutdown_pending) {
  +        apr_bucket_alloc_destroy(bucket_alloc);
  +        apr_pool_destroy(ptrans);
  +    }
   
       atomic_dec (&worker_thread_count);
       if (worker_num >=0)
  @@ -264,13 +273,6 @@
   /*****************************************************************
    * Connection structures and accounting...
    */
  -
  -/* volatile just in case */
  -static int volatile shutdown_pending;
  -static int volatile restart_pending;
  -static int volatile is_graceful;
  -static int volatile wait_to_finish=1;
  -ap_generation_t volatile ap_my_generation=0;
   
   static void mpm_term(void)
   {
  
  
  

Mime
View raw message