[jboss-cvs] JBoss Messaging SVN: r7172 - in trunk: native/bin and 4 other directories.

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

Author: clebert.suconic at jboss.com
Date: 2009-06-02 23:57:58 -0400 (Tue, 02 Jun 2009)
New Revision: 7172

Modified:
   trunk/native/bin/libJBMLibAIO64.so
   trunk/native/disktest64
   trunk/native/src/
   trunk/native/src/Version.h
   trunk/src/main/org/jboss/messaging/core/asyncio/impl/AsynchronousFileImpl.java
   trunk/tests/src/org/jboss/messaging/tests/integration/journal/RealAIOJournalImplTest.java
   trunk/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/JournalImplTestBase.java
Log:
libaio compilation (only few message changes)

Modified: trunk/native/bin/libJBMLibAIO64.so
===================================================================
(Binary files differ)

Modified: trunk/native/disktest64
===================================================================
(Binary files differ)


Property changes on: trunk/native/src
___________________________________________________________________
Name: svn:ignore
   - Makefile
Makefile.in
*.o
.deps
.libs
org_jboss_messaging_core_asyncio_impl_AsynchronousFileImpl.h
org_jboss_messaging_core_asyncio_impl_AsynchronousFileImpl_PollerThread.h

   + Makefile
Makefile.in
*.o
.deps
.libs
org_jboss_messaging_core_asyncio_impl_AsynchronousFileImpl.h
org_jboss_messaging_core_asyncio_impl_AsynchronousFileImpl_PollerThread.h
disktest


Modified: trunk/native/src/Version.h
===================================================================
--- trunk/native/src/Version.h	2009-06-03 03:45:51 UTC (rev 7171)
+++ trunk/native/src/Version.h	2009-06-03 03:57:58 UTC (rev 7172)
@@ -1,5 +1,5 @@
 
 #ifndef _VERSION_NATIVE_AIO
-#define _VERSION_NATIVE_AIO 19
+#define _VERSION_NATIVE_AIO 20
 #endif
 

Modified: trunk/src/main/org/jboss/messaging/core/asyncio/impl/AsynchronousFileImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/asyncio/impl/AsynchronousFileImpl.java	2009-06-03 03:45:51 UTC (rev 7171)
+++ trunk/src/main/org/jboss/messaging/core/asyncio/impl/AsynchronousFileImpl.java	2009-06-03 03:57:58 UTC (rev 7172)
@@ -55,7 +55,7 @@
 
    private static boolean loaded = false;
 
-   private static int EXPECTED_NATIVE_VERSION = 19;
+   private static int EXPECTED_NATIVE_VERSION = 20;
 
    public static void addMax(final int io)
    {

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/journal/RealAIOJournalImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/journal/RealAIOJournalImplTest.java	2009-06-03 03:45:51 UTC (rev 7171)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/journal/RealAIOJournalImplTest.java	2009-06-03 03:57:58 UTC (rev 7172)
@@ -25,6 +25,7 @@
 import java.io.File;
 
 import org.jboss.messaging.core.asyncio.impl.AsynchronousFileImpl;
+import org.jboss.messaging.core.config.impl.ConfigurationImpl;
 import org.jboss.messaging.core.journal.SequentialFileFactory;
 import org.jboss.messaging.core.journal.impl.AIOSequentialFileFactory;
 import org.jboss.messaging.core.logging.Logger;
@@ -72,6 +73,22 @@
       return new AIOSequentialFileFactory(getTestDir());
    }
 
+   public void testAddSync() throws Exception
+   {
+      setup(10, 10 * 1024, true);
+      this.flushOnSync = false;
+      createJournal();
+      startJournal();
+      load();
+
+      for (int i = 0; i < 1000; i++)
+      {
+         journal.appendAddRecord(i, (byte)1, new byte[] { 10, 12 });
+      }
+
+      stopJournal();
+   }
+
    @Override
    protected int getAlignment()
    {

Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/JournalImplTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/JournalImplTestBase.java	2009-06-03 03:45:51 UTC (rev 7171)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/JournalImplTestBase.java	2009-06-03 03:57:58 UTC (rev 7172)
@@ -68,6 +68,8 @@
    protected int fileSize;
 
    protected boolean sync;
+   
+   protected boolean flushOnSync;
 
    protected String filePrefix = "jbm";
 
@@ -140,12 +142,13 @@
       minFiles = minFreeFiles;
       this.fileSize = fileSize;
       this.sync = sync;
+      this.flushOnSync = sync;
       maxAIO = 50;
    }
 
    public void createJournal() throws Exception
    {
-      journal = new JournalImpl(fileSize, minFiles, sync, sync, sync, fileFactory, filePrefix, fileExtension, maxAIO);
+      journal = new JournalImpl(fileSize, minFiles, sync, sync, flushOnSync, fileFactory, filePrefix, fileExtension, maxAIO);
       journal.setAutoReclaim(false);
    }