Author: rupertlssmith
Date: Fri Aug 17 03:28:10 2007
New Revision: 567006
URL: http://svn.apache.org/viewvc?view=rev&rev=567006
Log:
Tests enhanced for fanout style tests with many consumers per destination.
Modified:
incubator/qpid/branches/M2/java/perftests/src/main/java/org/apache/qpid/ping/PingClient.java
incubator/qpid/branches/M2/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongProducer.java
Modified:
incubator/qpid/branches/M2/java/perftests/src/main/java/org/apache/qpid/ping/PingClient.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/perftests/src/main/java/org/apache/qpid/ping/PingClient.java?view=diff&rev=567006&r1=567005&r2=567006
==============================================================================
---
incubator/qpid/branches/M2/java/perftests/src/main/java/org/apache/qpid/ping/PingClient.java
(original)
+++
incubator/qpid/branches/M2/java/perftests/src/main/java/org/apache/qpid/ping/PingClient.java
Fri Aug 17 03:28:10 2007
@@ -95,13 +95,13 @@
{
log.debug("1 consumer per destination.");
- return 1;
+ return _noOfConsumers;
}
else
{
log.debug(_pingClientCount + " consumers per destination.");
- return _pingClientCount;
+ return _pingClientCount * _noOfConsumers;
}
}
}
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?view=diff&rev=567006&r1=567005&r2=567006
==============================================================================
---
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
Fri Aug 17 03:28:10 2007
@@ -132,6 +132,7 @@
*/
public class PingPongProducer implements Runnable /*, MessageListener*/,
ExceptionListener
{
+ /** Used for debugging. */
private static final Logger log = Logger.getLogger(PingPongProducer.class);
/** Holds the name of the property to get the test message size from. */
@@ -451,12 +452,6 @@
/** Holds the message consumer to receive the ping replies through. */
protected MessageConsumer[] _consumer;
- /**
- * Holds the number of consumers that will be attached to each destination
in the test. Each pings will result in
- * a message being received by each of these clients in a pub/sub tests,
and by only one at a time in a p2p test.
- */
- static int _consumersPerDestination = 1;
-
/** The prompt to display when asking the user to kill the broker for
failover testing. */
private static final String KILL_BROKER_PROMPT = "Kill broker now, then
press Return.";
private String _clientID;
@@ -1488,7 +1483,7 @@
*/
public int getConsumersPerDestination()
{
- return _consumersPerDestination;
+ return _noOfConsumers;
}
/**
