Author: rupertlssmith
Date: Wed Oct 10 07:29:02 2007
New Revision: 583487
URL: http://svn.apache.org/viewvc?rev=583487&view=rev
Log:
Merged revisions 583438-583483 via svnmerge from
https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1
........
r583438 | rupertlssmith | 2007-10-10 12:46:59 +0100 (Wed, 10 Oct 2007) | 1
line
Changed tests to use global maxPending limit, rather than per producer.
........
r583483 | rupertlssmith | 2007-10-10 15:21:20 +0100 (Wed, 10 Oct 2007) | 1
line
Removed debug logging from performance test code.
........
Modified:
incubator/qpid/branches/M2/ (props changed)
incubator/qpid/branches/M2/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongProducer.java
Propchange: incubator/qpid/branches/M2/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Oct 10 07:29:02 2007
@@ -1 +1 @@
-/incubator/qpid/branches/M2.1:1-573736,573738-577772,577774-578732,578734,578736-578744,578746-578827,578829-583418
+/incubator/qpid/branches/M2.1:1-573736,573738-577772,577774-578732,578734,578736-578744,578746-578827,578829-583418,583438-583483
Modified:
incubator/qpid/branches/M2/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongProducer.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongProducer.java?rev=583487&r1=583486&r2=583487&view=diff
==============================================================================
---
incubator/qpid/branches/M2/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongProducer.java
(original)
+++
incubator/qpid/branches/M2/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongProducer.java
Wed Oct 10 07:29:02 2007
@@ -423,10 +423,10 @@
* Holds a monitor which is used to synchronize sender and receivers
threads, where the sender has elected
* to wait until the number of unreceived message is reduced before
continuing to send.
*/
- protected final Object _sendPauseMonitor = new Object();
+ protected static final Object _sendPauseMonitor = new Object();
/** Keeps a count of the number of message currently sent but not
received. */
- protected AtomicInteger _unreceived = new AtomicInteger(0);
+ protected static AtomicInteger _unreceived = new AtomicInteger(0);
/** A source for providing sequential unique correlation ids. These will
be unique within the same JVM. */
private static AtomicLong _correlationIdGenerator = new AtomicLong(0L);
@@ -894,9 +894,6 @@
// log.debug("Reply was expected, decrementing the latch
for the id, " + correlationID);
- // log.debug("unreceived = " + unreceived);
- // log.debug("unreceivedSize = " + unreceivedSize);
-
// Release waiting senders if there are some and using
maxPending limit.
if ((_maxPendingSize > 0))
{
@@ -906,11 +903,14 @@
(unreceived * ((_messageSize == 0) ? 1 :
_messageSize))
/ (_isPubSub ? getConsumersPerDestination() : 1);
+ // log.debug("unreceived = " + unreceived);
+ // log.debug("unreceivedSize = " + unreceivedSize);
+
synchronized (_sendPauseMonitor)
{
if (unreceivedSize < _maxPendingSize)
{
- _sendPauseMonitor.notify();
+ _sendPauseMonitor.notifyAll();
}
}
}
@@ -988,7 +988,7 @@
finally
{
// log.debug("public void onMessageWithConsumerNo(Message message,
int consumerNo): ending");
- NDC.clear();
+ // NDC.clear();
}
}
