Author: rajith
Date: Fri Nov 21 09:57:16 2008
New Revision: 719657
URL: http://svn.apache.org/viewvc?rev=719657&view=rev
Log:
Appologies for the sudden checkin without notice, close to the release cycle.
Reverting the changes back. Will attach a patch and commit after the release.
Removed:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/thread/
Modified:
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoSender.java
incubator/qpid/trunk/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/perf/LatencyTest.java
incubator/qpid/trunk/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/perf/PerfConsumer.java
incubator/qpid/trunk/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/perf/PerfProducer.java
incubator/qpid/trunk/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/soak/MultiThreadedConsumer.java
incubator/qpid/trunk/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/soak/MultiThreadedProducer.java
incubator/qpid/trunk/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/soak/ResourceLeakTest.java
incubator/qpid/trunk/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/soak/SimpleConsumer.java
incubator/qpid/trunk/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/soak/SimpleProducer.java
incubator/qpid/trunk/qpid/java/tools/src/main/java/org/apache/qpid/tools/QpidBench.java
Modified:
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java?rev=719657&r1=719656&r2=719657&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
Fri Nov 21 09:57:16 2008
@@ -67,26 +67,16 @@
import org.apache.qpid.client.failover.FailoverNoopSupport;
import org.apache.qpid.client.failover.FailoverProtectedOperation;
import org.apache.qpid.client.failover.FailoverRetrySupport;
-import org.apache.qpid.client.message.AMQMessageDelegateFactory;
-import org.apache.qpid.client.message.AbstractJMSMessage;
-import org.apache.qpid.client.message.CloseConsumerMessage;
-import org.apache.qpid.client.message.JMSBytesMessage;
-import org.apache.qpid.client.message.JMSMapMessage;
-import org.apache.qpid.client.message.JMSObjectMessage;
-import org.apache.qpid.client.message.JMSStreamMessage;
-import org.apache.qpid.client.message.JMSTextMessage;
-import org.apache.qpid.client.message.MessageFactoryRegistry;
-import org.apache.qpid.client.message.UnprocessedMessage;
+import org.apache.qpid.client.message.*;
import org.apache.qpid.client.protocol.AMQProtocolHandler;
-import org.apache.qpid.client.state.AMQState;
-import org.apache.qpid.client.state.AMQStateManager;
import org.apache.qpid.client.util.FlowControllingBlockingQueue;
+import org.apache.qpid.client.state.AMQStateManager;
+import org.apache.qpid.client.state.AMQState;
import org.apache.qpid.framing.AMQShortString;
import org.apache.qpid.framing.FieldTable;
import org.apache.qpid.framing.FieldTableFactory;
import org.apache.qpid.framing.MethodRegistry;
import org.apache.qpid.jms.Session;
-import org.apache.qpid.thread.Threading;
import org.apache.qpid.url.AMQBindingURL;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -281,8 +271,6 @@
/** Holds the dispatcher thread for this session. */
protected Dispatcher _dispatcher;
-
- protected Thread _dispatcherThread;
/** Holds the message factory factory for this session. */
protected MessageFactoryRegistry _messageFactoryRegistry;
@@ -680,7 +668,7 @@
if (_dispatcher != null)
{
// Failover failed and ain't coming back. Knife the dispatcher.
- _dispatcherThread.interrupt();
+ _dispatcher.interrupt();
}
}
@@ -1864,7 +1852,7 @@
void startDispatcherIfNecessary()
{
//If we are the dispatcher then we don't need to check we are started
- if (Thread.currentThread() == _dispatcherThread)
+ if (Thread.currentThread() == _dispatcher)
{
return;
}
@@ -1895,23 +1883,9 @@
if (_dispatcher == null)
{
_dispatcher = new Dispatcher();
- try
- {
- _dispatcherThread =
Threading.getThreadFactory().createThread(_dispatcher);
-
- }
- catch(Exception e)
- {
- throw new Error("Error creating Dispatcher thread",e);
- }
- _dispatcherThread.setName("Dispatcher-Channel-" + _channelId);
- _dispatcherThread.setDaemon(true);
+ _dispatcher.setDaemon(true);
_dispatcher.setConnectionStopped(initiallyStopped);
- _dispatcherThread.start();
- if (_dispatcherLogger.isInfoEnabled())
- {
- _dispatcherLogger.info(_dispatcherThread.getName() + "
created");
- }
+ _dispatcher.start();
}
else
{
@@ -2632,7 +2606,7 @@
private static final Logger _dispatcherLogger =
LoggerFactory.getLogger("org.apache.qpid.client.AMQSession.Dispatcher");
/** Responsible for decoding a message fragment and passing it to the
appropriate message consumer. */
- class Dispatcher implements Runnable
+ class Dispatcher extends Thread
{
/** Track the 'stopped' state of the dispatcher, a session starts in
the stopped state. */
@@ -2641,14 +2615,21 @@
private final Object _lock = new Object();
private String dispatcherID = "" + System.identityHashCode(this);
+
+
public Dispatcher()
{
+ super("Dispatcher-Channel-" + _channelId);
+ if (_dispatcherLogger.isInfoEnabled())
+ {
+ _dispatcherLogger.info(getName() + " created");
+ }
}
public void close()
{
_closed.set(true);
- _dispatcherThread.interrupt();
+ interrupt();
// fixme awaitTermination
@@ -2727,7 +2708,7 @@
{
if (_dispatcherLogger.isInfoEnabled())
{
- _dispatcherLogger.info(_dispatcherThread.getName() + "
started");
+ _dispatcherLogger.info(getName() + " started");
}
UnprocessedMessage message;
@@ -2790,7 +2771,7 @@
if (_dispatcherLogger.isInfoEnabled())
{
- _dispatcherLogger.info(_dispatcherThread.getName() + " thread
terminating for channel " + _channelId);
+ _dispatcherLogger.info(getName() + " thread terminating for
channel " + _channelId);
}
}
Modified:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java?rev=719657&r1=719656&r2=719657&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java
(original)
+++
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java
Fri Nov 21 09:57:16 2008
@@ -20,7 +20,6 @@
*/
package org.apache.qpid.transport.network.io;
-import org.apache.qpid.thread.Threading;
import org.apache.qpid.transport.Receiver;
import org.apache.qpid.transport.TransportException;
import org.apache.qpid.transport.util.Logger;
@@ -36,7 +35,7 @@
*
*/
-final class IoReceiver implements Runnable
+final class IoReceiver extends Thread
{
private static final Logger log = Logger.get(IoReceiver.class);
@@ -47,7 +46,6 @@
private final Socket socket;
private final long timeout;
private final AtomicBoolean closed = new AtomicBoolean(false);
- private final Thread receiverThread;
public IoReceiver(IoTransport transport, Receiver<ByteBuffer> receiver,
int bufferSize, long timeout)
@@ -57,18 +55,10 @@
this.bufferSize = bufferSize;
this.socket = transport.getSocket();
this.timeout = timeout;
-
- try
- {
- receiverThread = Threading.getThreadFactory().createThread(this);
- }
- catch(Exception e)
- {
- throw new Error("Error creating IOReceiver thread",e);
- }
- receiverThread.setDaemon(true);
- receiverThread.setName(String.format("IoReceiver - %s",
socket.getRemoteSocketAddress()));
- receiverThread.start();
+
+ setDaemon(true);
+ setName(String.format("IoReceiver - %s",
socket.getRemoteSocketAddress()));
+ start();
}
void close(boolean block)
@@ -85,10 +75,10 @@
{
socket.shutdownInput();
}
- if (block && Thread.currentThread() != receiverThread)
+ if (block && Thread.currentThread() != this)
{
- receiverThread.join(timeout);
- if (receiverThread.isAlive())
+ join(timeout);
+ if (isAlive())
{
throw new TransportException("join timed out");
}
Modified:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoSender.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoSender.java?rev=719657&r1=719656&r2=719657&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoSender.java
(original)
+++
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoSender.java
Fri Nov 21 09:57:16 2008
@@ -24,7 +24,6 @@
import java.nio.ByteBuffer;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.apache.qpid.thread.Threading;
import org.apache.qpid.transport.Sender;
import org.apache.qpid.transport.SenderException;
import org.apache.qpid.transport.TransportException;
@@ -33,7 +32,7 @@
import static org.apache.qpid.transport.util.Functions.*;
-public final class IoSender implements Runnable, Sender<ByteBuffer>
+public final class IoSender extends Thread implements Sender<ByteBuffer>
{
private static final Logger log = Logger.get(IoSender.class);
@@ -55,8 +54,7 @@
private final Object notFull = new Object();
private final Object notEmpty = new Object();
private final AtomicBoolean closed = new AtomicBoolean(false);
- private final Thread senderThread;
-
+
private volatile Throwable exception = null;
@@ -76,18 +74,9 @@
throw new TransportException("Error getting output stream for
socket", e);
}
- try
- {
- senderThread = Threading.getThreadFactory().createThread(this);
- }
- catch(Exception e)
- {
- throw new Error("Error creating IOSender thread",e);
- }
-
- senderThread.setDaemon(true);
- senderThread.setName(String.format("IoSender - %s",
socket.getRemoteSocketAddress()));
- senderThread.start();
+ setDaemon(true);
+ setName(String.format("IoSender - %s",
socket.getRemoteSocketAddress()));
+ start();
}
private static final int pof2(int n)
@@ -199,10 +188,10 @@
try
{
- if (Thread.currentThread() != senderThread)
+ if (Thread.currentThread() != this)
{
- senderThread.join(timeout);
- if (senderThread.isAlive())
+ join(timeout);
+ if (isAlive())
{
throw new SenderException("join timed out");
}
Modified:
incubator/qpid/trunk/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/perf/LatencyTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/perf/LatencyTest.java?rev=719657&r1=719656&r2=719657&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/perf/LatencyTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/perf/LatencyTest.java
Fri Nov 21 09:57:16 2008
@@ -37,7 +37,6 @@
import javax.jms.TextMessage;
import org.apache.qpid.testkit.MessageFactory;
-import org.apache.qpid.thread.Threading;
/**
* Latency test sends an x number of messages in warmup mode and wait for a
confirmation
@@ -315,36 +314,19 @@
public static void main(String[] args)
{
- final LatencyTest latencyTest = new LatencyTest();
- Runnable r = new Runnable()
+ LatencyTest latencyTest = new LatencyTest();
+ latencyTest.test();
+ latencyTest.printToConsole();
+ if (System.getProperty("file") != null)
{
- public void run()
+ try
{
- latencyTest.test();
- latencyTest.printToConsole();
- if (System.getProperty("file") != null)
- {
- try
- {
- latencyTest.writeToFile();
- }
- catch(Exception e)
- {
- e.printStackTrace();
- }
- }
+ latencyTest.writeToFile();
+ }
+ catch(Exception e)
+ {
+ e.printStackTrace();
}
- };
-
- Thread t;
- try
- {
- t = Threading.getThreadFactory().createThread(r);
- }
- catch(Exception e)
- {
- throw new Error("Error creating latency test thread",e);
}
- t.start();
}
}
\ No newline at end of file
Modified:
incubator/qpid/trunk/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/perf/PerfConsumer.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/perf/PerfConsumer.java?rev=719657&r1=719656&r2=719657&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/perf/PerfConsumer.java
(original)
+++
incubator/qpid/trunk/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/perf/PerfConsumer.java
Fri Nov 21 09:57:16 2008
@@ -27,8 +27,6 @@
import javax.jms.MessageProducer;
import javax.jms.TextMessage;
-import org.apache.qpid.thread.Threading;
-
/**
* PerfConsumer will receive x no of messages in warmup mode.
* Once it receives the Start message it will then signal the PerfProducer.
@@ -244,24 +242,7 @@
public static void main(String[] args)
{
- final PerfConsumer cons = new PerfConsumer();
- Runnable r = new Runnable()
- {
- public void run()
- {
- cons.test();
- }
- };
-
- Thread t;
- try
- {
- t = Threading.getThreadFactory().createThread(r);
- }
- catch(Exception e)
- {
- throw new Error("Error creating consumer thread",e);
- }
- t.start();
+ PerfConsumer cons = new PerfConsumer();
+ cons.test();
}
}
\ No newline at end of file
Modified:
incubator/qpid/trunk/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/perf/PerfProducer.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/perf/PerfProducer.java?rev=719657&r1=719656&r2=719657&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/perf/PerfProducer.java
(original)
+++
incubator/qpid/trunk/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/perf/PerfProducer.java
Fri Nov 21 09:57:16 2008
@@ -27,7 +27,6 @@
import javax.jms.MessageProducer;
import org.apache.qpid.testkit.MessageFactory;
-import org.apache.qpid.thread.Threading;
/**
* PerfProducer sends an x no of messages in warmup mode and wait for a
confirmation
@@ -202,24 +201,7 @@
public static void main(String[] args)
{
- final PerfProducer prod = new PerfProducer();
- Runnable r = new Runnable()
- {
- public void run()
- {
- prod.test();
- }
- };
-
- Thread t;
- try
- {
- t = Threading.getThreadFactory().createThread(r);
- }
- catch(Exception e)
- {
- throw new Error("Error creating producer thread",e);
- }
- t.start();
+ PerfProducer prod = new PerfProducer();
+ prod.test();
}
}
\ No newline at end of file
Modified:
incubator/qpid/trunk/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/soak/MultiThreadedConsumer.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/soak/MultiThreadedConsumer.java?rev=719657&r1=719656&r2=719657&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/soak/MultiThreadedConsumer.java
(original)
+++
incubator/qpid/trunk/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/soak/MultiThreadedConsumer.java
Fri Nov 21 09:57:16 2008
@@ -29,8 +29,6 @@
import javax.jms.Session;
import javax.jms.TextMessage;
-import org.apache.qpid.thread.Threading;
-
/**
* Test Description
* ================
@@ -69,7 +67,7 @@
{
final Session session = con.createSession(false,
Session.AUTO_ACKNOWLEDGE);
- Runnable r = new Runnable()
+ Thread t = new Thread(new Runnable()
{
public void run()
{
@@ -133,18 +131,7 @@
}
- };
-
- Thread t;
- try
- {
- t = Threading.getThreadFactory().createThread(r);
- }
- catch(Exception e)
- {
- throw new Error("Error creating consumer thread",e);
- }
-
+ });
t.setName("session-" + i);
t.start();
} // for loop
Modified:
incubator/qpid/trunk/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/soak/MultiThreadedProducer.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/soak/MultiThreadedProducer.java?rev=719657&r1=719656&r2=719657&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/soak/MultiThreadedProducer.java
(original)
+++
incubator/qpid/trunk/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/soak/MultiThreadedProducer.java
Fri Nov 21 09:57:16 2008
@@ -32,7 +32,6 @@
import org.apache.qpid.client.AMQQueue;
import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.thread.Threading;
/**
* Test Description
@@ -80,7 +79,7 @@
for (int i = 0; i < session_count; i++)
{
final Session session = con.createSession(transacted,
Session.AUTO_ACKNOWLEDGE);
- Runnable r = new Runnable()
+ Thread t = new Thread(new Runnable()
{
private Random gen = new Random();
@@ -143,16 +142,7 @@
}
- };
- Thread t;
- try
- {
- t = Threading.getThreadFactory().createThread(r);
- }
- catch(Exception e)
- {
- throw new Error("Error creating producer thread",e);
- }
+ });
t.setName("session-" + i);
t.start();
Modified:
incubator/qpid/trunk/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/soak/ResourceLeakTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/soak/ResourceLeakTest.java?rev=719657&r1=719656&r2=719657&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/soak/ResourceLeakTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/soak/ResourceLeakTest.java
Fri Nov 21 09:57:16 2008
@@ -30,7 +30,6 @@
import org.apache.qpid.client.AMQConnection;
import org.apache.qpid.client.AMQQueue;
import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.thread.Threading;
/**
* Test Description
@@ -132,23 +131,8 @@
public static void main(String[] args)
{
- final ResourceLeakTest test = new ResourceLeakTest();
- Runnable r = new Runnable(){
- public void run()
- {
- test.test();
- }
- };
-
- Thread t;
- try
- {
- t = Threading.getThreadFactory().createThread(r);
- }
- catch(Exception e)
- {
- throw new Error("Error creating test thread",e);
- }
+ ResourceLeakTest test = new ResourceLeakTest();
+ test.test();
}
}
Modified:
incubator/qpid/trunk/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/soak/SimpleConsumer.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/soak/SimpleConsumer.java?rev=719657&r1=719656&r2=719657&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/soak/SimpleConsumer.java
(original)
+++
incubator/qpid/trunk/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/soak/SimpleConsumer.java
Fri Nov 21 09:57:16 2008
@@ -29,8 +29,6 @@
import javax.jms.Session;
import javax.jms.TextMessage;
-import org.apache.qpid.thread.Threading;
-
/**
* Test Description
* ================
@@ -128,24 +126,9 @@
public static void main(String[] args)
{
- final SimpleConsumer test = new SimpleConsumer();
- Runnable r = new Runnable(){
- public void run()
- {
- test.setUp();
- test.test();
- }
- };
-
- Thread t;
- try
- {
- t = Threading.getThreadFactory().createThread(r);
- }
- catch(Exception e)
- {
- throw new Error("Error creating consumer thread",e);
- }
+ SimpleConsumer test = new SimpleConsumer();
+ test.setUp();
+ test.test();
}
}
Modified:
incubator/qpid/trunk/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/soak/SimpleProducer.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/soak/SimpleProducer.java?rev=719657&r1=719656&r2=719657&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/soak/SimpleProducer.java
(original)
+++
incubator/qpid/trunk/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/soak/SimpleProducer.java
Fri Nov 21 09:57:16 2008
@@ -33,7 +33,6 @@
import org.apache.qpid.client.AMQQueue;
import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.thread.Threading;
/**
* Test Description
@@ -139,24 +138,9 @@
public static void main(String[] args)
{
- final SimpleProducer test = new SimpleProducer();
- Runnable r = new Runnable(){
- public void run()
- {
- test.setUp();
- test.test();
- }
- };
-
- Thread t;
- try
- {
- t = Threading.getThreadFactory().createThread(r);
- }
- catch(Exception e)
- {
- throw new Error("Error creating producer thread",e);
- }
+ SimpleProducer test = new SimpleProducer();
+ test.setUp();
+ test.test();
}
}
Modified:
incubator/qpid/trunk/qpid/java/tools/src/main/java/org/apache/qpid/tools/QpidBench.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/tools/src/main/java/org/apache/qpid/tools/QpidBench.java?rev=719657&r1=719656&r2=719657&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/tools/src/main/java/org/apache/qpid/tools/QpidBench.java
(original)
+++
incubator/qpid/trunk/qpid/java/tools/src/main/java/org/apache/qpid/tools/QpidBench.java
Fri Nov 21 09:57:16 2008
@@ -20,45 +20,23 @@
*/
package org.apache.qpid.tools;
-import static org.apache.qpid.tools.QpidBench.Mode.BOTH;
-import static org.apache.qpid.tools.QpidBench.Mode.CONSUME;
-import static org.apache.qpid.tools.QpidBench.Mode.PUBLISH;
-
-import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.List;
-
-import javax.jms.DeliveryMode;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageListener;
-import javax.jms.MessageProducer;
-import javax.jms.TextMessage;
+import java.util.UUID;
+import javax.jms.*;
import org.apache.qpid.client.AMQConnection;
-import org.apache.qpid.thread.Threading;
-import org.apache.qpid.transport.DeliveryProperties;
-import org.apache.qpid.transport.ExchangeBind;
-import org.apache.qpid.transport.Header;
-import org.apache.qpid.transport.MessageAcceptMode;
-import org.apache.qpid.transport.MessageAcquireMode;
-import org.apache.qpid.transport.MessageCreditUnit;
-import org.apache.qpid.transport.MessageDeliveryMode;
-import org.apache.qpid.transport.MessageFlowMode;
-import org.apache.qpid.transport.MessageProperties;
-import org.apache.qpid.transport.MessageSubscribe;
-import org.apache.qpid.transport.MessageTransfer;
-import org.apache.qpid.transport.QueueDeclare;
-import org.apache.qpid.transport.SessionException;
-import org.apache.qpid.transport.SessionListener;
+import org.apache.qpid.transport.*;
+import org.apache.qpid.transport.network.io.IoTransport;
import org.apache.qpid.util.UUIDGen;
import org.apache.qpid.util.UUIDs;
+import static org.apache.qpid.tools.QpidBench.Mode.*;
+
/**
* QpidBench
*
@@ -434,7 +412,7 @@
{
case CONSUME:
case BOTH:
- Runnable r = new Runnable()
+ new Thread()
{
public void run()
{
@@ -454,18 +432,7 @@
throw new RuntimeException(e);
}
}
- };
-
- Thread t;
- try
- {
- t = Threading.getThreadFactory().createThread(r);
- }
- catch(Exception e)
- {
- throw new Error("Error creating consumer thread",e);
- }
- t.start();
+ }.start();
break;
}
@@ -473,7 +440,7 @@
{
case PUBLISH:
case BOTH:
- Runnable r = new Runnable()
+ new Thread()
{
public void run()
{
@@ -493,17 +460,7 @@
throw new RuntimeException(e);
}
}
- };
- Thread t;
- try
- {
- t = Threading.getThreadFactory().createThread(r);
- }
- catch(Exception e)
- {
- throw new Error("Error creating publisher thread",e);
- }
- t.start();
+ }.start();
break;
}
}
