Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Date: 22 Mar 2002 01:12:49 -0000
Message-ID: <20020322011249.33170.qmail@icarus.apache.org>
From: trawick@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/server/mpm/worker worker.c

trawick     02/03/21 17:12:49

  Modified:    server/mpm/worker worker.c
  Log:
  remove some unnecessary, commented-out code; add a comment
  about a use of signals
  
  Revision  Changes    Path
  1.105     +5 -4      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.104
  retrieving revision 1.105
  diff -u -r1.104 -r1.105
  --- worker.c	21 Mar 2002 19:12:54 -0000	1.104
  +++ worker.c	22 Mar 2002 01:12:49 -0000	1.105
  @@ -287,10 +287,6 @@
           workers_may_exit = 1;
           ap_queue_interrupt_all(worker_queue);
       }
  -
  -    /* XXX: This will happen naturally on a graceful, and we don't care 
  -     * otherwise.
  -    ap_queue_signal_all_wakeup(worker_queue); */
   }
   
   AP_DECLARE(apr_status_t) ap_mpm_query(int query_code, int *result)
  @@ -814,6 +810,11 @@
       ap_queue_term(worker_queue);
       dying = 1;
       ap_scoreboard_image->parent[process_slot].quiescing = 1;
  +
  +    /* XXX in one-process mode, this SIGTERM will wake up the main thread
  +     *     in normal mode, it is unclear what it will do... the main
  +     *     thread is stuck in a read on the POD
  +     */
       kill(ap_my_pid, SIGTERM);
   
       apr_thread_exit(thd, APR_SUCCESS);