httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From grega...@apache.org
Subject svn commit: r111385 - /httpd/httpd/trunk/server/mpm/experimental/event/fdqueue.c /httpd/httpd/trunk/server/mpm/worker/fdqueue.c
Date Thu, 09 Dec 2004 14:11:32 GMT
Author: gregames
Date: Thu Dec  9 06:11:29 2004
New Revision: 111385

URL: http://svn.apache.org/viewcvs?view=rev&rev=111385
Log:
ap_queue_push:  update comment to reflect reality

pointed out by: Ron Park (ronp cnet.com)

Modified:
   httpd/httpd/trunk/server/mpm/experimental/event/fdqueue.c
   httpd/httpd/trunk/server/mpm/worker/fdqueue.c

Modified: httpd/httpd/trunk/server/mpm/experimental/event/fdqueue.c
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/server/mpm/experimental/event/fdqueue.c?view=diff&rev=111385&p1=httpd/httpd/trunk/server/mpm/experimental/event/fdqueue.c&r1=111384&p2=httpd/httpd/trunk/server/mpm/experimental/event/fdqueue.c&r2=111385
==============================================================================
--- httpd/httpd/trunk/server/mpm/experimental/event/fdqueue.c	(original)
+++ httpd/httpd/trunk/server/mpm/experimental/event/fdqueue.c	Thu Dec  9 06:11:29 2004
@@ -307,9 +307,10 @@
 }
 
 /**
- * Push a new socket onto the queue. Blocks if the queue is full. Once
- * the push operation has completed, it signals other threads waiting
- * in ap_queue_pop() that they may continue consuming sockets.
+ * Push a new socket onto the queue. 
+ *
+ * precondition: ap_queue_info_wait_for_idler has already been called
+ *               to reserve an idle worker thread
  */
 apr_status_t ap_queue_push(fd_queue_t * queue, apr_socket_t * sd,
                            conn_state_t * cs, apr_pool_t * p)

Modified: httpd/httpd/trunk/server/mpm/worker/fdqueue.c
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/server/mpm/worker/fdqueue.c?view=diff&rev=111385&p1=httpd/httpd/trunk/server/mpm/worker/fdqueue.c&r1=111384&p2=httpd/httpd/trunk/server/mpm/worker/fdqueue.c&r2=111385
==============================================================================
--- httpd/httpd/trunk/server/mpm/worker/fdqueue.c	(original)
+++ httpd/httpd/trunk/server/mpm/worker/fdqueue.c	Thu Dec  9 06:11:29 2004
@@ -275,9 +275,10 @@
 }
 
 /**
- * Push a new socket onto the queue. Blocks if the queue is full. Once
- * the push operation has completed, it signals other threads waiting
- * in ap_queue_pop() that they may continue consuming sockets.
+ * Push a new socket onto the queue. 
+ *
+ * precondition: ap_queue_info_wait_for_idler has already been called
+ *               to reserve an idle worker thread
  */
 apr_status_t ap_queue_push(fd_queue_t *queue, apr_socket_t *sd, apr_pool_t *p)
 {

Mime
View raw message