[jboss-cvs] jboss-jms/perf/src/org/jboss/jms/perf/framework/protocol ...

[Timothy Fox]

  User: timfox  
  Date: 06/07/17 13:14:43

  Modified:    perf/src/org/jboss/jms/perf/framework/protocol   
                        DrainJob.java ReceiveJob.java SendJob.java
  Log:
  Many changes including implementation of prefetch, SEDAisation of server, changing of recovery
  
  Revision  Changes    Path
  1.4       +3 -3      jboss-jms/perf/src/org/jboss/jms/perf/framework/protocol/DrainJob.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: DrainJob.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-jms/perf/src/org/jboss/jms/perf/framework/protocol/DrainJob.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- DrainJob.java	14 Mar 2006 01:15:22 -0000	1.3
  +++ DrainJob.java	17 Jul 2006 17:14:43 -0000	1.4
  @@ -20,9 +20,9 @@
   /**
    * @author <a href="tim.fox at jboss.com">Tim Fox</a>
    * @author <a href="ovidiux at jboss.org">Ovidiu Feodorov</a>
  - * @version $Revision: 1.3 $
  + * @version $Revision: 1.4 $
    *
  - * $Id: DrainJob.java,v 1.3 2006/03/14 01:15:22 ovidiu Exp $
  + * $Id: DrainJob.java,v 1.4 2006/07/17 17:14:43 timfox Exp $
    */
   public class DrainJob extends JobSupport
   {
  @@ -94,7 +94,7 @@
   
            while (true)
            {
  -            Message m = consumer.receiveNoWait();
  +            Message m = consumer.receive(1000);
               if (m == null)
               {
                  break;
  
  
  
  1.3       +5 -5      jboss-jms/perf/src/org/jboss/jms/perf/framework/protocol/ReceiveJob.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ReceiveJob.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-jms/perf/src/org/jboss/jms/perf/framework/protocol/ReceiveJob.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- ReceiveJob.java	12 Mar 2006 08:50:24 -0000	1.2
  +++ ReceiveJob.java	17 Jul 2006 17:14:43 -0000	1.3
  @@ -20,9 +20,9 @@
   /**
    * @author <a href="tim.fox at jboss.com">Tim Fox</a>
    * @author <a href="ovidiu at jboss.org">Ovidiu Feodorov</a>
  - * @version $Revision: 1.2 $
  + * @version $Revision: 1.3 $
    *
  - * $Id: ReceiveJob.java,v 1.2 2006/03/12 08:50:24 ovidiu Exp $
  + * $Id: ReceiveJob.java,v 1.3 2006/07/17 17:14:43 timfox Exp $
    */
   public class ReceiveJob extends ThroughputJobSupport
   {
  
  
  
  1.6       +8 -6      jboss-jms/perf/src/org/jboss/jms/perf/framework/protocol/SendJob.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SendJob.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-jms/perf/src/org/jboss/jms/perf/framework/protocol/SendJob.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- SendJob.java	17 Mar 2006 02:16:13 -0000	1.5
  +++ SendJob.java	17 Jul 2006 17:14:43 -0000	1.6
  @@ -19,9 +19,9 @@
   /**
    * @author <a href="tim.fox at jboss.com">Tim Fox</a>
    * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
  - * @version $Revision: 1.5 $
  + * @version $Revision: 1.6 $
    *
  - * $Id: SendJob.java,v 1.5 2006/03/17 02:16:13 ovidiu Exp $
  + * $Id: SendJob.java,v 1.6 2006/07/17 17:14:43 timfox Exp $
    */
   public class SendJob extends ThroughputJobSupport
   {
  @@ -44,6 +44,8 @@
   
      private MessageFactory messageFactory;
      
  +   private boolean trace = log.isTraceEnabled();
  +   
      // Constructors --------------------------------------------------
   
      public SendJob()
  @@ -204,6 +206,8 @@
               long start = System.currentTimeMillis();
               long timeLeft;
   
  +            Message m = messageFactory.getMessage(sess, messageSize);
  +
               while (true)
               {
                  timeLeft = duration - System.currentTimeMillis() + start;
  @@ -214,8 +218,6 @@
                     break;
                  }
   
  -               Message m = messageFactory.getMessage(sess, messageSize);
  -
                  if (anon)
                  {
                     prod.send(destination, m);
  @@ -227,7 +229,7 @@
   
                  currentMessageCount++;
   
  -               if (log.isTraceEnabled()) { log.trace("sent message " + currentMessageCount); }
  +               if (trace) { log.trace("sent message " + currentMessageCount); }
   
                  if (transacted)
                  {