You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by bo...@apache.org on 2009/06/14 09:45:23 UTC
svn commit: r784522 - in /apr/apr-util/branches/1.4.x: ./
buckets/apr_brigade.c misc/apr_queue.c
Author: bojan
Date: Sun Jun 14 07:45:22 2009
New Revision: 784522
URL: http://svn.apache.org/viewvc?rev=784522&view=rev
Log:
Backport r784520 from the trunk.
apr_queue_trypush() doesn't block if the queue is full.
Patch by Neil Conway <nrc cs.berkeley.edu>.
Modified:
apr/apr-util/branches/1.4.x/ (props changed)
apr/apr-util/branches/1.4.x/buckets/apr_brigade.c (props changed)
apr/apr-util/branches/1.4.x/misc/apr_queue.c (contents, props changed)
Propchange: apr/apr-util/branches/1.4.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jun 14 07:45:22 2009
@@ -1,2 +1,2 @@
-/apr/apr/trunk:781403,781409
+/apr/apr/trunk:781403,781409,784519
/apr/apr-util/trunk:731033-731034,731225,731236,731291,731293,731379,743986,744009,745771,747612,747623,747630
Propchange: apr/apr-util/branches/1.4.x/buckets/apr_brigade.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jun 14 07:45:22 2009
@@ -1,2 +1,2 @@
-/apr/apr/trunk/buckets/apr_brigade.c:768417,781403,781409
+/apr/apr/trunk/buckets/apr_brigade.c:768417,781403,781409,784519
/apr/apr-util/trunk/buckets/apr_brigade.c:731033-731034,731225,731236,731291,731293,731379,743986,744009,745771,747612,747623,747630
Modified: apr/apr-util/branches/1.4.x/misc/apr_queue.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/misc/apr_queue.c?rev=784522&r1=784521&r2=784522&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/misc/apr_queue.c (original)
+++ apr/apr-util/branches/1.4.x/misc/apr_queue.c Sun Jun 14 07:45:22 2009
@@ -202,9 +202,9 @@
}
/**
- * Push new data onto the queue. Blocks if the queue is full. Once
- * the push operation has completed, it signals other threads waiting
- * in apr_queue_pop() that they may continue consuming sockets.
+ * Push new data onto the queue. If the queue is full, return APR_EAGAIN. If
+ * the push operation completes successfully, it signals other threads
+ * waiting in apr_queue_pop() that they may continue consuming sockets.
*/
APU_DECLARE(apr_status_t) apr_queue_trypush(apr_queue_t *queue, void *data)
{
Propchange: apr/apr-util/branches/1.4.x/misc/apr_queue.c
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Jun 14 07:45:22 2009
@@ -0,0 +1,3 @@
+/apr/apr/trunk/misc/apr_queue.c:781403,781409,784519
+/apr/apr/trunk/util-misc/apr_queue.c:784520
+/apr/apr-util/trunk/misc/apr_queue.c:731033-731034,731225,731236,731291,731293,731379,743986,744009,745771,747612,747623,747630