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/server/mpm/worker worker.c
Date Wed, 01 May 2002 16:06:00 GMT
trawick     02/05/01 09:05:59

  Modified:    server/mpm/worker worker.c
  Log:
  wait for worker threads to exit even in graceless termination
  (we already have code to make them exit sooner now)
  
  Revision  Changes    Path
  1.123     +8 -10     httpd-2.0/server/mpm/worker/worker.c
  
  Index: worker.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/worker/worker.c,v
  retrieving revision 1.122
  retrieving revision 1.123
  diff -u -r1.122 -r1.123
  --- worker.c	1 May 2002 15:06:44 -0000	1.122
  +++ worker.c	1 May 2002 16:05:59 -0000	1.123
  @@ -1312,16 +1312,14 @@
               }
           }
   
  -        if (rv == AP_GRACEFUL) {
  -            /* A terminating signal was received. Now join each of the
  -             * workers to clean them up.
  -             *   If the worker already exited, then the join frees
  -             *   their resources and returns.
  -             *   If the worker hasn't exited, then this blocks until
  -             *   they have (then cleans up).
  -             */
  -            join_workers(ts->listener, threads);
  -        }
  +        /* A terminating signal was received. Now join each of the
  +         * workers to clean them up.
  +         *   If the worker already exited, then the join frees
  +         *   their resources and returns.
  +         *   If the worker hasn't exited, then this blocks until
  +         *   they have (then cleans up).
  +         */
  +        join_workers(ts->listener, threads);
       }
   
       free(threads);
  
  
  

Mime
View raw message