[jboss-cvs] JBoss Messaging SVN: r7125 - in branches/Branch_JBM2_Perf_Clebert/tests/src/org/jboss/messaging/tests: stress/journal and 3 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri May 29 01:02:52 EDT 2009


Author: clebert.suconic at jboss.com
Date: 2009-05-29 01:02:49 -0400 (Fri, 29 May 2009)
New Revision: 7125

Modified:
   branches/Branch_JBM2_Perf_Clebert/tests/src/org/jboss/messaging/tests/performance/journal/JournalImplTestUnit.java
   branches/Branch_JBM2_Perf_Clebert/tests/src/org/jboss/messaging/tests/performance/journal/PerformanceComparissonTest.java
   branches/Branch_JBM2_Perf_Clebert/tests/src/org/jboss/messaging/tests/stress/journal/AddAndRemoveStressTest.java
   branches/Branch_JBM2_Perf_Clebert/tests/src/org/jboss/messaging/tests/stress/journal/remote/RemoteJournalAppender.java
   branches/Branch_JBM2_Perf_Clebert/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/JournalAsyncTest.java
   branches/Branch_JBM2_Perf_Clebert/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java
Log:
backup

Modified: branches/Branch_JBM2_Perf_Clebert/tests/src/org/jboss/messaging/tests/performance/journal/JournalImplTestUnit.java
===================================================================
--- branches/Branch_JBM2_Perf_Clebert/tests/src/org/jboss/messaging/tests/performance/journal/JournalImplTestUnit.java	2009-05-29 04:59:55 UTC (rev 7124)
+++ branches/Branch_JBM2_Perf_Clebert/tests/src/org/jboss/messaging/tests/performance/journal/JournalImplTestUnit.java	2009-05-29 05:02:49 UTC (rev 7125)
@@ -202,7 +202,7 @@
    {
       Journal journal =
          new JournalImpl(10 * 1024 * 1024, 10, true, true, getFileFactory(),
-               "jbm-data", "jbm", 5000, 10 * 1024);
+               "jbm-data", "jbm", 5000);
       
       journal.start();
       
@@ -264,7 +264,7 @@
 
       Journal journal =
          new JournalImpl(10 * 1024 * 1024,  numFiles, true, true, getFileFactory(),
-               "jbm-data", "jbm", 5000, 0);
+               "jbm-data", "jbm", 5000);
       
       journal.start();
       
@@ -290,7 +290,7 @@
       
       journal =
          new JournalImpl(10 * 1024 * 1024,  numFiles, true, true, getFileFactory(),
-               "jbm-data", "jbm", 5000, 0);
+               "jbm-data", "jbm", 5000);
       
       journal.start();
       journal.load(new ArrayList<RecordInfo>(), null);

Modified: branches/Branch_JBM2_Perf_Clebert/tests/src/org/jboss/messaging/tests/performance/journal/PerformanceComparissonTest.java
===================================================================
--- branches/Branch_JBM2_Perf_Clebert/tests/src/org/jboss/messaging/tests/performance/journal/PerformanceComparissonTest.java	2009-05-29 04:59:55 UTC (rev 7124)
+++ branches/Branch_JBM2_Perf_Clebert/tests/src/org/jboss/messaging/tests/performance/journal/PerformanceComparissonTest.java	2009-05-29 05:02:49 UTC (rev 7125)
@@ -145,8 +145,7 @@
                                             fileFactory, // AIO or NIO
                                             "jbm", // file name
                                             "jbm", // extension
-                                            20000, // it's like a semaphore for callback on the AIO layer
-                                            size + 1024); // avg buffer size.. it will reuse any buffer smaller than
+                                            20000); // it's like a semaphore for callback on the AIO layer
       // this during record writes
 
       journal.start();

Modified: branches/Branch_JBM2_Perf_Clebert/tests/src/org/jboss/messaging/tests/stress/journal/AddAndRemoveStressTest.java
===================================================================
--- branches/Branch_JBM2_Perf_Clebert/tests/src/org/jboss/messaging/tests/stress/journal/AddAndRemoveStressTest.java	2009-05-29 04:59:55 UTC (rev 7124)
+++ branches/Branch_JBM2_Perf_Clebert/tests/src/org/jboss/messaging/tests/stress/journal/AddAndRemoveStressTest.java	2009-05-29 05:02:49 UTC (rev 7125)
@@ -80,7 +80,7 @@
    {
 
       SequentialFileFactory factory = new AIOSequentialFileFactory(getTestDir());
-      JournalImpl impl = new JournalImpl(10 * 1024 * 1024, 60, true, false, factory, "jbm", "jbm", 1000, 0);
+      JournalImpl impl = new JournalImpl(10 * 1024 * 1024, 60, true, false, factory, "jbm", "jbm", 1000);
 
       impl.start();
 
@@ -98,7 +98,7 @@
       impl.stop();
 
       factory = new AIOSequentialFileFactory(getTestDir());
-      impl = new JournalImpl(10 * 1024 * 1024, 60, true, false, factory, "jbm", "jbm", 1000, 0);
+      impl = new JournalImpl(10 * 1024 * 1024, 60, true, false, factory, "jbm", "jbm", 1000);
 
       impl.start();
 
@@ -117,7 +117,7 @@
       impl.stop();
 
       factory = new AIOSequentialFileFactory(getTestDir());
-      impl = new JournalImpl(10 * 1024 * 1024, 60, true, false, factory, "jbm", "jbm", 1000, 0);
+      impl = new JournalImpl(10 * 1024 * 1024, 60, true, false, factory, "jbm", "jbm", 1000);
 
       impl.start();
 
@@ -142,7 +142,7 @@
    {
 
       SequentialFileFactory factory = new AIOSequentialFileFactory(getTestDir());
-      JournalImpl impl = new JournalImpl(10 * 1024 * 1024, 60, true, false, factory, "jbm", "jbm", 1000, 0);
+      JournalImpl impl = new JournalImpl(10 * 1024 * 1024, 60, true, false, factory, "jbm", "jbm", 1000);
 
       impl.start();
 
@@ -161,7 +161,7 @@
       impl.stop();
 
       factory = new AIOSequentialFileFactory(getTestDir());
-      impl = new JournalImpl(10 * 1024 * 1024, 60, true, false, factory, "jbm", "jbm", 1000, 0);
+      impl = new JournalImpl(10 * 1024 * 1024, 60, true, false, factory, "jbm", "jbm", 1000);
 
       impl.start();
 
@@ -180,7 +180,7 @@
       impl.stop();
 
       factory = new AIOSequentialFileFactory(getTestDir());
-      impl = new JournalImpl(10 * 1024 * 1024, 60, true, false, factory, "jbm", "jbm", 1000, 0);
+      impl = new JournalImpl(10 * 1024 * 1024, 60, true, false, factory, "jbm", "jbm", 1000);
 
       impl.start();
 

Modified: branches/Branch_JBM2_Perf_Clebert/tests/src/org/jboss/messaging/tests/stress/journal/remote/RemoteJournalAppender.java
===================================================================
--- branches/Branch_JBM2_Perf_Clebert/tests/src/org/jboss/messaging/tests/stress/journal/remote/RemoteJournalAppender.java	2009-05-29 04:59:55 UTC (rev 7124)
+++ branches/Branch_JBM2_Perf_Clebert/tests/src/org/jboss/messaging/tests/stress/journal/remote/RemoteJournalAppender.java	2009-05-29 05:02:49 UTC (rev 7125)
@@ -143,7 +143,7 @@
    public static JournalImpl createJournal(String journalType, String journalDir)
    {
       JournalImpl journal = new JournalImpl(10485760, 2, true,
-            false, getFactory(journalType, journalDir), "journaltst", "tst", 5000, 0);
+            false, getFactory(journalType, journalDir), "journaltst", "tst", 5000);
       return journal;
    }
    

Modified: branches/Branch_JBM2_Perf_Clebert/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/JournalAsyncTest.java
===================================================================
--- branches/Branch_JBM2_Perf_Clebert/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/JournalAsyncTest.java	2009-05-29 04:59:55 UTC (rev 7124)
+++ branches/Branch_JBM2_Perf_Clebert/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/JournalAsyncTest.java	2009-05-29 05:02:49 UTC (rev 7125)
@@ -357,7 +357,7 @@
          journalImpl.stop();
       }
 
-      journalImpl = new JournalImpl(journalSize, numberOfMinimalFiles, true, true, factory, "tt", "tt", 1000, 0);
+      journalImpl = new JournalImpl(journalSize, numberOfMinimalFiles, true, true, factory, "tt", "tt", 1000);
 
       journalImpl.start();
 

Modified: branches/Branch_JBM2_Perf_Clebert/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java
===================================================================
--- branches/Branch_JBM2_Perf_Clebert/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java	2009-05-29 04:59:55 UTC (rev 7124)
+++ branches/Branch_JBM2_Perf_Clebert/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java	2009-05-29 05:02:49 UTC (rev 7125)
@@ -562,6 +562,15 @@
          fileMap.put(newFileName, this);
       }
 
+      /* (non-Javadoc)
+       * @see org.jboss.messaging.core.journal.SequentialFile#fits(int)
+       */
+      public boolean fits(int size)
+      {
+         // TODO Auto-generated method stub
+         return false;
+      }
+
    }
 
    /* (non-Javadoc)




More information about the jboss-cvs-commits mailing list