[jboss-cvs] JBoss Messaging SVN: r4305 - in trunk: src/main/org/jboss/messaging/core/asyncio and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue May 27 09:48:48 EDT 2008
Author: jmesnil
Date: 2008-05-27 09:48:48 -0400 (Tue, 27 May 2008)
New Revision: 4305
Modified:
trunk/src/config/jbm-configuration.xml
trunk/src/main/org/jboss/messaging/core/asyncio/AsynchronousFile.java
trunk/src/main/org/jboss/messaging/core/asyncio/impl/AsynchronousFileImpl.java
trunk/src/main/org/jboss/messaging/core/config/Configuration.java
trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java
trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java
trunk/src/main/org/jboss/messaging/core/journal/SequentialFileFactory.java
trunk/src/main/org/jboss/messaging/core/journal/impl/AIOSequentialFile.java
trunk/src/main/org/jboss/messaging/core/journal/impl/AIOSequentialFileFactory.java
trunk/src/main/org/jboss/messaging/core/journal/impl/JournalImpl.java
trunk/src/main/org/jboss/messaging/core/journal/impl/NIOSequentialFileFactory.java
trunk/src/main/org/jboss/messaging/util/VariableLatch.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java
Log:
journal-aio-timeout is now expressed in milliseconds
Modified: trunk/src/config/jbm-configuration.xml
===================================================================
--- trunk/src/config/jbm-configuration.xml 2008-05-27 13:08:44 UTC (rev 4304)
+++ trunk/src/config/jbm-configuration.xml 2008-05-27 13:48:48 UTC (rev 4305)
@@ -84,13 +84,13 @@
<journal-max-aio>9000</journal-max-aio>
- <!-- Maximum time in seconds an AIO operation could take.
+ <!-- Maximum time in milliseconds an AIO operation could take.
This includes:
- closing Asynchronous files
- Transaction awaits
- Awaits on non transactional writes
-->
- <journal-aio-timeout>90</journal-aio-timeout>
+ <journal-aio-timeout>90000</journal-aio-timeout>
<journal-task-period>5000</journal-task-period>
Modified: trunk/src/main/org/jboss/messaging/core/asyncio/AsynchronousFile.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/asyncio/AsynchronousFile.java 2008-05-27 13:08:44 UTC (rev 4304)
+++ trunk/src/main/org/jboss/messaging/core/asyncio/AsynchronousFile.java 2008-05-27 13:48:48 UTC (rev 4305)
@@ -24,7 +24,7 @@
* @param fileName
* @param maxIO The number of max concurrent asynchrnous IO operations. It has to be balanced between the size of your writes and the capacity of your disk.
*/
- void open(String fileName, int maxIO, int timeout);
+ void open(String fileName, int maxIO, long timeout);
/**
* Warning: This function will perform a synchronous IO, probably translating to a fstat call
Modified: trunk/src/main/org/jboss/messaging/core/asyncio/impl/AsynchronousFileImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/asyncio/impl/AsynchronousFileImpl.java 2008-05-27 13:08:44 UTC (rev 4304)
+++ trunk/src/main/org/jboss/messaging/core/asyncio/impl/AsynchronousFileImpl.java 2008-05-27 13:48:48 UTC (rev 4305)
@@ -105,7 +105,7 @@
private ReadWriteLock lock = new ReentrantReadWriteLock();
private Lock writeLock = lock.writeLock();
private Semaphore writeSemaphore;
- private int timeout;
+ private long timeout;
/**
* Warning: Beware of the C++ pointer! It will bite you! :-)
@@ -117,7 +117,7 @@
// AsynchronousFile implementation
// ------------------------------------------------------------------------------------
- public void open(final String fileName, final int maxIO, final int timeout)
+ public void open(final String fileName, final int maxIO, final long timeout)
{
try
{
Modified: trunk/src/main/org/jboss/messaging/core/config/Configuration.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/Configuration.java 2008-05-27 13:08:44 UTC (rev 4304)
+++ trunk/src/main/org/jboss/messaging/core/config/Configuration.java 2008-05-27 13:48:48 UTC (rev 4305)
@@ -109,7 +109,7 @@
int getJournalMaxAIO();
- int getJournalAIOTimeout();
+ long getJournalAIOTimeout();
void setJournalMaxAIO(int max);
Modified: trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java 2008-05-27 13:08:44 UTC (rev 4304)
+++ trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java 2008-05-27 13:48:48 UTC (rev 4305)
@@ -49,7 +49,7 @@
public static final boolean DEFAULT_INVM_DISABLED = false;
public static final boolean DEFAULT_SSL_ENABLED = false;
public static final int DEFAULT_MAX_AIO = 3000;
- public static final int DEFAULT_AIO_TIMEOUT = 90;
+ public static final long DEFAULT_AIO_TIMEOUT = 90000; // in ms
protected List<String> defaultInterceptors = new ArrayList<String>();
@@ -83,7 +83,7 @@
protected int journalMaxAIO;
- protected int journalAIOTimeout;
+ protected long journalAIOTimeout;
protected long journalTaskPeriod;
@@ -418,7 +418,7 @@
this.journalMaxAIO = max;
}
- public int getJournalAIOTimeout()
+ public long getJournalAIOTimeout()
{
return journalAIOTimeout;
}
Modified: trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java 2008-05-27 13:08:44 UTC (rev 4304)
+++ trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java 2008-05-27 13:48:48 UTC (rev 4305)
@@ -139,7 +139,7 @@
this.journalMaxAIO = getInteger(e, "journal-max-aio", DEFAULT_MAX_AIO);
- this.journalAIOTimeout = getInteger(e, "journal-aio-timeout", DEFAULT_AIO_TIMEOUT);
+ this.journalAIOTimeout = getLong(e, "journal-aio-timeout", DEFAULT_AIO_TIMEOUT);
this.securityEnabled = getBoolean(e, "security-enabled", true);
Modified: trunk/src/main/org/jboss/messaging/core/journal/SequentialFileFactory.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/journal/SequentialFileFactory.java 2008-05-27 13:08:44 UTC (rev 4304)
+++ trunk/src/main/org/jboss/messaging/core/journal/SequentialFileFactory.java 2008-05-27 13:48:48 UTC (rev 4305)
@@ -34,7 +34,7 @@
*/
public interface SequentialFileFactory
{
- SequentialFile createSequentialFile(String fileName, boolean sync, int maxIO, int timeout) throws Exception;
+ SequentialFile createSequentialFile(String fileName, boolean sync, int maxIO, long timeout) throws Exception;
List<String> listFiles(String extension) throws Exception;
Modified: trunk/src/main/org/jboss/messaging/core/journal/impl/AIOSequentialFile.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/journal/impl/AIOSequentialFile.java 2008-05-27 13:08:44 UTC (rev 4304)
+++ trunk/src/main/org/jboss/messaging/core/journal/impl/AIOSequentialFile.java 2008-05-27 13:48:48 UTC (rev 4305)
@@ -41,7 +41,7 @@
private final int maxIO;
- private final int timeout;
+ private final long timeout;
private AsynchronousFile aioFile;
@@ -51,7 +51,7 @@
// serious performance problems. Because of that we make all the writes on AIO using a single thread.
private ExecutorService executor;
- public AIOSequentialFile(final String journalDir, final String fileName, final int maxIO, final int timeout) throws Exception
+ public AIOSequentialFile(final String journalDir, final String fileName, final int maxIO, final long timeout) throws Exception
{
this.journalDir = journalDir;
this.fileName = fileName;
Modified: trunk/src/main/org/jboss/messaging/core/journal/impl/AIOSequentialFileFactory.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/journal/impl/AIOSequentialFileFactory.java 2008-05-27 13:08:44 UTC (rev 4304)
+++ trunk/src/main/org/jboss/messaging/core/journal/impl/AIOSequentialFileFactory.java 2008-05-27 13:48:48 UTC (rev 4305)
@@ -26,7 +26,7 @@
super(journalDir);
}
- public SequentialFile createSequentialFile(final String fileName, final boolean sync, final int maxIO, final int timeout) throws Exception
+ public SequentialFile createSequentialFile(final String fileName, final boolean sync, final int maxIO, final long timeout) throws Exception
{
return new AIOSequentialFile(journalDir, fileName, maxIO, timeout);
}
Modified: trunk/src/main/org/jboss/messaging/core/journal/impl/JournalImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/journal/impl/JournalImpl.java 2008-05-27 13:08:44 UTC (rev 4304)
+++ trunk/src/main/org/jboss/messaging/core/journal/impl/JournalImpl.java 2008-05-27 13:48:48 UTC (rev 4305)
@@ -141,7 +141,7 @@
private final int maxAIO;
// used for Asynchronous IO only (ignored on NIO).
- private final int aioTimeout;
+ private final long aioTimeout; // in ms
private final int fileSize;
@@ -204,7 +204,7 @@
public JournalImpl(final int fileSize, final int minFiles,
final boolean sync, final SequentialFileFactory fileFactory, final long taskPeriod,
- final String filePrefix, final String fileExtension, final int maxAIO, final int aioTimeout)
+ final String filePrefix, final String fileExtension, final int maxAIO, final long aioTimeout)
{
if (fileSize < MIN_FILE_SIZE)
{
@@ -1693,9 +1693,9 @@
latch.countDown();
}
- public void waitCompletion(int timeout) throws InterruptedException
+ public void waitCompletion(long timeout) throws InterruptedException
{
- if (!latch.await(timeout, TimeUnit.SECONDS))
+ if (!latch.await(timeout, TimeUnit.MILLISECONDS))
{
throw new IllegalStateException("Timeout!");
}
@@ -1724,7 +1724,7 @@
countLatch.down();
}
- public void waitCompletion(int timeout) throws InterruptedException
+ public void waitCompletion(long timeout) throws InterruptedException
{
countLatch.waitCompletion(timeout);
Modified: trunk/src/main/org/jboss/messaging/core/journal/impl/NIOSequentialFileFactory.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/journal/impl/NIOSequentialFileFactory.java 2008-05-27 13:08:44 UTC (rev 4304)
+++ trunk/src/main/org/jboss/messaging/core/journal/impl/NIOSequentialFileFactory.java 2008-05-27 13:48:48 UTC (rev 4305)
@@ -42,7 +42,7 @@
}
// The timeout is ignored on NIO
- public SequentialFile createSequentialFile(final String fileName, final boolean sync, int maxIO, int timeout)
+ public SequentialFile createSequentialFile(final String fileName, final boolean sync, int maxIO, long timeout)
{
return new NIOSequentialFile(journalDir, fileName, sync);
}
Modified: trunk/src/main/org/jboss/messaging/util/VariableLatch.java
===================================================================
--- trunk/src/main/org/jboss/messaging/util/VariableLatch.java 2008-05-27 13:08:44 UTC (rev 4304)
+++ trunk/src/main/org/jboss/messaging/util/VariableLatch.java 2008-05-27 13:48:48 UTC (rev 4305)
@@ -114,9 +114,9 @@
control.acquireSharedInterruptibly(1);
}
- public void waitCompletion(final int seconds) throws InterruptedException
+ public void waitCompletion(final long milliseconds) throws InterruptedException
{
- if (!control.tryAcquireSharedNanos(1, TimeUnit.SECONDS.toNanos(seconds)))
+ if (!control.tryAcquireSharedNanos(1, TimeUnit.MILLISECONDS.toNanos(milliseconds)))
{
throw new IllegalStateException("Timeout!");
}
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java 2008-05-27 13:08:44 UTC (rev 4304)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java 2008-05-27 13:48:48 UTC (rev 4305)
@@ -45,7 +45,7 @@
private Map<String, FakeSequentialFile> fileMap = new ConcurrentHashMap<String, FakeSequentialFile>();
- public SequentialFile createSequentialFile(final String fileName, final boolean sync, final int maxAIO, final int timeout) throws Exception
+ public SequentialFile createSequentialFile(final String fileName, final boolean sync, final int maxAIO, final long timeout) throws Exception
{
FakeSequentialFile sf = fileMap.get(fileName);
More information about the jboss-cvs-commits
mailing list