chnaged to use jndi

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@605489 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 31 insertions, 17 deletions

diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/client/latency/MessageConsumer.java b/qpid/java/perftests/src/main/java/org/apache/qpid/client/latency/MessageConsumer.java
index fafcbace67..80f965eae5 100644
--- a/qpid/java/perftests/src/main/java/org/apache/qpid/client/latency/MessageConsumer.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/client/latency/MessageConsumer.java
@@ -17,14 +17,15 @@
  */
 package org.apache.qpid.client.latency;
 
-import org.apache.qpid.requestreply.InitialContextHelper;
 import org.apache.qpid.client.AMQConnection;
 import org.apache.qpid.client.AMQQueue;
 import org.apache.qpid.client.AMQTopic;
 import org.apache.qpid.client.perf.Options;
-import org.apache.qpid.server.queue.AMQQueueMBean;
+import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.requestreply.InitialContextHelper;
 
 import javax.jms.*;
+import javax.naming.Context;
 
 /**
  *
@@ -44,12 +45,13 @@ public class MessageConsumer  extends Options  implements MessageListener
         this.parseOptions();
         try
         {
-            ConnectionFactory factory = (ConnectionFactory) InitialContextHelper.getInitialContext("").lookup("local");
+            Context context = InitialContextHelper.getInitialContext("");
+            ConnectionFactory factory = (ConnectionFactory) context.lookup("local");
              _connection = (AMQConnection) factory.createConnection("guest","guest");
              _session = _connection.createSession(_transacted, Session.AUTO_ACKNOWLEDGE);
-            Destination dest = Boolean.getBoolean("useQueue")? new AMQQueue(_connection,_destination) : new AMQTopic(
-                    _connection,_destination);        
-            Destination syncQueue   = new AMQQueue(_connection, "syncQueue");
+              Destination dest = Boolean.getBoolean("useQueue")? (Destination) context.lookup("testQueue") :
+            (Destination) context.lookup("testTopic");
+            Destination syncQueue   = (Destination) context.lookup("syncQueue");
             _producer = _session.createProducer(syncQueue);
             // this should speedup the message producer
             _producer.setDisableMessageTimestamp(true);
diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/client/latency/MessageProducer.java b/qpid/java/perftests/src/main/java/org/apache/qpid/client/latency/MessageProducer.java
index 10b8833a8b..3e830f2abe 100644
--- a/qpid/java/perftests/src/main/java/org/apache/qpid/client/latency/MessageProducer.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/client/latency/MessageProducer.java
@@ -17,15 +17,14 @@
  */
 package org.apache.qpid.client.latency;
 
-import org.apache.qpid.client.perf.Options;
-import org.apache.qpid.client.AMQQueue;
-import org.apache.qpid.client.AMQTopic;
 import org.apache.qpid.client.AMQConnection;
 import org.apache.qpid.client.message.TestMessageFactory;
+import org.apache.qpid.client.perf.Options;
 import org.apache.qpid.requestreply.InitialContextHelper;
+import org.apache.qpidity.transport.network.nio.NioSender;
 
 import javax.jms.*;
-import java.util.Date;
+import javax.naming.Context;
 
 /**
  *
@@ -42,18 +41,20 @@ public class MessageProducer  extends Options
         this.parseOptions();
         try
         {
-            ConnectionFactory factory = (ConnectionFactory) InitialContextHelper.getInitialContext("").lookup("local");
-             _connection = (AMQConnection) factory.createConnection();
-            _connection.start();
+            Context context = InitialContextHelper.getInitialContext("");
+            ConnectionFactory factory = (ConnectionFactory) context.lookup("local");
+            _connection = (AMQConnection) factory.createConnection("guest","guest");
+            Destination dest = Boolean.getBoolean("useQueue")? (Destination) context.lookup("testQueue") :
+                       (Destination) context.lookup("testTopic");
+             Destination syncQueue   = (Destination) context.lookup("syncQueue");
+             _connection.start();
             Session session = _connection.createSession(_transacted, Session.AUTO_ACKNOWLEDGE);
             _payload = TestMessageFactory.newBytesMessage(session, _messageSize);
-            Destination dest = Boolean.getBoolean("useQueue")? new AMQQueue(_connection,_destination) : new AMQTopic(
-                    _connection,_destination);
-            Destination syncQueue   = new AMQQueue(_connection, "syncQueue");
             _producer = session.createProducer(dest);
             _consumer = session.createConsumer(syncQueue);
             // this should speedup the message producer
             _producer.setDisableMessageTimestamp(true);
+             System.out.println("Init end" );
         }
         catch (Exception e)
         {
@@ -65,14 +66,25 @@ public class MessageProducer  extends Options
     {
         try
         {
+            System.out.println("Sending " + _logFrequency + " messages");
+
+           NioSender.setStartBatching();
             long startTime = System.currentTimeMillis();
             for(int i =0; i < _logFrequency; i++ )
             {
-                _producer.send(_payload);
+                _producer.send(_payload, DeliveryMode.PERSISTENT, Message.DEFAULT_PRIORITY, 0);
             }
             long endProducing = System.currentTimeMillis();
             double throughput = (_logFrequency * 1000.0) / (endProducing - startTime);
             System.out.println("The producer throughput is: " + throughput + " msg/s");
+
+          //  startTime = System.currentTimeMillis();
+          //  NioSender.purge();
+          //  endProducing = System.currentTimeMillis();
+          //  throughput = (_logFrequency * 1000.0) / (endProducing - startTime);
+          //  System.out.println("The NIO throughput is: " + throughput + " msg/s");
+
+
             // now wait for the sync message
             _consumer.receive();
             // this is done