[jboss-cvs] JBoss Messaging SVN: r4260 - in trunk: examples/jms and 2 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: timfox
Date: 2008-05-21 05:39:33 -0400 (Wed, 21 May 2008)
New Revision: 4260

Modified:
   trunk/build-messaging.xml
   trunk/examples/jms/build.xml
   trunk/src/config/jbm-configuration.xml
   trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaHandler.java
Log:
A few more tweaks


Modified: trunk/build-messaging.xml
===================================================================
--- trunk/build-messaging.xml	2008-05-21 09:22:37 UTC (rev 4259)
+++ trunk/build-messaging.xml	2008-05-21 09:39:33 UTC (rev 4260)
@@ -749,6 +749,8 @@
          <jvmarg value="-XX:+UseParallelGC"/>
          <jvmarg value="-Xms512M"/>
          <jvmarg value="-Xmx2048M"/>
+	 <jvmarg value="-XX:+AggressiveOpts"/>
+	 <jvmarg value="-XX:+UseFastAccessorMethods"/>
          <jvmarg value="-Dorg.jboss.logging.Logger.pluginClass=org.jboss.messaging.core.logging.JBMLoggerPlugin"/>
          <jvmarg value="-Djava.library.path=${native.bin.dir}"/>
          <jvmarg value="-Djava.naming.factory.initial=org.jnp.interfaces.NamingContextFactory"/>

Modified: trunk/examples/jms/build.xml
===================================================================
--- trunk/examples/jms/build.xml	2008-05-21 09:22:37 UTC (rev 4259)
+++ trunk/examples/jms/build.xml	2008-05-21 09:39:33 UTC (rev 4260)
@@ -42,9 +42,9 @@
 
    <!--perf props-->
    <property name="message.count" value="200000"/>
-   <property name="delivery.mode" value="PERSISTENT"/>
+   <property name="delivery.mode" value="NON_PERSISTENT"/>
    <property name="sample.period" value="1"/>
-   <property name="sess.trans" value="true"/>
+   <property name="sess.trans" value="false"/>
    <property name="sess.trans.size" value="1"/>
 
    <path id="compile.classpath">
@@ -120,6 +120,8 @@
          <classpath refid="runtime.classpath"/>
       	<jvmarg value="-Xmx1024M"/>
       	<jvmarg value="-XX:+UseParallelGC"/>
+	<jvmarg value="-XX:+AggressiveOpts"/>
+	<jvmarg value="-XX:+UseFastAccessorMethods"/>
         <arg value="-l"/>
         <arg value="${message.count}"/>
 	<arg value="${delivery.mode}"/>
@@ -145,6 +147,8 @@
          <classpath refid="runtime.classpath"/>
       	<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}"/>

Modified: trunk/src/config/jbm-configuration.xml
===================================================================
--- trunk/src/config/jbm-configuration.xml	2008-05-21 09:22:37 UTC (rev 4259)
+++ trunk/src/config/jbm-configuration.xml	2008-05-21 09:39:33 UTC (rev 4260)
@@ -44,7 +44,7 @@
       
       <remoting-writequeue-block-timeout>10000</remoting-writequeue-block-timeout>
       
-      <remoting-writequeue-minbytes>4096</remoting-writequeue-minbytes>
+      <remoting-writequeue-minbytes>0</remoting-writequeue-minbytes>
       
       <remoting-writequeue-maxbytes>8192</remoting-writequeue-maxbytes>
       

Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaHandler.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaHandler.java	2008-05-21 09:22:37 UTC (rev 4259)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaHandler.java	2008-05-21 09:39:33 UTC (rev 4260)
@@ -60,6 +60,8 @@
    private final long bytesLow;
 
    private final long bytesHigh;
+   
+   private boolean blocked;
 
    // Static --------------------------------------------------------
 
@@ -111,12 +113,6 @@
    // IoHandlerAdapter overrides ------------------------------------
 
    @Override
-   public void sessionCreated(IoSession session) throws Exception {
-      // Initialize the default attributes.
-      session.setAttribute(BLOCKED, Boolean.FALSE);
-   }
-
-   @Override
    public void exceptionCaught(final IoSession session, final Throwable cause)
          throws Exception
    {
@@ -184,14 +180,13 @@
    @Override
    public synchronized void messageSent(final IoSession session, final Object message) throws Exception
    {
-      boolean blocked = (Boolean) session.getAttribute(BLOCKED);
       if (blocked)
       {
          long bytes = session.getScheduledWriteBytes();
 
          if (bytes <= bytesLow)
          {
-            session.setAttribute(BLOCKED, Boolean.FALSE);
+            blocked = false;
 
             //Note that we need to notify all since there may be more than one thread waiting on this
             //E.g. the response from a blocking acknowledge and a delivery
@@ -204,7 +199,7 @@
    {
       while (session.getScheduledWriteBytes() >= bytesHigh)
       {
-         session.setAttribute(BLOCKED, Boolean.TRUE);
+         blocked = true;
 
          long start = System.currentTimeMillis();