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 fdqueue.h worker.c
Date Sat, 04 Aug 2001 11:40:16 GMT
trawick     01/08/04 04:40:16

  Modified:    server/mpm/worker fdqueue.h worker.c
  Log:
  cosmetic changes only for a clean build; no serialization problems
  addressed; I presume those are waiting for an APR-ization of the
  queue/condition mechanism
  
  Revision  Changes    Path
  1.2       +1 -0      httpd-2.0/server/mpm/worker/fdqueue.h
  
  Index: fdqueue.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/worker/fdqueue.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- fdqueue.h	2001/07/30 05:02:53	1.1
  +++ fdqueue.h	2001/08/04 11:40:16	1.2
  @@ -91,5 +91,6 @@
   int ap_queue_size(FDQueue *queue);
   int ap_queue_full(FDQueue *queue);
   int ap_block_on_queue(FDQueue *queue);
  +void ap_queue_signal_all_wakeup(FDQueue *queue);
   
   #endif /* FDQUEUE_H */
  
  
  
  1.6       +1 -6      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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- worker.c	2001/08/02 21:24:14	1.5
  +++ worker.c	2001/08/04 11:40:16	1.6
  @@ -191,7 +191,7 @@
   #define SAFE_ACCEPT(stmt) (stmt)
   #endif
   
  -static signal_workers(void)
  +static void signal_workers(void)
   {
       workers_may_exit = 1;
       ap_queue_signal_all_wakeup(worker_queue);
  @@ -680,11 +680,6 @@
       apr_pool_t *tpool = ti->tpool;
       apr_socket_t *csd = NULL;
       apr_pool_t *ptrans;		/* Pool for per-transaction stuff */
  -    apr_socket_t *sd = NULL;
  -    int n;
  -    int curr_pollfd, last_pollfd = 0;
  -    apr_pollfd_t *pollset;
  -    apr_status_t rv;
   
       free(ti);
   
  
  
  

Mime
View raw message