[jboss-cvs] JBoss Messaging SVN: r4288 - in trunk/examples/jms: src/org/jboss/jms/example and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri May 23 09:17:14 EDT 2008
Author: jmesnil
Date: 2008-05-23 09:17:14 -0400 (Fri, 23 May 2008)
New Revision: 4288
Modified:
trunk/examples/jms/build.xml
trunk/examples/jms/src/org/jboss/jms/example/PerfExample.java
trunk/examples/jms/src/org/jboss/jms/util/PerfParams.java
Log:
revert to a single sender
Modified: trunk/examples/jms/build.xml
===================================================================
--- trunk/examples/jms/build.xml 2008-05-23 09:23:02 UTC (rev 4287)
+++ trunk/examples/jms/build.xml 2008-05-23 13:17:14 UTC (rev 4288)
@@ -47,7 +47,6 @@
<property name="sample.period" value="1"/>
<property name="sess.trans" value="false"/>
<property name="sess.trans.size" value="1"/>
- <property name="sender.count" value="2"/>
<path id="compile.classpath">
<fileset dir="${lib.dir}">
@@ -122,13 +121,13 @@
<classpath refid="runtime.classpath"/>
<jvmarg value="-Xmx1024M"/>
<jvmarg value="-XX:+UseParallelGC"/>
- <jvmarg value="-XX:+AggressiveOpts"/>
- <jvmarg value="-XX:+UseFastAccessorMethods"/>
+ <jvmarg value="-XX:+AggressiveOpts"/>
+ <jvmarg value="-XX:+UseFastAccessorMethods"/>
<arg value="-l"/>
<arg value="${message.count}"/>
- <arg value="${delivery.mode}"/>
- <arg value="${sample.period}"/>
- <arg value="${sess.trans}"/>
+ <arg value="${delivery.mode}"/>
+ <arg value="${sample.period}"/>
+ <arg value="${sess.trans}"/>
<arg value="${sess.trans.size}"/>
</java>
</target>
@@ -139,7 +138,6 @@
<echo>* available parameters (-Dmessage.count=1000) </echo>
<echo>* </echo>
<echo>* param description default current</echo>
- <echo>* sender.count number of senders 1 ${sender.count}</echo>
<echo>* message.count number of messages 200000 ${message.count}</echo>
<echo>* delivery.mode PERSISTENT/NON_PERSISTENT NON_PERSISTENT ${delivery.mode}</echo>
<echo>* sample.period timing period in seconds 1 second ${sample.period}</echo>
@@ -148,17 +146,16 @@
<echo>***********************************************************************************</echo>
<java classname="org.jboss.jms.example.PerfExample" fork="true">
<classpath refid="runtime.classpath"/>
- <jvmarg value="-Xmx512M"/>
- <jvmarg value="-XX:+UseParallelGC"/>
- <jvmarg value="-XX:+AggressiveOpts"/>
- <jvmarg value="-XX:+UseFastAccessorMethods"/>
+ <jvmarg value="-Xmx512M"/>
+ <jvmarg value="-XX:+UseParallelGC"/>
+ <jvmarg value="-XX:+AggressiveOpts"/>
+ <jvmarg value="-XX:+UseFastAccessorMethods"/>
<arg value="-s"/>
<arg value="${message.count}"/>
<arg value="${delivery.mode}"/>
<arg value="${sample.period}"/>
<arg value="${sess.trans}"/>
<arg value="${sess.trans.size}"/>
- <arg value="${sender.count}"/>
</java>
</target>
Modified: trunk/examples/jms/src/org/jboss/jms/example/PerfExample.java
===================================================================
--- trunk/examples/jms/src/org/jboss/jms/example/PerfExample.java 2008-05-23 09:23:02 UTC (rev 4287)
+++ trunk/examples/jms/src/org/jboss/jms/example/PerfExample.java 2008-05-23 13:17:14 UTC (rev 4288)
@@ -58,11 +58,6 @@
boolean transacted = Boolean.parseBoolean(args[4]);
log.info("Transacted:" + transacted);
int transactionBatchSize = Integer.parseInt(args[5]);
- int numberOfSenders = 1;
- if (args.length >= 7)
- {
- numberOfSenders = Integer.parseInt(args[6]);
- }
PerfParams perfParams = new PerfParams();
perfParams.setNoOfMessagesToSend(noOfMessages);
@@ -70,7 +65,6 @@
perfParams.setSamplePeriod(samplePeriod);
perfParams.setSessionTransacted(transacted);
perfParams.setTransactionBatchSize(transactionBatchSize);
- perfParams.setNumberOfSender(numberOfSenders);
if (args[0].equalsIgnoreCase("-l"))
{
@@ -78,7 +72,7 @@
}
else
{
- perfExample.runSenders(perfParams);
+ perfExample.runSender(perfParams);
}
}
@@ -93,40 +87,14 @@
session = connection.createSession(transacted, transacted ? Session.SESSION_TRANSACTED : Session.DUPS_OK_ACKNOWLEDGE);
}
- public void runSenders(final PerfParams perfParams)
+ public void runSender(final PerfParams perfParams)
{
try
{
log.info("params = " + perfParams);
init(perfParams.isSessionTransacted());
-
- final CountDownLatch startSignal = new CountDownLatch(1);
- final CountDownLatch endSignal = new CountDownLatch(perfParams.getNumberOfSenders());
-
- for (int i = 0; i < perfParams.getNumberOfSenders(); i++)
- {
- Thread sender = new Thread() {
- public void run()
- {
- try
- {
- startSignal.await();
- sendMessages(perfParams);
- } catch (Exception e)
- {
- e.printStackTrace();
- } finally
- {
- endSignal.countDown();
- }
- }
- };
- sender.start();
- }
-
scheduler.scheduleAtFixedRate(command, perfParams.getSamplePeriod(), perfParams.getSamplePeriod(), TimeUnit.SECONDS);
- startSignal.countDown();
- endSignal.await();
+ sendMessages(perfParams);
scheduler.shutdownNow();
log.info("average: " + (command.getAverage() / perfParams.getSamplePeriod()) + " msg/s");
}
@@ -159,7 +127,7 @@
bytesMessage.writeBytes(payload);
boolean committed = false;
- for (int i = 1; i <= (perfParams.getNoOfMessagesToSend() / perfParams.getNumberOfSenders()); i++)
+ for (int i = 1; i <= perfParams.getNoOfMessagesToSend(); i++)
{
producer.send(bytesMessage);
messageCount.incrementAndGet();
Modified: trunk/examples/jms/src/org/jboss/jms/util/PerfParams.java
===================================================================
--- trunk/examples/jms/src/org/jboss/jms/util/PerfParams.java 2008-05-23 09:23:02 UTC (rev 4287)
+++ trunk/examples/jms/src/org/jboss/jms/util/PerfParams.java 2008-05-23 13:17:14 UTC (rev 4288)
@@ -29,23 +29,12 @@
*/
public class PerfParams implements Serializable
{
- int numberOfSender = 1;
int noOfMessagesToSend = 1000;
long samplePeriod = 1; // in seconds
int deliveryMode = DeliveryMode.NON_PERSISTENT;
boolean isSessionTransacted = false;
int transactionBatchSize = 5000;
-
- public int getNumberOfSenders()
- {
- return numberOfSender;
- }
- public void setNumberOfSender(int numberOfSender)
- {
- this.numberOfSender = numberOfSender;
- }
-
public int getNoOfMessagesToSend()
{
return noOfMessagesToSend;
@@ -99,7 +88,7 @@
public String toString()
{
- return "number of senders=" + numberOfSender + ", message to send = " + noOfMessagesToSend + " samplePeriod = " + samplePeriod + "s" + " DeliveryMode = " +
+ return "message to send = " + noOfMessagesToSend + " samplePeriod = " + samplePeriod + "s" + " DeliveryMode = " +
(deliveryMode == DeliveryMode.PERSISTENT?"PERSISTENT":"NON_PERSISTENT") + " session transacted = " + isSessionTransacted +
(isSessionTransacted?" transaction batch size = " + transactionBatchSize:"");
}
More information about the jboss-cvs-commits
mailing list