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 Thu, 21 Mar 2002 16:18:12 GMT
trawick     02/03/21 08:18:11

  Modified:    server/mpm/worker worker.c
  Log:
  document a glitch that prevents complete graceful termination of the
  process when one of the threads encounters a critical error
  
  Revision  Changes    Path
  1.102     +8 -0      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.101
  retrieving revision 1.102
  diff -u -r1.101 -r1.102
  --- worker.c	21 Mar 2002 16:06:51 -0000	1.101
  +++ worker.c	21 Mar 2002 16:18:11 -0000	1.102
  @@ -1138,6 +1138,10 @@
           /* make sure the start thread has finished; signal_workers() 
            * and join_workers() depend on that
            */
  +        /* XXX join_start_thread() won't be awakened if one of our
  +         *     threads encounters a critical error and attempts to
  +         *     shutdown this child
  +         */
           join_start_thread(start_thread_id);
           signal_workers(); /* helps us terminate a little more quickly when
                              * the dispatch of the signal thread
  @@ -1155,6 +1159,10 @@
       else { /* !one_process */
           /* Watch for any messages from the parent over the POD */
           while (1) {
  +            /* XXX join_start_thread() won't be awakened if one of our
  +             *     threads encounters a critical error and attempts to
  +             *     shutdown this child
  +             */
               rv = ap_mpm_pod_check(pod);
               if (rv == AP_GRACEFUL || rv == AP_RESTART) {
                   /* make sure the start thread has finished; 
  
  
  

Mime
View raw message