[jboss-cvs] JBoss Messaging SVN: r4168 - in trunk: src/main/org/jboss/messaging/core/remoting/impl/mina and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri May 9 08:39:52 EDT 2008
Author: timfox
Date: 2008-05-09 08:39:52 -0400 (Fri, 09 May 2008)
New Revision: 4168
Modified:
trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/FilterChainSupport.java
trunk/src/main/org/jboss/messaging/core/security/impl/SecurityStoreImpl.java
trunk/src/main/org/jboss/messaging/core/server/impl/MessageReferenceImpl.java
trunk/src/main/org/jboss/messaging/jms/client/JBossSession.java
trunk/src/main/org/jboss/messaging/util/OrderedExecutorFactory.java
trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/MessageProducerTest.java
trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/message/SimpleJMSMessage.java
Log:
More tweaks
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java 2008-05-09 11:45:40 UTC (rev 4167)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java 2008-05-09 12:39:52 UTC (rev 4168)
@@ -413,8 +413,7 @@
}
else if (broken || toAckCount == lazyAckBatchSize)
{
- //Must always ack now
- acknowledgeInternal(false);
+ acknowledgeInternal(blockOnAcknowledge);
toAckCount = 0;
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/FilterChainSupport.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/FilterChainSupport.java 2008-05-09 11:45:40 UTC (rev 4167)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/FilterChainSupport.java 2008-05-09 12:39:52 UTC (rev 4168)
@@ -82,9 +82,7 @@
filter.setUseClientMode(true);
filter.setWantClientAuth(true);
}
- filterChain.addLast("ssl", filter);
-
- log.info("added ssl filter");
+ filterChain.addLast("ssl", filter);
}
// Package protected ---------------------------------------------
Modified: trunk/src/main/org/jboss/messaging/core/security/impl/SecurityStoreImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/security/impl/SecurityStoreImpl.java 2008-05-09 11:45:40 UTC (rev 4167)
+++ trunk/src/main/org/jboss/messaging/core/security/impl/SecurityStoreImpl.java 2008-05-09 12:39:52 UTC (rev 4168)
@@ -68,11 +68,11 @@
JBMSecurityManager securityManager;
- private final Set<String> readCache = new ConcurrentHashSet<String>();
+ private final Set<SimpleString> readCache = new ConcurrentHashSet<SimpleString>();
- private final Set<String> writeCache = new ConcurrentHashSet<String>();
+ private final Set<SimpleString> writeCache = new ConcurrentHashSet<SimpleString>();
- private final Set<String> createCache = new ConcurrentHashSet<String>();
+ private final Set<SimpleString> createCache = new ConcurrentHashSet<SimpleString>();
private final long invalidationInterval;
@@ -124,17 +124,17 @@
{
case CheckType.TYPE_READ:
{
- readCache.add(saddress);
+ readCache.add(address);
break;
}
case CheckType.TYPE_WRITE:
{
- writeCache.add(saddress);
+ writeCache.add(address);
break;
}
case CheckType.TYPE_CREATE:
{
- createCache.add(saddress);
+ createCache.add(address);
break;
}
default:
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/MessageReferenceImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/MessageReferenceImpl.java 2008-05-09 11:45:40 UTC (rev 4167)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/MessageReferenceImpl.java 2008-05-09 12:39:52 UTC (rev 4168)
@@ -182,8 +182,6 @@
Transaction tx = new TransactionImpl(persistenceManager, postOffice);
- log.info("expiring message");
-
if (expiryQueue != null)
{
Binding binding = postOffice.getBinding(expiryQueue);
Modified: trunk/src/main/org/jboss/messaging/jms/client/JBossSession.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/client/JBossSession.java 2008-05-09 11:45:40 UTC (rev 4167)
+++ trunk/src/main/org/jboss/messaging/jms/client/JBossSession.java 2008-05-09 12:39:52 UTC (rev 4168)
@@ -80,9 +80,7 @@
*
* $Id$
*/
-public class JBossSession implements
- Session, XASession, QueueSession, XAQueueSession,
- TopicSession, XATopicSession
+public class JBossSession implements Session, XASession, QueueSession, XAQueueSession, TopicSession, XATopicSession
{
// Constants -----------------------------------------------------
Modified: trunk/src/main/org/jboss/messaging/util/OrderedExecutorFactory.java
===================================================================
--- trunk/src/main/org/jboss/messaging/util/OrderedExecutorFactory.java 2008-05-09 11:45:40 UTC (rev 4167)
+++ trunk/src/main/org/jboss/messaging/util/OrderedExecutorFactory.java 2008-05-09 12:39:52 UTC (rev 4168)
@@ -25,8 +25,7 @@
public final class OrderedExecutorFactory
{
private final Executor parent;
- private final Set<ChildExecutor> runningChildren = Collections
- .synchronizedSet(new HashSet<ChildExecutor>());
+ private final Set<ChildExecutor> runningChildren = Collections.synchronizedSet(new HashSet<ChildExecutor>());
public OrderedExecutorFactory(final Executor parent)
{
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/MessageProducerTest.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/MessageProducerTest.java 2008-05-09 11:45:40 UTC (rev 4167)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/MessageProducerTest.java 2008-05-09 12:39:52 UTC (rev 4168)
@@ -164,7 +164,52 @@
Session ps = pconn.createSession(false, Session.DUPS_OK_ACKNOWLEDGE);
MessageProducer p = ps.createProducer(queue1);
+
+ pconn.start();
+ p.setDeliveryMode(DeliveryMode.NON_PERSISTENT);
+
+ p.setDisableMessageID(true);
+ p.setDisableMessageTimestamp(true);
+
+ final int numMessages = 100000;
+
+ long start = System.currentTimeMillis();
+
+ BytesMessage msg = ps.createBytesMessage();
+
+ msg.writeBytes(new byte[200]);
+
+ for (int i = 0; i < numMessages; i++)
+ {
+ p.send(msg);
+ }
+
+ long end = System.currentTimeMillis();
+
+ double actualRate = 1000 * (double)numMessages / ( end - start);
+
+ log.info("rate " + actualRate + " msgs /sec");
+
+ }
+ finally
+ {
+ pconn.close();
+ }
+ }
+
+ public void testSpeed2() throws Exception
+ {
+ Connection pconn = null;
+
+ try
+ {
+ pconn = cf.createConnection();
+
+ Session ps = pconn.createSession(false, Session.DUPS_OK_ACKNOWLEDGE);
+
+ MessageProducer p = ps.createProducer(queue1);
+
MessageConsumer cons = ps.createConsumer(queue1);
pconn.start();
@@ -174,7 +219,7 @@
p.setDisableMessageID(true);
p.setDisableMessageTimestamp(true);
- final int numMessages = 10000;
+ final int numMessages = 100000;
long start = System.currentTimeMillis();
@@ -221,7 +266,7 @@
}
}
- public void testSpeed2() throws Exception
+ public void testSpeed3() throws Exception
{
Connection pconn = null;
@@ -229,34 +274,55 @@
{
pconn = cf.createConnection();
- Session ps = pconn.createSession(true, Session.SESSION_TRANSACTED);
+ Session ps = pconn.createSession(false, Session.DUPS_OK_ACKNOWLEDGE);
MessageProducer p = ps.createProducer(queue1);
- p.setDeliveryMode(DeliveryMode.PERSISTENT);
+ MessageConsumer cons = ps.createConsumer(queue1);
+
+ p.setDeliveryMode(DeliveryMode.NON_PERSISTENT);
p.setDisableMessageID(true);
p.setDisableMessageTimestamp(true);
- final int numMessages = 20000;
-
- long start = System.currentTimeMillis();
-
+ final int numMessages = 100000;
+
BytesMessage msg = ps.createBytesMessage();
msg.writeBytes(new byte[1000]);
+
+ final CountDownLatch latch = new CountDownLatch(1);
+
+ class MyListener implements MessageListener
+ {
+ int count;
+ public void onMessage(Message msg)
+ {
+ count++;
+
+ if (count == numMessages)
+ {
+ latch.countDown();
+ }
+ }
+ }
+ cons.setMessageListener(new MyListener());
+
for (int i = 0; i < numMessages; i++)
{
p.send(msg);
-
- if ((i+1) % 1000 == 0)
- {
- ps.commit();
- }
}
+ long start = System.currentTimeMillis();
+
+
+ pconn.start();
+
+
+ latch.await();
+
long end = System.currentTimeMillis();
double actualRate = 1000 * (double)numMessages / ( end - start);
@@ -266,10 +332,10 @@
}
finally
{
-
+ pconn.close();
}
}
-
+
public void testTransactedSendPersistent() throws Exception
{
transactedSend(true);
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/message/SimpleJMSMessage.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/message/SimpleJMSMessage.java 2008-05-09 11:45:40 UTC (rev 4167)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/message/SimpleJMSMessage.java 2008-05-09 12:39:52 UTC (rev 4168)
@@ -169,7 +169,6 @@
{
if (!this.ignoreSetDestination)
{
- log.info("*********** setting destination to: " + destination);
this.destination = destination;
}
}
More information about the jboss-cvs-commits
mailing list