diff --git a/code/.classpath b/.classpath similarity index 73% rename from code/.classpath rename to .classpath index 46f98ceda..16ce28bc8 100644 --- a/code/.classpath +++ b/.classpath @@ -1,18 +1,18 @@ - - - + + + + + + - + - - - diff --git a/.gitignore b/.gitignore index 1fc85d2d4..15633723e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +/bin +/target +/out .DS_Store -code/out -code/.idea/workspace.xml diff --git a/code/.idea/.name b/.idea/.name old mode 100755 new mode 100644 similarity index 100% rename from code/.idea/.name rename to .idea/.name diff --git a/.idea/ant.xml b/.idea/ant.xml new file mode 100644 index 000000000..f61c1e22f --- /dev/null +++ b/.idea/ant.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/code/.idea/compiler.xml b/.idea/compiler.xml old mode 100755 new mode 100644 similarity index 77% rename from code/.idea/compiler.xml rename to .idea/compiler.xml index b9a1798ac..80cf0ffab --- a/code/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,24 +1,20 @@ - - - - - - + + + + + diff --git a/code/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml old mode 100755 new mode 100644 similarity index 96% rename from code/.idea/copyright/profiles_settings.xml rename to .idea/copyright/profiles_settings.xml index b385f01fd..3572571ad --- a/code/.idea/copyright/profiles_settings.xml +++ b/.idea/copyright/profiles_settings.xml @@ -1,5 +1,5 @@ - - - - + + + + \ No newline at end of file diff --git a/code/.idea/encodings.xml b/.idea/encodings.xml old mode 100755 new mode 100644 similarity index 96% rename from code/.idea/encodings.xml rename to .idea/encodings.xml index 7c62b52a1..e36571e45 --- a/code/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -1,5 +1,4 @@ - - - - - + + + + diff --git a/code/.idea/libraries/test.xml b/.idea/libraries/test.xml old mode 100755 new mode 100644 similarity index 57% rename from code/.idea/libraries/test.xml rename to .idea/libraries/test.xml index c6f63cf55..80d15d455 --- a/code/.idea/libraries/test.xml +++ b/.idea/libraries/test.xml @@ -1,11 +1,15 @@ - - - - - - - - - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 000000000..644c9f327 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/.idea/modules.xml b/.idea/modules.xml old mode 100755 new mode 100644 similarity index 96% rename from code/.idea/modules.xml rename to .idea/modules.xml index 556da5b74..b35a26645 --- a/code/.idea/modules.xml +++ b/.idea/modules.xml @@ -1,9 +1,8 @@ - - - - - - - - - + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 000000000..922003b84 --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/code/.idea/uiDesigner.xml b/.idea/uiDesigner.xml old mode 100755 new mode 100644 similarity index 98% rename from code/.idea/uiDesigner.xml rename to .idea/uiDesigner.xml index 1e7cce4b8..82b3cb101 --- a/code/.idea/uiDesigner.xml +++ b/.idea/uiDesigner.xml @@ -1,125 +1,124 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/.idea/vcs.xml b/.idea/vcs.xml similarity index 55% rename from code/.idea/vcs.xml rename to .idea/vcs.xml index 0432162c1..dcb6b8c4c 100644 --- a/code/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,8 +1,6 @@ - - - - - - - - + + + + + + diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 000000000..928be41ff --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,531 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + localhost + 5050 + + + + + + + 1348244630363 + 1348244630363 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + No facets are configured + + + + + + + + groovy-1.8.7 + + + + + + + + 1.6 + + + + + + + + disruptor + + + + + + + + 1.6 + + + + + + + + test + + + + + + + + diff --git a/code/.project b/.project similarity index 64% rename from code/.project rename to .project index 7e49e3e71..a64795e2a 100644 --- a/code/.project +++ b/.project @@ -10,14 +10,8 @@ - - org.eclipse.wst.common.project.facet.core.builder - - - - org.eclipse.wst.common.project.facet.core.nature org.eclipse.jdt.core.javanature diff --git a/code/LICENCE.txt b/LICENCE.txt similarity index 100% rename from code/LICENCE.txt rename to LICENCE.txt diff --git a/code/build.properties b/build.properties similarity index 100% rename from code/build.properties rename to build.properties diff --git a/code/build.xml b/build.xml similarity index 97% rename from code/build.xml rename to build.xml index a2d1e0d45..fce9c432f 100644 --- a/code/build.xml +++ b/build.xml @@ -2,11 +2,11 @@ - + - - + + diff --git a/code/.gitignore b/code/.gitignore deleted file mode 100644 index 934e0e06f..000000000 --- a/code/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/bin -/target diff --git a/code/.idea/ant.xml b/code/.idea/ant.xml deleted file mode 100755 index 6ddee46ae..000000000 --- a/code/.idea/ant.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/code/.idea/misc.xml b/code/.idea/misc.xml deleted file mode 100644 index 876b2ea17..000000000 --- a/code/.idea/misc.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - http://www.w3.org/1999/xhtml - - - - - - - - - - diff --git a/code/disruptor.iml b/code/disruptor.iml deleted file mode 100644 index f004c393c..000000000 --- a/code/disruptor.iml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/code/src/Code.iml b/disruptor.iml similarity index 61% rename from code/src/Code.iml rename to disruptor.iml index 08eb197ee..4a1faa70f 100644 --- a/code/src/Code.iml +++ b/disruptor.iml @@ -1,14 +1,14 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/code/lib/release/maven-ant-tasks-2.1.3.jar b/lib/release/maven-ant-tasks-2.1.3.jar similarity index 100% rename from code/lib/release/maven-ant-tasks-2.1.3.jar rename to lib/release/maven-ant-tasks-2.1.3.jar diff --git a/code/lib/test/allocation.jar b/lib/test/allocation.jar similarity index 100% rename from code/lib/test/allocation.jar rename to lib/test/allocation.jar diff --git a/code/lib/test/caliper-0.0.jar b/lib/test/caliper-0.0.jar similarity index 100% rename from code/lib/test/caliper-0.0.jar rename to lib/test/caliper-0.0.jar diff --git a/code/lib/test/cglib-nodep-2.1_3.jar b/lib/test/cglib-nodep-2.1_3.jar similarity index 100% rename from code/lib/test/cglib-nodep-2.1_3.jar rename to lib/test/cglib-nodep-2.1_3.jar diff --git a/code/lib/test/hamcrest-core-1.1.jar b/lib/test/hamcrest-core-1.1.jar similarity index 100% rename from code/lib/test/hamcrest-core-1.1.jar rename to lib/test/hamcrest-core-1.1.jar diff --git a/code/lib/test/hamcrest-library-1.1.jar b/lib/test/hamcrest-library-1.1.jar similarity index 100% rename from code/lib/test/hamcrest-library-1.1.jar rename to lib/test/hamcrest-library-1.1.jar diff --git a/code/lib/test/jmock-2.5.1.jar b/lib/test/jmock-2.5.1.jar similarity index 100% rename from code/lib/test/jmock-2.5.1.jar rename to lib/test/jmock-2.5.1.jar diff --git a/code/lib/test/jmock-junit4-2.5.1.jar b/lib/test/jmock-junit4-2.5.1.jar similarity index 100% rename from code/lib/test/jmock-junit4-2.5.1.jar rename to lib/test/jmock-junit4-2.5.1.jar diff --git a/code/lib/test/jmock-legacy-2.5.1.jar b/lib/test/jmock-legacy-2.5.1.jar similarity index 100% rename from code/lib/test/jmock-legacy-2.5.1.jar rename to lib/test/jmock-legacy-2.5.1.jar diff --git a/code/lib/test/junit-4.5.jar b/lib/test/junit-4.5.jar similarity index 100% rename from code/lib/test/junit-4.5.jar rename to lib/test/junit-4.5.jar diff --git a/code/lib/test/objenesis-1.0.jar b/lib/test/objenesis-1.0.jar similarity index 100% rename from code/lib/test/objenesis-1.0.jar rename to lib/test/objenesis-1.0.jar diff --git a/code/maven.xml b/maven.xml similarity index 99% rename from code/maven.xml rename to maven.xml index 04ad0803c..61e177ad4 100644 --- a/code/maven.xml +++ b/maven.xml @@ -44,6 +44,6 @@ repository.url="https://oss.sonatype.org/service/local/staging/deploy/maven2"/> - + diff --git a/code/pom.template b/pom.template similarity index 100% rename from code/pom.template rename to pom.template diff --git a/code/src/main/com/lmax/disruptor/AggregateEventHandler.java b/src/main/java/com/lmax/disruptor/AggregateEventHandler.java similarity index 100% rename from code/src/main/com/lmax/disruptor/AggregateEventHandler.java rename to src/main/java/com/lmax/disruptor/AggregateEventHandler.java diff --git a/code/src/main/com/lmax/disruptor/AlertException.java b/src/main/java/com/lmax/disruptor/AlertException.java similarity index 100% rename from code/src/main/com/lmax/disruptor/AlertException.java rename to src/main/java/com/lmax/disruptor/AlertException.java diff --git a/code/src/main/com/lmax/disruptor/BatchDescriptor.java b/src/main/java/com/lmax/disruptor/BatchDescriptor.java similarity index 100% rename from code/src/main/com/lmax/disruptor/BatchDescriptor.java rename to src/main/java/com/lmax/disruptor/BatchDescriptor.java diff --git a/code/src/main/com/lmax/disruptor/BatchEventProcessor.java b/src/main/java/com/lmax/disruptor/BatchEventProcessor.java similarity index 100% rename from code/src/main/com/lmax/disruptor/BatchEventProcessor.java rename to src/main/java/com/lmax/disruptor/BatchEventProcessor.java diff --git a/code/src/main/com/lmax/disruptor/BlockingWaitStrategy.java b/src/main/java/com/lmax/disruptor/BlockingWaitStrategy.java similarity index 99% rename from code/src/main/com/lmax/disruptor/BlockingWaitStrategy.java rename to src/main/java/com/lmax/disruptor/BlockingWaitStrategy.java index 7a637385f..4917bfdf7 100644 --- a/code/src/main/com/lmax/disruptor/BlockingWaitStrategy.java +++ b/src/main/java/com/lmax/disruptor/BlockingWaitStrategy.java @@ -55,7 +55,7 @@ public long waitFor(final long sequence, Sequence cursorSequence, final Sequence lock.unlock(); } } - + while ((availableSequence = dependentSequence.get()) < sequence) { barrier.checkAlert(); diff --git a/code/src/main/com/lmax/disruptor/BusySpinWaitStrategy.java b/src/main/java/com/lmax/disruptor/BusySpinWaitStrategy.java similarity index 100% rename from code/src/main/com/lmax/disruptor/BusySpinWaitStrategy.java rename to src/main/java/com/lmax/disruptor/BusySpinWaitStrategy.java diff --git a/code/src/main/com/lmax/disruptor/DependentSequence.java b/src/main/java/com/lmax/disruptor/DependentSequence.java similarity index 96% rename from code/src/main/com/lmax/disruptor/DependentSequence.java rename to src/main/java/com/lmax/disruptor/DependentSequence.java index 246c2d694..a8d19cd0e 100644 --- a/code/src/main/com/lmax/disruptor/DependentSequence.java +++ b/src/main/java/com/lmax/disruptor/DependentSequence.java @@ -10,11 +10,11 @@ public DependentSequence(Sequence cursor, Sequence[] dependents) this.cursor = cursor; this.dependents = dependents; } - + public long getDependentSequence(long requestedSequence) { long sequence = cursor.get(); - + for (Sequence s : dependents) { sequence = Math.min(sequence, s.get()); @@ -23,7 +23,7 @@ public long getDependentSequence(long requestedSequence) break; } } - + return sequence; } } diff --git a/code/src/main/com/lmax/disruptor/EventFactory.java b/src/main/java/com/lmax/disruptor/EventFactory.java similarity index 99% rename from code/src/main/com/lmax/disruptor/EventFactory.java rename to src/main/java/com/lmax/disruptor/EventFactory.java index f3e8f1f2a..3ddeaf8ca 100644 --- a/code/src/main/com/lmax/disruptor/EventFactory.java +++ b/src/main/java/com/lmax/disruptor/EventFactory.java @@ -17,7 +17,7 @@ /** * Called by the {@link PreallocatedRingBuffer} to pre-populate all the events to fill the RingBuffer. - * + * * @param event implementation storing the data for sharing during exchange or parallel coordination of an event. */ public interface EventFactory diff --git a/code/src/main/com/lmax/disruptor/EventHandler.java b/src/main/java/com/lmax/disruptor/EventHandler.java similarity index 100% rename from code/src/main/com/lmax/disruptor/EventHandler.java rename to src/main/java/com/lmax/disruptor/EventHandler.java diff --git a/code/src/main/com/lmax/disruptor/EventProcessor.java b/src/main/java/com/lmax/disruptor/EventProcessor.java similarity index 100% rename from code/src/main/com/lmax/disruptor/EventProcessor.java rename to src/main/java/com/lmax/disruptor/EventProcessor.java diff --git a/code/src/main/com/lmax/disruptor/EventTranslator.java b/src/main/java/com/lmax/disruptor/EventTranslator.java similarity index 100% rename from code/src/main/com/lmax/disruptor/EventTranslator.java rename to src/main/java/com/lmax/disruptor/EventTranslator.java diff --git a/code/src/main/com/lmax/disruptor/EventTranslatorOneArg.java b/src/main/java/com/lmax/disruptor/EventTranslatorOneArg.java similarity index 100% rename from code/src/main/com/lmax/disruptor/EventTranslatorOneArg.java rename to src/main/java/com/lmax/disruptor/EventTranslatorOneArg.java diff --git a/code/src/main/com/lmax/disruptor/EventTranslatorThreeArg.java b/src/main/java/com/lmax/disruptor/EventTranslatorThreeArg.java similarity index 100% rename from code/src/main/com/lmax/disruptor/EventTranslatorThreeArg.java rename to src/main/java/com/lmax/disruptor/EventTranslatorThreeArg.java diff --git a/code/src/main/com/lmax/disruptor/EventTranslatorTwoArg.java b/src/main/java/com/lmax/disruptor/EventTranslatorTwoArg.java similarity index 100% rename from code/src/main/com/lmax/disruptor/EventTranslatorTwoArg.java rename to src/main/java/com/lmax/disruptor/EventTranslatorTwoArg.java diff --git a/code/src/main/com/lmax/disruptor/EventTranslatorVararg.java b/src/main/java/com/lmax/disruptor/EventTranslatorVararg.java similarity index 100% rename from code/src/main/com/lmax/disruptor/EventTranslatorVararg.java rename to src/main/java/com/lmax/disruptor/EventTranslatorVararg.java diff --git a/code/src/main/com/lmax/disruptor/ExceptionHandler.java b/src/main/java/com/lmax/disruptor/ExceptionHandler.java similarity index 100% rename from code/src/main/com/lmax/disruptor/ExceptionHandler.java rename to src/main/java/com/lmax/disruptor/ExceptionHandler.java diff --git a/code/src/main/com/lmax/disruptor/FatalExceptionHandler.java b/src/main/java/com/lmax/disruptor/FatalExceptionHandler.java similarity index 100% rename from code/src/main/com/lmax/disruptor/FatalExceptionHandler.java rename to src/main/java/com/lmax/disruptor/FatalExceptionHandler.java diff --git a/code/src/main/com/lmax/disruptor/FixedSequenceGroup.java b/src/main/java/com/lmax/disruptor/FixedSequenceGroup.java similarity index 99% rename from code/src/main/com/lmax/disruptor/FixedSequenceGroup.java rename to src/main/java/com/lmax/disruptor/FixedSequenceGroup.java index 4720fdab9..8ceafea42 100644 --- a/code/src/main/com/lmax/disruptor/FixedSequenceGroup.java +++ b/src/main/java/com/lmax/disruptor/FixedSequenceGroup.java @@ -7,12 +7,12 @@ public final class FixedSequenceGroup extends Sequence { private final Sequence[] sequences; - + public FixedSequenceGroup(Sequence[] sequences) { this.sequences = Arrays.copyOf(sequences, sequences.length); } - + /** * Get the minimum sequence value for the group. * diff --git a/code/src/main/com/lmax/disruptor/IgnoreExceptionHandler.java b/src/main/java/com/lmax/disruptor/IgnoreExceptionHandler.java similarity index 100% rename from code/src/main/com/lmax/disruptor/IgnoreExceptionHandler.java rename to src/main/java/com/lmax/disruptor/IgnoreExceptionHandler.java diff --git a/code/src/main/com/lmax/disruptor/InsufficientCapacityException.java b/src/main/java/com/lmax/disruptor/InsufficientCapacityException.java similarity index 97% rename from code/src/main/com/lmax/disruptor/InsufficientCapacityException.java rename to src/main/java/com/lmax/disruptor/InsufficientCapacityException.java index db89f0be4..b6e05a304 100644 --- a/code/src/main/com/lmax/disruptor/InsufficientCapacityException.java +++ b/src/main/java/com/lmax/disruptor/InsufficientCapacityException.java @@ -4,12 +4,12 @@ public class InsufficientCapacityException extends Exception { public static final InsufficientCapacityException INSTANCE = new InsufficientCapacityException(); - + private InsufficientCapacityException() { // Singleton } - + @Override public synchronized Throwable fillInStackTrace() { diff --git a/code/src/main/com/lmax/disruptor/LifecycleAware.java b/src/main/java/com/lmax/disruptor/LifecycleAware.java similarity index 100% rename from code/src/main/com/lmax/disruptor/LifecycleAware.java rename to src/main/java/com/lmax/disruptor/LifecycleAware.java diff --git a/code/src/main/com/lmax/disruptor/MultiProducerOffHeapRingBuffer.java b/src/main/java/com/lmax/disruptor/MultiProducerOffHeapRingBuffer.java similarity index 97% rename from code/src/main/com/lmax/disruptor/MultiProducerOffHeapRingBuffer.java rename to src/main/java/com/lmax/disruptor/MultiProducerOffHeapRingBuffer.java index cd8e46220..4fb81a64c 100644 --- a/code/src/main/com/lmax/disruptor/MultiProducerOffHeapRingBuffer.java +++ b/src/main/java/com/lmax/disruptor/MultiProducerOffHeapRingBuffer.java @@ -66,12 +66,12 @@ private MultiProducerOffHeapRingBuffer(Object buffer, long address, int bufferSi this.waitStrategy = waitStrategy; this.indexMask = bufferSize - 1; } - + public static MultiProducerOffHeapRingBuffer newInstance(int bufferSize, int chunkSize, WaitStrategy waitStrategy) { ByteBuffer buffer = ByteBuffer.allocateDirect(bufferSize * chunkSize); long address = Util.getAddressFromDirectByteBuffer(buffer); - + return new MultiProducerOffHeapRingBuffer(buffer, address, bufferSize, chunkSize, waitStrategy); } @@ -110,17 +110,17 @@ public long next() { long current; long next; - + do { current = cursor.get(); next = current + 1; - + if (next > wrapPointCache .get()) { long wrapPoint = getMinimumSequence(gatingSequences, current) + bufferSize; wrapPointCache.set(wrapPoint); - + if (next > wrapPoint) { LockSupport.parkNanos(1); @@ -134,10 +134,10 @@ else if (cursor.compareAndSet(current, next)) } } while (true); - - return next; + + return next; } - + @Override public long tryNext() throws InsufficientCapacityException { @@ -145,10 +145,10 @@ public long tryNext() throws InsufficientCapacityException { throw new NullPointerException("gatingSequences must be set before claiming sequences"); } - + long current; long next; - + do { current = cursor.get(); @@ -158,7 +158,7 @@ public long tryNext() throws InsufficientCapacityException { long wrapPoint = getMinimumSequence(gatingSequences, current) + bufferSize; wrapPointCache.set(wrapPoint); - + if (next > wrapPoint) { throw InsufficientCapacityException.INSTANCE; @@ -167,7 +167,7 @@ public long tryNext() throws InsufficientCapacityException } while (!cursor.compareAndSet(current, next)); - return next; + return next; } @Override @@ -193,25 +193,25 @@ public void publish(final long sequence) public void put(byte[] data, int dataOffset, int dataLength) { checkArray(data, dataOffset, dataLength); - + int end = dataOffset + dataLength; int current = dataOffset; int remaining = dataLength; long lastSequence = -1; - do + do { int toCopy = Math.min(remaining, bodySize); - + long next = next(); long chunkAddress = calculateAddress(next); setBodySize(chunkAddress, dataLength); setPreviousSequence(chunkAddress, lastSequence); UNSAFE.copyMemory(data, BYTE_ARRAY_OFFSET + current, null, chunkAddress + BODY_OFFSET, toCopy); publish(next); - + lastSequence = next; current += toCopy; - } + } while (current < end); } @@ -238,11 +238,11 @@ private void publish(final long sequence, final int batchSize) { long batchSequence = sequence - batchSize; do - { + { setAvailable(++batchSequence); } while (sequence != batchSequence); - + waitStrategy.signalAllWhenBlocking(); } @@ -278,7 +278,7 @@ public void ensureAvailable(long sequence) // spin. } } - + @Override public boolean isAvailable(long sequence) { @@ -286,14 +286,14 @@ public boolean isAvailable(long sequence) long sequenceAddress = address + offset; return UNSAFE.getLongVolatile(null, sequenceAddress) == sequence; } - + @Override public String toString() { return "MultiProducerOffHeapRingBuffer [address=" + address + ", bufferSize=" + bufferSize + ", chunkSize=" + chunkSize + ", buffer=" + buffer + "]"; } - + public final int getBodySize() { return bodySize; @@ -304,7 +304,7 @@ public long getPreviousSequence(long sequence) long chunkAddress = calculateAddress(sequence); return getPreviousSequence0(chunkAddress); } - + private boolean hasAvailableCapacity(long sequence, final int requiredCapacity, final Sequence[] dependentSequences) { final long wrapPoint = (sequence + requiredCapacity) - bufferSize; @@ -313,13 +313,13 @@ private boolean hasAvailableCapacity(long sequence, final int requiredCapacity, { long minSequence = getMinimumSequence(dependentSequences); minGatingSequence.set(minSequence); - + if (wrapPoint > minSequence) { return false; } } - + return true; } @@ -333,10 +333,10 @@ private void waitForFreeSlotAt(final long sequence, final Sequence[] dependentSe { LockSupport.parkNanos(1L); } - + minGatingSequence.set(minSequence); } - } + } private long calculateAddress(final long sequence) { @@ -347,7 +347,7 @@ private int calculateOffset(final long sequence) { return calculateIndex(sequence) * chunkSize; } - + private int calculateIndex(final long sequence) { return ((int) sequence) & indexMask; @@ -357,7 +357,7 @@ private void setBodySize(long chunkAddress, int dataLength) { UNSAFE.putInt(chunkAddress + SIZE_OFFSET, dataLength); } - + private int getBodySize(long chunkAddress) { return UNSAFE.getInt(chunkAddress + SIZE_OFFSET); diff --git a/code/src/main/com/lmax/disruptor/MultiProducerSequencer.java b/src/main/java/com/lmax/disruptor/MultiProducerSequencer.java similarity index 97% rename from code/src/main/com/lmax/disruptor/MultiProducerSequencer.java rename to src/main/java/com/lmax/disruptor/MultiProducerSequencer.java index 23c362c6b..a9ab9f89d 100644 --- a/code/src/main/com/lmax/disruptor/MultiProducerSequencer.java +++ b/src/main/java/com/lmax/disruptor/MultiProducerSequencer.java @@ -32,7 +32,7 @@ public class MultiProducerSequencer implements Sequencer private static final Unsafe UNSAFE = Util.getUnsafe(); private static final long base = UNSAFE.arrayBaseOffset(int[].class); private static final long scale = UNSAFE.arrayIndexScale(int[].class); - + private final WaitStrategy waitStrategy; private final Sequence cursor = new Sequence(SingleProducerSequencer.INITIAL_CURSOR_VALUE); private final Sequence wrapPointCache = new Sequence(Sequencer.INITIAL_CURSOR_VALUE); @@ -40,7 +40,7 @@ public class MultiProducerSequencer implements Sequencer private final int bufferSize; private final int indexMask; private final int indexShift; - + private Sequence[] gatingSequences; /** @@ -56,7 +56,7 @@ public MultiProducerSequencer(int bufferSize, final WaitStrategy waitStrategy) availableBuffer = new int[bufferSize]; indexMask = bufferSize - 1; indexShift = Util.log2(bufferSize); - + initialiseAvailableBuffer(); } @@ -66,7 +66,7 @@ private void initialiseAvailableBuffer() { setAvailableBufferValue(i, 0); } - + setAvailableBufferValue(0, -1); } @@ -99,7 +99,7 @@ public boolean hasAvailableCapacity(final int requiredCapacity) { return hasAvailableCapacity(cursor.get(), requiredCapacity, gatingSequences); } - + @Override public long next() { @@ -107,20 +107,20 @@ public long next() { throw new NullPointerException("gatingSequences must be set before claiming sequences"); } - + long current; long next; - + do { current = cursor.get(); next = current + 1; - + if (next > wrapPointCache.get()) { long wrapPoint = getMinimumSequence(gatingSequences) + bufferSize; wrapPointCache.set(wrapPoint); - + if (next > wrapPoint) { LockSupport.parkNanos(1); @@ -134,10 +134,10 @@ else if (cursor.compareAndSet(current, next)) } } while (true); - - return next; + + return next; } - + @Override public long tryNext() throws InsufficientCapacityException { @@ -145,10 +145,10 @@ public long tryNext() throws InsufficientCapacityException { throw new NullPointerException("gatingSequences must be set before claiming sequences"); } - + long current; long next; - + do { current = cursor.get(); @@ -158,7 +158,7 @@ public long tryNext() throws InsufficientCapacityException { long wrapPoint = getMinimumSequence(gatingSequences) + bufferSize; wrapPointCache.set(wrapPoint); - + if (next > wrapPoint) { throw InsufficientCapacityException.INSTANCE; @@ -167,7 +167,7 @@ public long tryNext() throws InsufficientCapacityException } while (!cursor.compareAndSet(current, next)); - return next; + return next; } @Override @@ -238,7 +238,7 @@ public boolean isAvailable(long sequence) long bufferAddress = (index * scale) + base; return UNSAFE.getIntVolatile(availableBuffer, bufferAddress) == flag; } - + private boolean hasAvailableCapacity(long sequence, final int requiredCapacity, final Sequence[] dependentSequences) { final long desiredSequence = sequence + requiredCapacity; @@ -246,13 +246,13 @@ private boolean hasAvailableCapacity(long sequence, final int requiredCapacity, { long wrapPoint = getMinimumSequence(dependentSequences) + bufferSize; wrapPointCache.set(wrapPoint); - + if (desiredSequence > wrapPoint) { return false; } } - + return true; } @@ -266,10 +266,10 @@ private void waitForFreeSlotAt(final long sequence, final Sequence[] dependentSe { LockSupport.parkNanos(1L); } - + wrapPointCache.set(minSequence); } - } + } private int calculateAvailabilityFlag(final long sequence) { diff --git a/code/src/main/com/lmax/disruptor/NoOpEventProcessor.java b/src/main/java/com/lmax/disruptor/NoOpEventProcessor.java similarity index 100% rename from code/src/main/com/lmax/disruptor/NoOpEventProcessor.java rename to src/main/java/com/lmax/disruptor/NoOpEventProcessor.java diff --git a/code/src/main/com/lmax/disruptor/PhasedBackoffWaitStrategy.java b/src/main/java/com/lmax/disruptor/PhasedBackoffWaitStrategy.java similarity index 95% rename from code/src/main/com/lmax/disruptor/PhasedBackoffWaitStrategy.java rename to src/main/java/com/lmax/disruptor/PhasedBackoffWaitStrategy.java index c84be9e31..fafca67bc 100644 --- a/code/src/main/com/lmax/disruptor/PhasedBackoffWaitStrategy.java +++ b/src/main/java/com/lmax/disruptor/PhasedBackoffWaitStrategy.java @@ -42,38 +42,38 @@ public PhasedBackoffWaitStrategy(long spinTimeoutMillis, this.yieldTimeoutNanos = spinTimeoutNanos + units.toNanos(yieldTimeoutMillis); this.lockingStrategy = lockingStrategy; } - - public static PhasedBackoffWaitStrategy withLock(long spinTimeoutMillis, + + public static PhasedBackoffWaitStrategy withLock(long spinTimeoutMillis, long yieldTimeoutMillis, TimeUnit units) { - return new PhasedBackoffWaitStrategy(spinTimeoutMillis, yieldTimeoutMillis, + return new PhasedBackoffWaitStrategy(spinTimeoutMillis, yieldTimeoutMillis, units, new LockBlockingStrategy()); } - - public static PhasedBackoffWaitStrategy withSleep(long spinTimeoutMillis, + + public static PhasedBackoffWaitStrategy withSleep(long spinTimeoutMillis, long yieldTimeoutMillis, TimeUnit units) { - return new PhasedBackoffWaitStrategy(spinTimeoutMillis, yieldTimeoutMillis, + return new PhasedBackoffWaitStrategy(spinTimeoutMillis, yieldTimeoutMillis, units, new SleepBlockingStrategy()); } - + @Override - public long waitFor(long sequence, Sequence cursor, Sequence dependentSequence, SequenceBarrier barrier) + public long waitFor(long sequence, Sequence cursor, Sequence dependentSequence, SequenceBarrier barrier) throws AlertException, InterruptedException { long availableSequence; long startTime = 0; int counter = SPIN_TRIES; - + do { if ((availableSequence = dependentSequence.get()) >= sequence) { return availableSequence; } - + if (0 == --counter) { if (0 == startTime) @@ -103,17 +103,17 @@ public void signalAllWhenBlocking() { lockingStrategy.signalAllWhenBlocking(); } - + private interface BlockingStrategy { long waitOnLock(long sequence, Sequence cursorSequence, Sequence dependentSequence, SequenceBarrier barrier) throws AlertException, InterruptedException; - + void signalAllWhenBlocking(); } - + private static class LockBlockingStrategy implements BlockingStrategy { private final Lock lock = new ReentrantLock(); @@ -122,7 +122,7 @@ private static class LockBlockingStrategy implements BlockingStrategy @Override public long waitOnLock(long sequence, - Sequence cursorSequence, + Sequence cursorSequence, Sequence dependentSequence, SequenceBarrier barrier) throws AlertException, InterruptedException { @@ -135,19 +135,19 @@ public long waitOnLock(long sequence, { barrier.checkAlert(); processorNotifyCondition.await(1, TimeUnit.MILLISECONDS); - } + } } finally { --numWaiters; lock.unlock(); } - + while ((availableSequence = dependentSequence.get()) < sequence) { barrier.checkAlert(); } - + return availableSequence; } @@ -168,7 +168,7 @@ public void signalAllWhenBlocking() } } } - + private static class SleepBlockingStrategy implements BlockingStrategy { public long waitOnLock(final long sequence, diff --git a/code/src/main/com/lmax/disruptor/PreallocatedRingBuffer.java b/src/main/java/com/lmax/disruptor/PreallocatedRingBuffer.java similarity index 97% rename from code/src/main/com/lmax/disruptor/PreallocatedRingBuffer.java rename to src/main/java/com/lmax/disruptor/PreallocatedRingBuffer.java index 65f0873c9..a576176c3 100644 --- a/code/src/main/com/lmax/disruptor/PreallocatedRingBuffer.java +++ b/src/main/java/com/lmax/disruptor/PreallocatedRingBuffer.java @@ -16,7 +16,7 @@ package com.lmax.disruptor; /** - * Ring based store of reusable entries containing the data representing + * Ring based store of reusable entries containing the data representing * an event being exchanged between event publisher and {@link EventProcessor}s. * * @param implementation storing the data for sharing during exchange or parallel coordination of an event. @@ -24,7 +24,7 @@ public final class PreallocatedRingBuffer extends RingBuffer { protected final Object[] entries; - + /** * Construct a RingBuffer with the full option set. * @@ -68,10 +68,10 @@ public E get(final long sequence) /** * Publishes an event to the ring buffer. It handles - * claiming the next sequence, getting the current (uninitialized) + * claiming the next sequence, getting the current (uninitialized) * event from the ring buffer and publishing the claimed sequence * after translation. - * + * * @param translator The user specified translation for the event */ public void publishEvent(final EventTranslator translator) @@ -79,14 +79,14 @@ public void publishEvent(final EventTranslator translator) final long sequence = sequencer.next(); translateAndPublish(translator, sequence); } - + /** * Attempts to publish an event to the ring buffer. It handles - * claiming the next sequence, getting the current (uninitialized) + * claiming the next sequence, getting the current (uninitialized) * event from the ring buffer and publishing the claimed sequence * after translation. Will return false if specified capacity * was not available. - * + * * @param translator The user specified translation for the event * @param capacity The capacity that should be available before publishing * @return true if the value was published, false if there was insufficient @@ -105,10 +105,10 @@ public boolean tryPublishEvent(EventTranslator translator, int capacity) return false; } } - + /** * Allows one user supplied argument. - * + * * @see #publishEvent(EventTranslator) * @param translator The user specified translation for the event * @param arg0 A user supplied argument. @@ -118,10 +118,10 @@ public void publishEvent(final EventTranslatorOneArg translator, final final long sequence = sequencer.next(); translateAndPublish(translator, sequence, arg0); } - + /** * Allows one user supplied argument. - * + * * @see #tryPublishEvent(EventTranslator, int) * @param translator The user specified translation for the event * @param capacity The capacity that should be available before publishing @@ -142,10 +142,10 @@ public boolean tryPublishEvent(EventTranslatorOneArg translator, int c return false; } } - + /** * Allows two user supplied arguments. - * + * * @see #publishEvent(EventTranslator) * @param translator The user specified translation for the event * @param arg0 A user supplied argument. @@ -156,10 +156,10 @@ public void publishEvent(final EventTranslatorTwoArg translator, final long sequence = sequencer.next(); translateAndPublish(translator, sequence, arg0, arg1); } - + /** * Allows two user supplied arguments. - * + * * @see #tryPublishEvent(EventTranslator, int) * @param translator The user specified translation for the event * @param capacity The capacity that should be available before publishing @@ -181,7 +181,7 @@ public boolean tryPublishEvent(EventTranslatorTwoArg translator, return false; } } - + /** * Allows three user supplied arguments * @@ -197,7 +197,7 @@ public void publishEvent(final EventTranslatorThreeArg tra final long sequence = sequencer.next(); translateAndPublish(translator, sequence, arg0, arg1, arg2); } - + /** * Allows three user supplied arguments * @@ -237,7 +237,7 @@ public void publishEvent(final EventTranslatorVararg translator, final Object final long sequence = sequencer.next(); translateAndPublish(translator, sequence, args); } - + /** * Allows a variable number of user supplied arguments * @@ -266,7 +266,7 @@ public boolean tryPublishEvent(EventTranslatorVararg translator, int capacity * Get the object that is preallocated within the ring buffer. This differs from the {@link #get(long)} in that * is does not wait until the publisher indicates that object is available. This method should only be used * by the publishing thread to get a handle on the preallocated event in order to fill it with data. - * + * * @param sequence for the event * @return event for the sequence */ @@ -289,7 +289,7 @@ private void translateAndPublish(final EventTranslator translator, final long } private void translateAndPublish(final EventTranslatorOneArg translator, - final long sequence, + final long sequence, final A arg0) { try @@ -303,7 +303,7 @@ private void translateAndPublish(final EventTranslatorOneArg translato } private void translateAndPublish(final EventTranslatorTwoArg translator, - final long sequence, + final long sequence, final A arg0, final B arg1) { @@ -318,7 +318,7 @@ private void translateAndPublish(final EventTranslatorTwoArg tra } private void translateAndPublish(final EventTranslatorThreeArg translator, - final long sequence, + final long sequence, final A arg0, final B arg1, final C arg2) @@ -334,7 +334,7 @@ private void translateAndPublish(final EventTranslatorThreeArg void translateAndPublish(final EventTranslatorVararg translator, - final long sequence, + final long sequence, final Object...args) { try diff --git a/code/src/main/com/lmax/disruptor/ProcessingSequenceBarrier.java b/src/main/java/com/lmax/disruptor/ProcessingSequenceBarrier.java similarity index 100% rename from code/src/main/com/lmax/disruptor/ProcessingSequenceBarrier.java rename to src/main/java/com/lmax/disruptor/ProcessingSequenceBarrier.java diff --git a/code/src/main/com/lmax/disruptor/ReferencePublisher.java b/src/main/java/com/lmax/disruptor/ReferencePublisher.java similarity index 96% rename from code/src/main/com/lmax/disruptor/ReferencePublisher.java rename to src/main/java/com/lmax/disruptor/ReferencePublisher.java index c0199eb23..e272ff5fa 100644 --- a/code/src/main/com/lmax/disruptor/ReferencePublisher.java +++ b/src/main/java/com/lmax/disruptor/ReferencePublisher.java @@ -4,15 +4,15 @@ public interface ReferencePublisher { /** * Puts the event onto the ring buffer, will block until space is available. - * + * * @param event to put into the ring buffer. */ void put(E event); - + /** * Puts the event onto the ring buffer only if there is space available. * Return false if there was no space available. - * + * * @param event to put into the ring buffer. * @return indicates if there was space available. */ diff --git a/code/src/main/com/lmax/disruptor/ReferenceRingBuffer.java b/src/main/java/com/lmax/disruptor/ReferenceRingBuffer.java similarity index 99% rename from code/src/main/com/lmax/disruptor/ReferenceRingBuffer.java rename to src/main/java/com/lmax/disruptor/ReferenceRingBuffer.java index 78e096b10..2c04fca25 100644 --- a/code/src/main/com/lmax/disruptor/ReferenceRingBuffer.java +++ b/src/main/java/com/lmax/disruptor/ReferenceRingBuffer.java @@ -3,7 +3,7 @@ public class ReferenceRingBuffer extends RingBuffer implements ReferencePublisher { protected final Object[] entries; - + public ReferenceRingBuffer(Sequencer sequencer) { super(sequencer); diff --git a/code/src/main/com/lmax/disruptor/RingBuffer.java b/src/main/java/com/lmax/disruptor/RingBuffer.java similarity index 98% rename from code/src/main/com/lmax/disruptor/RingBuffer.java rename to src/main/java/com/lmax/disruptor/RingBuffer.java index 52939fe5b..76873c1a3 100644 --- a/code/src/main/com/lmax/disruptor/RingBuffer.java +++ b/src/main/java/com/lmax/disruptor/RingBuffer.java @@ -4,7 +4,7 @@ public abstract class RingBuffer { protected final Sequencer sequencer; protected final int indexMask; - + /** * Construct a RingBuffer with the full option set. * @@ -38,7 +38,7 @@ public final long getCursor() { return sequencer.getCursor(); } - + public Sequencer getSequencer() { return sequencer; @@ -48,6 +48,6 @@ public int getBufferSize() { return sequencer.getBufferSize(); } - + public abstract E get(long sequence); } \ No newline at end of file diff --git a/code/src/main/com/lmax/disruptor/Sequence.java b/src/main/java/com/lmax/disruptor/Sequence.java similarity index 99% rename from code/src/main/com/lmax/disruptor/Sequence.java rename to src/main/java/com/lmax/disruptor/Sequence.java index f02139b4f..c2a4e2af1 100644 --- a/code/src/main/com/lmax/disruptor/Sequence.java +++ b/src/main/java/com/lmax/disruptor/Sequence.java @@ -73,7 +73,7 @@ public String toString() { return Long.toString(get()); } - + public long incrementAndGet() { return addAndGet(1L); @@ -94,4 +94,3 @@ public long addAndGet(final long increment) return newValue; } } - diff --git a/code/src/main/com/lmax/disruptor/SequenceBarrier.java b/src/main/java/com/lmax/disruptor/SequenceBarrier.java similarity index 100% rename from code/src/main/com/lmax/disruptor/SequenceBarrier.java rename to src/main/java/com/lmax/disruptor/SequenceBarrier.java diff --git a/code/src/main/com/lmax/disruptor/SequenceGroup.java b/src/main/java/com/lmax/disruptor/SequenceGroup.java similarity index 100% rename from code/src/main/com/lmax/disruptor/SequenceGroup.java rename to src/main/java/com/lmax/disruptor/SequenceGroup.java diff --git a/code/src/main/com/lmax/disruptor/SequenceReportingEventHandler.java b/src/main/java/com/lmax/disruptor/SequenceReportingEventHandler.java similarity index 100% rename from code/src/main/com/lmax/disruptor/SequenceReportingEventHandler.java rename to src/main/java/com/lmax/disruptor/SequenceReportingEventHandler.java diff --git a/code/src/main/com/lmax/disruptor/Sequencer.java b/src/main/java/com/lmax/disruptor/Sequencer.java similarity index 96% rename from code/src/main/com/lmax/disruptor/Sequencer.java rename to src/main/java/com/lmax/disruptor/Sequencer.java index 34611e820..77158c12a 100644 --- a/code/src/main/com/lmax/disruptor/Sequencer.java +++ b/src/main/java/com/lmax/disruptor/Sequencer.java @@ -56,8 +56,8 @@ public interface Sequencer /** * Attempt to claim the next event in sequence for publishing. Will return the * number of the slot if there is at least requiredCapacity slots - * available. - * + * available. + * * @return the claimed sequence value * @throws InsufficientCapacityException */ @@ -90,23 +90,23 @@ public interface Sequencer /** * Get the remaining capacity for this sequencer. - * + * * @return The number of slots remaining. */ long remainingCapacity(); /** * Spin until the entry pointed to by this sequence is available to be read. - * + * * @param sequence */ void ensureAvailable(long sequence); /** * Determine if the entry referenced by sequence is available - * + * * @param sequence - * @return true if the entry is available + * @return true if the entry is available */ boolean isAvailable(long sequence); diff --git a/code/src/main/com/lmax/disruptor/SingleProducerSequencer.java b/src/main/java/com/lmax/disruptor/SingleProducerSequencer.java similarity index 99% rename from code/src/main/com/lmax/disruptor/SingleProducerSequencer.java rename to src/main/java/com/lmax/disruptor/SingleProducerSequencer.java index c9a327a6d..9094b738b 100644 --- a/code/src/main/com/lmax/disruptor/SingleProducerSequencer.java +++ b/src/main/java/com/lmax/disruptor/SingleProducerSequencer.java @@ -91,7 +91,7 @@ public long next() return incrementAndGet(1, gatingSequences); } - + @Override public long tryNext() throws InsufficientCapacityException { @@ -99,12 +99,12 @@ public long tryNext() throws InsufficientCapacityException { throw new NullPointerException("gatingSequences must be set before claiming sequences"); } - + if (!hasAvailableCapacity(1, gatingSequences)) { throw InsufficientCapacityException.INSTANCE; } - + return incrementAndGet(1, gatingSequences); } @@ -148,13 +148,13 @@ public long remainingCapacity() public void ensureAvailable(long sequence) { } - + @Override public boolean isAvailable(long sequence) { return sequence <= cursor.get(); } - + private void waitForFreeSlotAt(final long sequence, final Sequence[] dependentSequences) { final long wrapPoint = sequence - bufferSize; @@ -169,7 +169,7 @@ private void waitForFreeSlotAt(final long sequence, final Sequence[] dependentSe minGatingSequence.set(minSequence); } } - + private boolean hasAvailableCapacity(final int requiredCapacity, final Sequence[] dependentSequences) { final long wrapPoint = (claimSequence.get() + requiredCapacity) - bufferSize; diff --git a/code/src/main/com/lmax/disruptor/SleepingWaitStrategy.java b/src/main/java/com/lmax/disruptor/SleepingWaitStrategy.java similarity index 100% rename from code/src/main/com/lmax/disruptor/SleepingWaitStrategy.java rename to src/main/java/com/lmax/disruptor/SleepingWaitStrategy.java diff --git a/code/src/main/com/lmax/disruptor/WaitStrategy.java b/src/main/java/com/lmax/disruptor/WaitStrategy.java similarity index 100% rename from code/src/main/com/lmax/disruptor/WaitStrategy.java rename to src/main/java/com/lmax/disruptor/WaitStrategy.java diff --git a/code/src/main/com/lmax/disruptor/WorkHandler.java b/src/main/java/com/lmax/disruptor/WorkHandler.java similarity index 100% rename from code/src/main/com/lmax/disruptor/WorkHandler.java rename to src/main/java/com/lmax/disruptor/WorkHandler.java diff --git a/code/src/main/com/lmax/disruptor/WorkProcessor.java b/src/main/java/com/lmax/disruptor/WorkProcessor.java similarity index 100% rename from code/src/main/com/lmax/disruptor/WorkProcessor.java rename to src/main/java/com/lmax/disruptor/WorkProcessor.java diff --git a/code/src/main/com/lmax/disruptor/WorkerPool.java b/src/main/java/com/lmax/disruptor/WorkerPool.java similarity index 100% rename from code/src/main/com/lmax/disruptor/WorkerPool.java rename to src/main/java/com/lmax/disruptor/WorkerPool.java diff --git a/code/src/main/com/lmax/disruptor/YieldingWaitStrategy.java b/src/main/java/com/lmax/disruptor/YieldingWaitStrategy.java similarity index 99% rename from code/src/main/com/lmax/disruptor/YieldingWaitStrategy.java rename to src/main/java/com/lmax/disruptor/YieldingWaitStrategy.java index 3fbed5314..21bf14182 100644 --- a/code/src/main/com/lmax/disruptor/YieldingWaitStrategy.java +++ b/src/main/java/com/lmax/disruptor/YieldingWaitStrategy.java @@ -37,7 +37,7 @@ public long waitFor(final long sequence, Sequence cursor, final Sequence depende { counter = applyWaitMethod(barrier, counter); } - + return availableSequence; } diff --git a/code/src/main/com/lmax/disruptor/collections/Histogram.java b/src/main/java/com/lmax/disruptor/collections/Histogram.java similarity index 99% rename from code/src/main/com/lmax/disruptor/collections/Histogram.java rename to src/main/java/com/lmax/disruptor/collections/Histogram.java index 827087539..193030544 100644 --- a/code/src/main/com/lmax/disruptor/collections/Histogram.java +++ b/src/main/java/com/lmax/disruptor/collections/Histogram.java @@ -137,7 +137,7 @@ private void trackRange(final long value) { minValue = value; } - + if (value > maxValue) { maxValue = value; diff --git a/code/src/main/com/lmax/disruptor/dsl/Disruptor.java b/src/main/java/com/lmax/disruptor/dsl/Disruptor.java similarity index 99% rename from code/src/main/com/lmax/disruptor/dsl/Disruptor.java rename to src/main/java/com/lmax/disruptor/dsl/Disruptor.java index 805d48eb2..5d102cff8 100644 --- a/code/src/main/com/lmax/disruptor/dsl/Disruptor.java +++ b/src/main/java/com/lmax/disruptor/dsl/Disruptor.java @@ -70,7 +70,7 @@ public Disruptor(final EventFactory eventFactory, final ProducerType claimStrategy, final WaitStrategy waitStrategy) { - this(new PreallocatedRingBuffer(eventFactory, claimStrategy.createSequencer(ringBufferSize, waitStrategy)), + this(new PreallocatedRingBuffer(eventFactory, claimStrategy.createSequencer(ringBufferSize, waitStrategy)), executor); } diff --git a/code/src/main/com/lmax/disruptor/dsl/EventHandlerGroup.java b/src/main/java/com/lmax/disruptor/dsl/EventHandlerGroup.java similarity index 100% rename from code/src/main/com/lmax/disruptor/dsl/EventHandlerGroup.java rename to src/main/java/com/lmax/disruptor/dsl/EventHandlerGroup.java diff --git a/code/src/main/com/lmax/disruptor/dsl/EventProcessorInfo.java b/src/main/java/com/lmax/disruptor/dsl/EventProcessorInfo.java similarity index 100% rename from code/src/main/com/lmax/disruptor/dsl/EventProcessorInfo.java rename to src/main/java/com/lmax/disruptor/dsl/EventProcessorInfo.java diff --git a/code/src/main/com/lmax/disruptor/dsl/EventProcessorRepository.java b/src/main/java/com/lmax/disruptor/dsl/EventProcessorRepository.java similarity index 100% rename from code/src/main/com/lmax/disruptor/dsl/EventProcessorRepository.java rename to src/main/java/com/lmax/disruptor/dsl/EventProcessorRepository.java diff --git a/code/src/main/com/lmax/disruptor/dsl/ExceptionHandlerSetting.java b/src/main/java/com/lmax/disruptor/dsl/ExceptionHandlerSetting.java similarity index 100% rename from code/src/main/com/lmax/disruptor/dsl/ExceptionHandlerSetting.java rename to src/main/java/com/lmax/disruptor/dsl/ExceptionHandlerSetting.java diff --git a/code/src/main/com/lmax/disruptor/dsl/ProducerType.java b/src/main/java/com/lmax/disruptor/dsl/ProducerType.java similarity index 99% rename from code/src/main/com/lmax/disruptor/dsl/ProducerType.java rename to src/main/java/com/lmax/disruptor/dsl/ProducerType.java index a4eb57ddd..0bd6840d8 100644 --- a/code/src/main/com/lmax/disruptor/dsl/ProducerType.java +++ b/src/main/java/com/lmax/disruptor/dsl/ProducerType.java @@ -21,6 +21,6 @@ public Sequencer createSequencer(int bufferSize, final WaitStrategy waitStrategy return new MultiProducerSequencer(bufferSize, waitStrategy); } }; - + public abstract Sequencer createSequencer(int bufferSize, final WaitStrategy waitStrategy); } diff --git a/code/src/main/com/lmax/disruptor/package.html b/src/main/java/com/lmax/disruptor/package.html similarity index 100% rename from code/src/main/com/lmax/disruptor/package.html rename to src/main/java/com/lmax/disruptor/package.html diff --git a/code/src/main/com/lmax/disruptor/util/MutableLong.java b/src/main/java/com/lmax/disruptor/util/MutableLong.java similarity index 100% rename from code/src/main/com/lmax/disruptor/util/MutableLong.java rename to src/main/java/com/lmax/disruptor/util/MutableLong.java diff --git a/code/src/main/com/lmax/disruptor/util/PaddedLong.java b/src/main/java/com/lmax/disruptor/util/PaddedLong.java similarity index 100% rename from code/src/main/com/lmax/disruptor/util/PaddedLong.java rename to src/main/java/com/lmax/disruptor/util/PaddedLong.java diff --git a/code/src/main/com/lmax/disruptor/util/Util.java b/src/main/java/com/lmax/disruptor/util/Util.java similarity index 96% rename from code/src/main/com/lmax/disruptor/util/Util.java rename to src/main/java/com/lmax/disruptor/util/Util.java index 632df1216..f39c45cf9 100644 --- a/code/src/main/com/lmax/disruptor/util/Util.java +++ b/src/main/java/com/lmax/disruptor/util/Util.java @@ -53,7 +53,7 @@ public static long getMinimumSequence(final Sequence[] sequences) { return getMinimumSequence(sequences, Long.MAX_VALUE); } - + public static long getMinimumSequence(final Sequence[] sequences, long minimum) { for (Sequence sequence : sequences) @@ -93,18 +93,18 @@ public Unsafe run() throws Exception { Field theUnsafe = Unsafe.class.getDeclaredField("theUnsafe"); theUnsafe.setAccessible(true); - return (Unsafe) theUnsafe.get(null); + return (Unsafe) theUnsafe.get(null); } }; - + THE_UNSAFE = AccessController.doPrivileged(action); } catch (Exception e) { throw new RuntimeException("Unable to load unsafe", e); - } + } } - + /** * Get a handle on the Unsafe instance, used for accessing low-level concurrency * and memory constructs. @@ -114,7 +114,7 @@ public static Unsafe getUnsafe() { return THE_UNSAFE; } - + /** * Gets the address value for the memory that backs a direct byte buffer. * @param buffer @@ -123,7 +123,7 @@ public static Unsafe getUnsafe() public static long getAddressFromDirectByteBuffer(ByteBuffer buffer) { try - { + { Field addressField = Buffer.class.getDeclaredField("address"); addressField.setAccessible(true); return addressField.getLong(buffer); @@ -133,12 +133,12 @@ public static long getAddressFromDirectByteBuffer(ByteBuffer buffer) throw new RuntimeException("Unable to address field from ByteBuffer", e); } } - - + + /** * Calculate the log base 2 of the supplied integer, essentially reports the location * of the highest bit. - * + * * @param i Value to calculate log2 for. * @return The log2 value */ diff --git a/code/src/perf/com/lmax/disruptor/AbstractPerfTestQueueVsDisruptor.java b/src/perftest/java/com/lmax/disruptor/AbstractPerfTestQueueVsDisruptor.java similarity index 100% rename from code/src/perf/com/lmax/disruptor/AbstractPerfTestQueueVsDisruptor.java rename to src/perftest/java/com/lmax/disruptor/AbstractPerfTestQueueVsDisruptor.java diff --git a/code/src/perf/com/lmax/disruptor/DirectVsEventTranslatorWithByteArrayBenchmark.java b/src/perftest/java/com/lmax/disruptor/DirectVsEventTranslatorWithByteArrayBenchmark.java similarity index 97% rename from code/src/perf/com/lmax/disruptor/DirectVsEventTranslatorWithByteArrayBenchmark.java rename to src/perftest/java/com/lmax/disruptor/DirectVsEventTranslatorWithByteArrayBenchmark.java index 24a0ee587..c95531d56 100644 --- a/code/src/perf/com/lmax/disruptor/DirectVsEventTranslatorWithByteArrayBenchmark.java +++ b/src/perftest/java/com/lmax/disruptor/DirectVsEventTranslatorWithByteArrayBenchmark.java @@ -16,13 +16,13 @@ public class DirectVsEventTranslatorWithByteArrayBenchmark extends SimpleBenchma private final ExecutorService EXECUTOR = Executors.newCachedThreadPool(); private final PreallocatedRingBuffer ringBuffer = - new PreallocatedRingBuffer(new ByteArrayFactory(), + new PreallocatedRingBuffer(new ByteArrayFactory(), new SingleProducerSequencer(BUFFER_SIZE, new YieldingWaitStrategy())); private final Sequencer sequencer = ringBuffer.getSequencer(); private final SequenceBarrier sequenceBarrier = ringBuffer.newBarrier(); private final ByteArrayEventHandler handler = new ByteArrayEventHandler(); private final ByteArrayEventTranslator translator = new ByteArrayEventTranslator(); - private final BatchEventProcessor batchEventProcessor = + private final BatchEventProcessor batchEventProcessor = new BatchEventProcessor(ringBuffer, sequenceBarrier, handler); private final byte[] data = new byte[128]; { @@ -30,12 +30,12 @@ public class DirectVsEventTranslatorWithByteArrayBenchmark extends SimpleBenchma EXECUTOR.submit(batchEventProcessor); Arrays.fill(data, (byte) 'a'); } - + public void timeDirect(int iterations) throws InterruptedException { final CountDownLatch latch = new CountDownLatch(1); handler.reset(latch, batchEventProcessor.getSequence().get() + iterations); - + for (int i = 0; i < iterations; i++) { long next = sequencer.next(); @@ -48,23 +48,23 @@ public void timeDirect(int iterations) throws InterruptedException sequencer.publish(next); } } - + latch.await(); } - + public void timeEventTranslator(int iterations) throws InterruptedException { final CountDownLatch latch = new CountDownLatch(1); handler.reset(latch, batchEventProcessor.getSequence().get() + iterations); - + for (int i = 0; i < iterations; i++) { ringBuffer.publishEvent(translator, data); } - + latch.await(); } - + private static class ByteArrayFactory implements EventFactory { @Override @@ -73,12 +73,12 @@ public byte[] newInstance() return new byte[128]; } } - + private static class ByteArrayEventHandler implements EventHandler { private long count; private CountDownLatch latch; - + public void reset(final CountDownLatch latch, final long expectedCount) { this.latch = latch; @@ -94,7 +94,7 @@ public void onEvent(byte[] event, long sequence, boolean endOfBatch) throws Exce } } } - + private static class ByteArrayEventTranslator implements EventTranslatorOneArg { @Override @@ -103,7 +103,7 @@ public void translateTo(byte[] event, long sequence, byte[] arg0) System.arraycopy(arg0, 0, event, 0, arg0.length); } } - + public static void main(String[] args) { Runner.main(DirectVsEventTranslatorWithByteArrayBenchmark.class, args); diff --git a/code/src/perf/com/lmax/disruptor/DirectVsEventTranslatorWithSingleLongBenchmark.java b/src/perftest/java/com/lmax/disruptor/DirectVsEventTranslatorWithSingleLongBenchmark.java similarity index 95% rename from code/src/perf/com/lmax/disruptor/DirectVsEventTranslatorWithSingleLongBenchmark.java rename to src/perftest/java/com/lmax/disruptor/DirectVsEventTranslatorWithSingleLongBenchmark.java index 6fcd0d9dc..e81860bba 100644 --- a/code/src/perf/com/lmax/disruptor/DirectVsEventTranslatorWithSingleLongBenchmark.java +++ b/src/perftest/java/com/lmax/disruptor/DirectVsEventTranslatorWithSingleLongBenchmark.java @@ -15,13 +15,13 @@ public class DirectVsEventTranslatorWithSingleLongBenchmark extends SimpleBenchm private final ExecutorService EXECUTOR = Executors.newCachedThreadPool(); private final PreallocatedRingBuffer ringBuffer = - new PreallocatedRingBuffer(ValueEvent.EVENT_FACTORY, + new PreallocatedRingBuffer(ValueEvent.EVENT_FACTORY, new SingleProducerSequencer(BUFFER_SIZE, new YieldingWaitStrategy())); private final Sequencer sequencer = ringBuffer.getSequencer(); private final SequenceBarrier sequenceBarrier = ringBuffer.newBarrier(); private final ValueAdditionEventHandler handler = new ValueAdditionEventHandler(); private final ValueEventTranslator translator = new ValueEventTranslator(); - private final BatchEventProcessor batchEventProcessor = + private final BatchEventProcessor batchEventProcessor = new BatchEventProcessor(ringBuffer, sequenceBarrier, handler); { ringBuffer.setGatingSequences(batchEventProcessor.getSequence()); @@ -37,53 +37,53 @@ public class DirectVsEventTranslatorWithSingleLongBenchmark extends SimpleBenchm } } - + private static class ValueEventTranslator implements EventTranslator { long value; - + @Override public void translateTo(ValueEvent event, long sequence) { event.setValue(value); } } - + public void timeDirect(int iterations) throws InterruptedException { final CountDownLatch latch = new CountDownLatch(1); handler.reset(latch, batchEventProcessor.getSequence().get() + iterations); - + for (int i = 0; i < iterations; i++) { long next = sequencer.next(); try - { + { ringBuffer.getPreallocated(next).setValue(i); } finally - { + { sequencer.publish(next); } } - + latch.await(); } - + public void timeEventTranslator(int iterations) throws InterruptedException { final CountDownLatch latch = new CountDownLatch(1); handler.reset(latch, batchEventProcessor.getSequence().get() + iterations); - + for (int i = 0; i < iterations; i++) { translator.value = i; ringBuffer.publishEvent(translator); } - + latch.await(); } - + public static void main(String[] args) { Runner.main(DirectVsEventTranslatorWithSingleLongBenchmark.class, args); diff --git a/code/src/perf/com/lmax/disruptor/OnePublisherToOneProcessorUniCastRawThroughputTest.java b/src/perftest/java/com/lmax/disruptor/OnePublisherToOneProcessorUniCastRawThroughputTest.java similarity index 100% rename from code/src/perf/com/lmax/disruptor/OnePublisherToOneProcessorUniCastRawThroughputTest.java rename to src/perftest/java/com/lmax/disruptor/OnePublisherToOneProcessorUniCastRawThroughputTest.java diff --git a/code/src/perf/com/lmax/disruptor/OnePublisherToOneProcessorUniCastThroughputTest.java b/src/perftest/java/com/lmax/disruptor/OnePublisherToOneProcessorUniCastThroughputTest.java similarity index 99% rename from code/src/perf/com/lmax/disruptor/OnePublisherToOneProcessorUniCastThroughputTest.java rename to src/perftest/java/com/lmax/disruptor/OnePublisherToOneProcessorUniCastThroughputTest.java index 5dc5704e2..9e9b41978 100644 --- a/code/src/perf/com/lmax/disruptor/OnePublisherToOneProcessorUniCastThroughputTest.java +++ b/src/perftest/java/com/lmax/disruptor/OnePublisherToOneProcessorUniCastThroughputTest.java @@ -80,7 +80,7 @@ public final class OnePublisherToOneProcessorUniCastThroughputTest extends Abstr /////////////////////////////////////////////////////////////////////////////////////////////// private final PreallocatedRingBuffer ringBuffer = - new PreallocatedRingBuffer(ValueEvent.EVENT_FACTORY, + new PreallocatedRingBuffer(ValueEvent.EVENT_FACTORY, new SingleProducerSequencer(BUFFER_SIZE, new YieldingWaitStrategy())); private final SequenceBarrier sequenceBarrier = ringBuffer.newBarrier(); private final ValueAdditionEventHandler handler = new ValueAdditionEventHandler(); diff --git a/code/src/perf/com/lmax/disruptor/OnePublisherToThreeProcessorDiamondThroughputTest.java b/src/perftest/java/com/lmax/disruptor/OnePublisherToThreeProcessorDiamondThroughputTest.java similarity index 99% rename from code/src/perf/com/lmax/disruptor/OnePublisherToThreeProcessorDiamondThroughputTest.java rename to src/perftest/java/com/lmax/disruptor/OnePublisherToThreeProcessorDiamondThroughputTest.java index f0b502d40..ce23ddd58 100644 --- a/code/src/perf/com/lmax/disruptor/OnePublisherToThreeProcessorDiamondThroughputTest.java +++ b/src/perftest/java/com/lmax/disruptor/OnePublisherToThreeProcessorDiamondThroughputTest.java @@ -141,7 +141,7 @@ public final class OnePublisherToThreeProcessorDiamondThroughputTest extends Abs /////////////////////////////////////////////////////////////////////////////////////////////// private final PreallocatedRingBuffer ringBuffer = - new PreallocatedRingBuffer(FizzBuzzEvent.EVENT_FACTORY, + new PreallocatedRingBuffer(FizzBuzzEvent.EVENT_FACTORY, new SingleProducerSequencer(BUFFER_SIZE, new YieldingWaitStrategy())); private final SequenceBarrier sequenceBarrier = ringBuffer.newBarrier(); diff --git a/code/src/perf/com/lmax/disruptor/OnePublisherToThreeProcessorMultiCastThroughputTest.java b/src/perftest/java/com/lmax/disruptor/OnePublisherToThreeProcessorMultiCastThroughputTest.java similarity index 99% rename from code/src/perf/com/lmax/disruptor/OnePublisherToThreeProcessorMultiCastThroughputTest.java rename to src/perftest/java/com/lmax/disruptor/OnePublisherToThreeProcessorMultiCastThroughputTest.java index ea9607318..2a0e3f425 100644 --- a/code/src/perf/com/lmax/disruptor/OnePublisherToThreeProcessorMultiCastThroughputTest.java +++ b/src/perftest/java/com/lmax/disruptor/OnePublisherToThreeProcessorMultiCastThroughputTest.java @@ -126,7 +126,7 @@ public final class OnePublisherToThreeProcessorMultiCastThroughputTest extends A /////////////////////////////////////////////////////////////////////////////////////////////// private final PreallocatedRingBuffer ringBuffer = - new PreallocatedRingBuffer(ValueEvent.EVENT_FACTORY, + new PreallocatedRingBuffer(ValueEvent.EVENT_FACTORY, new SingleProducerSequencer(BUFFER_SIZE, new YieldingWaitStrategy())); private final SequenceBarrier sequenceBarrier = ringBuffer.newBarrier(); diff --git a/code/src/perf/com/lmax/disruptor/OnePublisherToThreeProcessorPipelineThroughputTest.java b/src/perftest/java/com/lmax/disruptor/OnePublisherToThreeProcessorPipelineThroughputTest.java similarity index 99% rename from code/src/perf/com/lmax/disruptor/OnePublisherToThreeProcessorPipelineThroughputTest.java rename to src/perftest/java/com/lmax/disruptor/OnePublisherToThreeProcessorPipelineThroughputTest.java index 974b1708e..e28d8b0f6 100644 --- a/code/src/perf/com/lmax/disruptor/OnePublisherToThreeProcessorPipelineThroughputTest.java +++ b/src/perftest/java/com/lmax/disruptor/OnePublisherToThreeProcessorPipelineThroughputTest.java @@ -120,8 +120,8 @@ public final class OnePublisherToThreeProcessorPipelineThroughputTest extends Ab /////////////////////////////////////////////////////////////////////////////////////////////// private final PreallocatedRingBuffer ringBuffer = - new PreallocatedRingBuffer(FunctionEvent.EVENT_FACTORY, - new SingleProducerSequencer(BUFFER_SIZE, + new PreallocatedRingBuffer(FunctionEvent.EVENT_FACTORY, + new SingleProducerSequencer(BUFFER_SIZE, new YieldingWaitStrategy())); private final SequenceBarrier stepOneSequenceBarrier = ringBuffer.newBarrier(); diff --git a/code/src/perf/com/lmax/disruptor/OnePublisherToThreeWorkerPoolThroughputTest.java b/src/perftest/java/com/lmax/disruptor/OnePublisherToThreeWorkerPoolThroughputTest.java similarity index 99% rename from code/src/perf/com/lmax/disruptor/OnePublisherToThreeWorkerPoolThroughputTest.java rename to src/perftest/java/com/lmax/disruptor/OnePublisherToThreeWorkerPoolThroughputTest.java index e2834833f..0bed1aa80 100644 --- a/code/src/perf/com/lmax/disruptor/OnePublisherToThreeWorkerPoolThroughputTest.java +++ b/src/perftest/java/com/lmax/disruptor/OnePublisherToThreeWorkerPoolThroughputTest.java @@ -119,7 +119,7 @@ protected long runQueuePass() throws InterruptedException @Override protected long runDisruptorPass() throws InterruptedException { - + resetCounters(); PreallocatedRingBuffer ringBuffer = workerPool.start(EXECUTOR); Sequencer sequencer = ringBuffer.getSequencer(); diff --git a/code/src/perf/com/lmax/disruptor/ReferenceRingBufferBenchmark.java b/src/perftest/java/com/lmax/disruptor/ReferenceRingBufferBenchmark.java similarity index 97% rename from code/src/perf/com/lmax/disruptor/ReferenceRingBufferBenchmark.java rename to src/perftest/java/com/lmax/disruptor/ReferenceRingBufferBenchmark.java index 04673b861..ea1218828 100644 --- a/code/src/perf/com/lmax/disruptor/ReferenceRingBufferBenchmark.java +++ b/src/perftest/java/com/lmax/disruptor/ReferenceRingBufferBenchmark.java @@ -19,32 +19,32 @@ public class ReferenceRingBufferBenchmark extends SimpleBenchmark private final SequenceBarrier sequenceBarrier = ringBuffer.newBarrier(); private final ValueAdditionEventHandler handler = new ValueAdditionEventHandler(); private final ValueEvent event = new ValueEvent(); - private final BatchEventProcessor batchEventProcessor = + private final BatchEventProcessor batchEventProcessor = new BatchEventProcessor(ringBuffer, sequenceBarrier, handler); { ringBuffer.setGatingSequences(batchEventProcessor.getSequence()); EXECUTOR.submit(batchEventProcessor); } - + @Override protected void setUp() throws Exception { System.out.println("foo"); } - + public void timeDirect(int iterations) throws InterruptedException { final CountDownLatch latch = new CountDownLatch(1); handler.reset(latch, batchEventProcessor.getSequence().get() + iterations); - + for (int i = 0; i < iterations; i++) { ringBuffer.put(event); } - + latch.await(); } - + public static void main(String[] args) { Runner.main(ReferenceRingBufferBenchmark.class, args); diff --git a/code/src/perf/com/lmax/disruptor/ThreePublisherToOneProcessorSequencedThroughputTest.java b/src/perftest/java/com/lmax/disruptor/ThreePublisherToOneProcessorSequencedThroughputTest.java similarity index 99% rename from code/src/perf/com/lmax/disruptor/ThreePublisherToOneProcessorSequencedThroughputTest.java rename to src/perftest/java/com/lmax/disruptor/ThreePublisherToOneProcessorSequencedThroughputTest.java index 7e056c0d6..af8be2005 100644 --- a/code/src/perf/com/lmax/disruptor/ThreePublisherToOneProcessorSequencedThroughputTest.java +++ b/src/perftest/java/com/lmax/disruptor/ThreePublisherToOneProcessorSequencedThroughputTest.java @@ -111,7 +111,7 @@ public final class ThreePublisherToOneProcessorSequencedThroughputTest extends A /////////////////////////////////////////////////////////////////////////////////////////////// private final PreallocatedRingBuffer ringBuffer = - new PreallocatedRingBuffer(ValueEvent.EVENT_FACTORY, + new PreallocatedRingBuffer(ValueEvent.EVENT_FACTORY, new MultiProducerSequencer(BUFFER_SIZE, new BusySpinWaitStrategy())); private final SequenceBarrier sequenceBarrier = ringBuffer.newBarrier(); diff --git a/code/src/perf/com/lmax/disruptor/ThrottledOnePublisherToThreeProcessorPipelineLatencyTest.java b/src/perftest/java/com/lmax/disruptor/ThrottledOnePublisherToThreeProcessorPipelineLatencyTest.java similarity index 100% rename from code/src/perf/com/lmax/disruptor/ThrottledOnePublisherToThreeProcessorPipelineLatencyTest.java rename to src/perftest/java/com/lmax/disruptor/ThrottledOnePublisherToThreeProcessorPipelineLatencyTest.java diff --git a/code/src/perf/com/lmax/disruptor/support/EventCountingQueueProcessor.java b/src/perftest/java/com/lmax/disruptor/support/EventCountingQueueProcessor.java similarity index 100% rename from code/src/perf/com/lmax/disruptor/support/EventCountingQueueProcessor.java rename to src/perftest/java/com/lmax/disruptor/support/EventCountingQueueProcessor.java diff --git a/code/src/perf/com/lmax/disruptor/support/EventCountingWorkHandler.java b/src/perftest/java/com/lmax/disruptor/support/EventCountingWorkHandler.java similarity index 100% rename from code/src/perf/com/lmax/disruptor/support/EventCountingWorkHandler.java rename to src/perftest/java/com/lmax/disruptor/support/EventCountingWorkHandler.java diff --git a/code/src/perf/com/lmax/disruptor/support/FizzBuzzEvent.java b/src/perftest/java/com/lmax/disruptor/support/FizzBuzzEvent.java similarity index 100% rename from code/src/perf/com/lmax/disruptor/support/FizzBuzzEvent.java rename to src/perftest/java/com/lmax/disruptor/support/FizzBuzzEvent.java diff --git a/code/src/perf/com/lmax/disruptor/support/FizzBuzzEventHandler.java b/src/perftest/java/com/lmax/disruptor/support/FizzBuzzEventHandler.java similarity index 100% rename from code/src/perf/com/lmax/disruptor/support/FizzBuzzEventHandler.java rename to src/perftest/java/com/lmax/disruptor/support/FizzBuzzEventHandler.java diff --git a/code/src/perf/com/lmax/disruptor/support/FizzBuzzQueueProcessor.java b/src/perftest/java/com/lmax/disruptor/support/FizzBuzzQueueProcessor.java similarity index 100% rename from code/src/perf/com/lmax/disruptor/support/FizzBuzzQueueProcessor.java rename to src/perftest/java/com/lmax/disruptor/support/FizzBuzzQueueProcessor.java diff --git a/code/src/perf/com/lmax/disruptor/support/FizzBuzzStep.java b/src/perftest/java/com/lmax/disruptor/support/FizzBuzzStep.java similarity index 100% rename from code/src/perf/com/lmax/disruptor/support/FizzBuzzStep.java rename to src/perftest/java/com/lmax/disruptor/support/FizzBuzzStep.java diff --git a/code/src/perf/com/lmax/disruptor/support/FunctionEvent.java b/src/perftest/java/com/lmax/disruptor/support/FunctionEvent.java similarity index 100% rename from code/src/perf/com/lmax/disruptor/support/FunctionEvent.java rename to src/perftest/java/com/lmax/disruptor/support/FunctionEvent.java diff --git a/code/src/perf/com/lmax/disruptor/support/FunctionEventHandler.java b/src/perftest/java/com/lmax/disruptor/support/FunctionEventHandler.java similarity index 100% rename from code/src/perf/com/lmax/disruptor/support/FunctionEventHandler.java rename to src/perftest/java/com/lmax/disruptor/support/FunctionEventHandler.java diff --git a/code/src/perf/com/lmax/disruptor/support/FunctionQueueProcessor.java b/src/perftest/java/com/lmax/disruptor/support/FunctionQueueProcessor.java similarity index 100% rename from code/src/perf/com/lmax/disruptor/support/FunctionQueueProcessor.java rename to src/perftest/java/com/lmax/disruptor/support/FunctionQueueProcessor.java diff --git a/code/src/perf/com/lmax/disruptor/support/FunctionStep.java b/src/perftest/java/com/lmax/disruptor/support/FunctionStep.java similarity index 100% rename from code/src/perf/com/lmax/disruptor/support/FunctionStep.java rename to src/perftest/java/com/lmax/disruptor/support/FunctionStep.java diff --git a/code/src/perf/com/lmax/disruptor/support/LatencyStepEventHandler.java b/src/perftest/java/com/lmax/disruptor/support/LatencyStepEventHandler.java similarity index 100% rename from code/src/perf/com/lmax/disruptor/support/LatencyStepEventHandler.java rename to src/perftest/java/com/lmax/disruptor/support/LatencyStepEventHandler.java diff --git a/code/src/perf/com/lmax/disruptor/support/LatencyStepQueueProcessor.java b/src/perftest/java/com/lmax/disruptor/support/LatencyStepQueueProcessor.java similarity index 100% rename from code/src/perf/com/lmax/disruptor/support/LatencyStepQueueProcessor.java rename to src/perftest/java/com/lmax/disruptor/support/LatencyStepQueueProcessor.java diff --git a/code/src/perf/com/lmax/disruptor/support/LongRingBuffer.java b/src/perftest/java/com/lmax/disruptor/support/LongRingBuffer.java similarity index 98% rename from code/src/perf/com/lmax/disruptor/support/LongRingBuffer.java rename to src/perftest/java/com/lmax/disruptor/support/LongRingBuffer.java index 2784f41d6..1a67f271f 100644 --- a/code/src/perf/com/lmax/disruptor/support/LongRingBuffer.java +++ b/src/perftest/java/com/lmax/disruptor/support/LongRingBuffer.java @@ -20,20 +20,20 @@ public LongRingBuffer(Sequencer sequencer) indexMask = bufferSize - 1; entries = new long[bufferSize]; } - + public void put(long l) { long sequence = sequencer.next(); entries[(int)sequence & indexMask] = l; sequencer.publish(l); } - + public long getLong(long sequence) { sequencer.ensureAvailable(sequence); return entries[(int)sequence & indexMask]; } - + @Override public Long get(long sequence) { diff --git a/code/src/perf/com/lmax/disruptor/support/Operation.java b/src/perftest/java/com/lmax/disruptor/support/Operation.java similarity index 100% rename from code/src/perf/com/lmax/disruptor/support/Operation.java rename to src/perftest/java/com/lmax/disruptor/support/Operation.java diff --git a/code/src/perf/com/lmax/disruptor/support/PerfTestUtil.java b/src/perftest/java/com/lmax/disruptor/support/PerfTestUtil.java similarity index 100% rename from code/src/perf/com/lmax/disruptor/support/PerfTestUtil.java rename to src/perftest/java/com/lmax/disruptor/support/PerfTestUtil.java diff --git a/code/src/perf/com/lmax/disruptor/support/ValueAdditionEventHandler.java b/src/perftest/java/com/lmax/disruptor/support/ValueAdditionEventHandler.java similarity index 100% rename from code/src/perf/com/lmax/disruptor/support/ValueAdditionEventHandler.java rename to src/perftest/java/com/lmax/disruptor/support/ValueAdditionEventHandler.java diff --git a/code/src/perf/com/lmax/disruptor/support/ValueAdditionQueueProcessor.java b/src/perftest/java/com/lmax/disruptor/support/ValueAdditionQueueProcessor.java similarity index 100% rename from code/src/perf/com/lmax/disruptor/support/ValueAdditionQueueProcessor.java rename to src/perftest/java/com/lmax/disruptor/support/ValueAdditionQueueProcessor.java diff --git a/code/src/perf/com/lmax/disruptor/support/ValueEvent.java b/src/perftest/java/com/lmax/disruptor/support/ValueEvent.java similarity index 100% rename from code/src/perf/com/lmax/disruptor/support/ValueEvent.java rename to src/perftest/java/com/lmax/disruptor/support/ValueEvent.java diff --git a/code/src/perf/com/lmax/disruptor/support/ValueMutationEventHandler.java b/src/perftest/java/com/lmax/disruptor/support/ValueMutationEventHandler.java similarity index 100% rename from code/src/perf/com/lmax/disruptor/support/ValueMutationEventHandler.java rename to src/perftest/java/com/lmax/disruptor/support/ValueMutationEventHandler.java diff --git a/code/src/perf/com/lmax/disruptor/support/ValueMutationQueueProcessor.java b/src/perftest/java/com/lmax/disruptor/support/ValueMutationQueueProcessor.java similarity index 100% rename from code/src/perf/com/lmax/disruptor/support/ValueMutationQueueProcessor.java rename to src/perftest/java/com/lmax/disruptor/support/ValueMutationQueueProcessor.java diff --git a/code/src/perf/com/lmax/disruptor/support/ValuePublisher.java b/src/perftest/java/com/lmax/disruptor/support/ValuePublisher.java similarity index 100% rename from code/src/perf/com/lmax/disruptor/support/ValuePublisher.java rename to src/perftest/java/com/lmax/disruptor/support/ValuePublisher.java diff --git a/code/src/perf/com/lmax/disruptor/support/ValueQueuePublisher.java b/src/perftest/java/com/lmax/disruptor/support/ValueQueuePublisher.java similarity index 100% rename from code/src/perf/com/lmax/disruptor/support/ValueQueuePublisher.java rename to src/perftest/java/com/lmax/disruptor/support/ValueQueuePublisher.java diff --git a/code/src/test/com/lmax/disruptor/AggregateEventHandlerTest.java b/src/test/java/com/lmax/disruptor/AggregateEventHandlerTest.java similarity index 100% rename from code/src/test/com/lmax/disruptor/AggregateEventHandlerTest.java rename to src/test/java/com/lmax/disruptor/AggregateEventHandlerTest.java diff --git a/code/src/test/com/lmax/disruptor/BatchEventProcessorTest.java b/src/test/java/com/lmax/disruptor/BatchEventProcessorTest.java similarity index 100% rename from code/src/test/com/lmax/disruptor/BatchEventProcessorTest.java rename to src/test/java/com/lmax/disruptor/BatchEventProcessorTest.java diff --git a/code/src/test/com/lmax/disruptor/BusySpinWaitStrategyTest.java b/src/test/java/com/lmax/disruptor/BusySpinWaitStrategyTest.java similarity index 98% rename from code/src/test/com/lmax/disruptor/BusySpinWaitStrategyTest.java rename to src/test/java/com/lmax/disruptor/BusySpinWaitStrategyTest.java index 2d50b65cf..ada0ea743 100644 --- a/code/src/test/com/lmax/disruptor/BusySpinWaitStrategyTest.java +++ b/src/test/java/com/lmax/disruptor/BusySpinWaitStrategyTest.java @@ -6,7 +6,7 @@ public class BusySpinWaitStrategyTest { - + @Test public void shouldWaitForValue() throws Exception { diff --git a/code/src/test/com/lmax/disruptor/DummySequenceBarrier.java b/src/test/java/com/lmax/disruptor/DummySequenceBarrier.java similarity index 100% rename from code/src/test/com/lmax/disruptor/DummySequenceBarrier.java rename to src/test/java/com/lmax/disruptor/DummySequenceBarrier.java diff --git a/code/src/test/com/lmax/disruptor/EventPublisherTest.java b/src/test/java/com/lmax/disruptor/EventPublisherTest.java similarity index 99% rename from code/src/test/com/lmax/disruptor/EventPublisherTest.java rename to src/test/java/com/lmax/disruptor/EventPublisherTest.java index 0c8af0417..d10d8321a 100644 --- a/code/src/test/com/lmax/disruptor/EventPublisherTest.java +++ b/src/test/java/com/lmax/disruptor/EventPublisherTest.java @@ -34,11 +34,11 @@ public void shouldPublishEvent() ringBuffer.publishEvent(this); ringBuffer.publishEvent(this); - + assertThat(Long.valueOf(ringBuffer.get(0).get()), is(Long.valueOf(0 + 29L))); assertThat(Long.valueOf(ringBuffer.get(1).get()), is(Long.valueOf(1 + 29L))); } - + @Test public void shouldTryPublishEvent() throws Exception { @@ -57,7 +57,7 @@ public void shouldTryPublishEvent() throws Exception assertThat(ringBuffer.tryPublishEvent(this, 1), is(false)); } - + @Override public void translateTo(LongEvent event, long sequence) { diff --git a/code/src/test/com/lmax/disruptor/EventTranslatorTest.java b/src/test/java/com/lmax/disruptor/EventTranslatorTest.java similarity index 100% rename from code/src/test/com/lmax/disruptor/EventTranslatorTest.java rename to src/test/java/com/lmax/disruptor/EventTranslatorTest.java diff --git a/code/src/test/com/lmax/disruptor/FatalExceptionHandlerTest.java b/src/test/java/com/lmax/disruptor/FatalExceptionHandlerTest.java similarity index 100% rename from code/src/test/com/lmax/disruptor/FatalExceptionHandlerTest.java rename to src/test/java/com/lmax/disruptor/FatalExceptionHandlerTest.java diff --git a/code/src/test/com/lmax/disruptor/FixedSequenceGroupTest.java b/src/test/java/com/lmax/disruptor/FixedSequenceGroupTest.java similarity index 98% rename from code/src/test/com/lmax/disruptor/FixedSequenceGroupTest.java rename to src/test/java/com/lmax/disruptor/FixedSequenceGroupTest.java index bcc07aa28..7469673e6 100644 --- a/code/src/test/com/lmax/disruptor/FixedSequenceGroupTest.java +++ b/src/test/java/com/lmax/disruptor/FixedSequenceGroupTest.java @@ -15,7 +15,7 @@ public void shouldReturnMinimumOf2Sequences() throws Exception Sequence sequence1 = new Sequence(34); Sequence sequnece2 = new Sequence(47); Sequence group = new FixedSequenceGroup(new Sequence[] { sequence1, sequnece2 }); - + assertThat(group.get(), is(34L)); sequence1.set(35); assertThat(group.get(), is(35L)); diff --git a/code/src/test/com/lmax/disruptor/IgnoreExceptionHandlerTest.java b/src/test/java/com/lmax/disruptor/IgnoreExceptionHandlerTest.java similarity index 100% rename from code/src/test/com/lmax/disruptor/IgnoreExceptionHandlerTest.java rename to src/test/java/com/lmax/disruptor/IgnoreExceptionHandlerTest.java diff --git a/code/src/test/com/lmax/disruptor/LifecycleAwareTest.java b/src/test/java/com/lmax/disruptor/LifecycleAwareTest.java similarity index 99% rename from code/src/test/com/lmax/disruptor/LifecycleAwareTest.java rename to src/test/java/com/lmax/disruptor/LifecycleAwareTest.java index 359a12767..c44b328f1 100644 --- a/code/src/test/com/lmax/disruptor/LifecycleAwareTest.java +++ b/src/test/java/com/lmax/disruptor/LifecycleAwareTest.java @@ -32,7 +32,7 @@ public final class LifecycleAwareTest private final PreallocatedRingBuffer ringBuffer = new PreallocatedRingBuffer(StubEvent.EVENT_FACTORY, 16); private final SequenceBarrier sequenceBarrier = ringBuffer.newBarrier(); private final LifecycleAwareEventHandler handler = new LifecycleAwareEventHandler(); - private final BatchEventProcessor batchEventProcessor = + private final BatchEventProcessor batchEventProcessor = new BatchEventProcessor(ringBuffer, sequenceBarrier, handler); @Test diff --git a/code/src/test/com/lmax/disruptor/MultiProducerOffHeapRingBufferTest.java b/src/test/java/com/lmax/disruptor/MultiProducerOffHeapRingBufferTest.java similarity index 94% rename from code/src/test/com/lmax/disruptor/MultiProducerOffHeapRingBufferTest.java rename to src/test/java/com/lmax/disruptor/MultiProducerOffHeapRingBufferTest.java index 65e49d3d8..3da364b01 100644 --- a/code/src/test/com/lmax/disruptor/MultiProducerOffHeapRingBufferTest.java +++ b/src/test/java/com/lmax/disruptor/MultiProducerOffHeapRingBufferTest.java @@ -14,23 +14,23 @@ public void shouldInsertSingleMessage() throws Exception String expected = "This is some test data"; MultiProducerOffHeapRingBuffer buffer = MultiProducerOffHeapRingBuffer.newInstance(32, 256, new BlockingWaitStrategy()); buffer.setGatingSequences(); - + byte[] expectedData = expected.getBytes("ASCII"); - + buffer.put(expectedData, 0, expectedData.length); - + assertThat(buffer.getEntrySize(0), is(expectedData.length)); - + byte[] read = new byte[expectedData.length]; buffer.getBody(0, read, 0, read.length); - + assertThat(new String(read), is(expected)); } - + @Test public void shouldInsertMesssgeThatSpansMultipleBlocks() throws Exception { - String expected = + String expected = "This is some test data, that is long than the buffer size of 256 characters so that this implementation will have " + "to split the data across multiple chunks in the same ring buffer. abcdefghijklmnopqrstuvwxyz1234567890, " + "abcdefghijklmnopqrstuvwxyz1234567890, abcdefghijklmnopqrstuvwxyz1234567890"; @@ -38,18 +38,18 @@ public void shouldInsertMesssgeThatSpansMultipleBlocks() throws Exception buffer.setGatingSequences(); int bodySize = buffer.getBodySize(); byte[] expectedData = expected.getBytes("ASCII"); - + buffer.put(expectedData, 0, expectedData.length); - + assertThat(buffer.getCursor(), is(1L)); assertThat(buffer.getEntrySize(0), is(expectedData.length)); assertThat(buffer.getPreviousSequence(0), is(-1L)); assertThat(buffer.getPreviousSequence(1), is(0L)); - + byte[] read = new byte[expectedData.length]; buffer.getBody(0, read, 0, bodySize); buffer.getBody(1, read, bodySize, expectedData.length - bodySize); - + assertThat(new String(read), is(expected)); } } diff --git a/code/src/test/com/lmax/disruptor/PhasedBackoffWaitStrategyTest.java b/src/test/java/com/lmax/disruptor/PhasedBackoffWaitStrategyTest.java similarity index 98% rename from code/src/test/com/lmax/disruptor/PhasedBackoffWaitStrategyTest.java rename to src/test/java/com/lmax/disruptor/PhasedBackoffWaitStrategyTest.java index 550c44fba..151fcb8da 100644 --- a/code/src/test/com/lmax/disruptor/PhasedBackoffWaitStrategyTest.java +++ b/src/test/java/com/lmax/disruptor/PhasedBackoffWaitStrategyTest.java @@ -13,21 +13,21 @@ public void shouldHandleImmediateSequenceChange() throws Exception assertWaitForWithDelayOf(0, PhasedBackoffWaitStrategy.withLock(1, 1, MILLISECONDS)); assertWaitForWithDelayOf(0, PhasedBackoffWaitStrategy.withSleep(1, 1, MILLISECONDS)); } - + @Test public void shouldHandleSequenceChangeWithOneMillisecondDelay() throws Exception { assertWaitForWithDelayOf(1, PhasedBackoffWaitStrategy.withLock(1, 1, MILLISECONDS)); assertWaitForWithDelayOf(1, PhasedBackoffWaitStrategy.withSleep(1, 1, MILLISECONDS)); } - + @Test public void shouldHandleSequenceChangeWithTwoMillisecondDelay() throws Exception { assertWaitForWithDelayOf(2, PhasedBackoffWaitStrategy.withLock(1, 1, MILLISECONDS)); assertWaitForWithDelayOf(2, PhasedBackoffWaitStrategy.withSleep(1, 1, MILLISECONDS)); } - + @Test public void shouldHandleSequenceChangeWithTenMillisecondDelay() throws Exception { diff --git a/code/src/test/com/lmax/disruptor/PreallocatedRingBufferTest.java b/src/test/java/com/lmax/disruptor/PreallocatedRingBufferTest.java similarity index 99% rename from code/src/test/com/lmax/disruptor/PreallocatedRingBufferTest.java rename to src/test/java/com/lmax/disruptor/PreallocatedRingBufferTest.java index 6ba055477..37b0ab814 100644 --- a/code/src/test/com/lmax/disruptor/PreallocatedRingBufferTest.java +++ b/src/test/java/com/lmax/disruptor/PreallocatedRingBufferTest.java @@ -138,20 +138,20 @@ public void shouldSetAtSpecificSequence() throws Exception assertEquals(expectedSequence, ringBuffer.getCursor()); } - + @Test public void shouldPreventWrapping() throws Exception { Sequence sequence = new Sequence(Sequencer.INITIAL_CURSOR_VALUE); final PreallocatedRingBuffer ringBuffer = new PreallocatedRingBuffer(StubEvent.EVENT_FACTORY, 4); ringBuffer.setGatingSequences(sequence); - + ringBuffer.publishEvent(StubEvent.TRANSLATOR, 0, "0"); ringBuffer.publishEvent(StubEvent.TRANSLATOR, 1, "1"); ringBuffer.publishEvent(StubEvent.TRANSLATOR, 2, "2"); ringBuffer.publishEvent(StubEvent.TRANSLATOR, 3, "3"); - - assertFalse(ringBuffer.tryPublishEvent(StubEvent.TRANSLATOR, 1, 3, "3")); + + assertFalse(ringBuffer.tryPublishEvent(StubEvent.TRANSLATOR, 1, 3, "3")); } @Test diff --git a/code/src/test/com/lmax/disruptor/SequenceBarrierTest.java b/src/test/java/com/lmax/disruptor/SequenceBarrierTest.java similarity index 100% rename from code/src/test/com/lmax/disruptor/SequenceBarrierTest.java rename to src/test/java/com/lmax/disruptor/SequenceBarrierTest.java diff --git a/code/src/test/com/lmax/disruptor/SequenceGroupTest.java b/src/test/java/com/lmax/disruptor/SequenceGroupTest.java similarity index 100% rename from code/src/test/com/lmax/disruptor/SequenceGroupTest.java rename to src/test/java/com/lmax/disruptor/SequenceGroupTest.java diff --git a/code/src/test/com/lmax/disruptor/SequenceReportingCallbackTest.java b/src/test/java/com/lmax/disruptor/SequenceReportingCallbackTest.java similarity index 100% rename from code/src/test/com/lmax/disruptor/SequenceReportingCallbackTest.java rename to src/test/java/com/lmax/disruptor/SequenceReportingCallbackTest.java diff --git a/code/src/test/com/lmax/disruptor/SequenceUpdater.java b/src/test/java/com/lmax/disruptor/SequenceUpdater.java similarity index 98% rename from code/src/test/com/lmax/disruptor/SequenceUpdater.java rename to src/test/java/com/lmax/disruptor/SequenceUpdater.java index b47ee40d7..80cc89bdc 100644 --- a/code/src/test/com/lmax/disruptor/SequenceUpdater.java +++ b/src/test/java/com/lmax/disruptor/SequenceUpdater.java @@ -9,13 +9,13 @@ class SequenceUpdater implements Runnable private final CyclicBarrier barrier = new CyclicBarrier(2); private final long sleepTime; private WaitStrategy waitStrategy; - + public SequenceUpdater(long sleepTime, WaitStrategy waitStrategy) { this.sleepTime = sleepTime; this.waitStrategy = waitStrategy; } - + @Override public void run() { @@ -34,7 +34,7 @@ public void run() e.printStackTrace(); } } - + public void waitForStartup() throws InterruptedException, BrokenBarrierException { barrier.await(); diff --git a/code/src/test/com/lmax/disruptor/SingleProducerSequencerTest.java b/src/test/java/com/lmax/disruptor/SingleProducerSequencerTest.java similarity index 99% rename from code/src/test/com/lmax/disruptor/SingleProducerSequencerTest.java rename to src/test/java/com/lmax/disruptor/SingleProducerSequencerTest.java index bfe4d5046..3e118976e 100644 --- a/code/src/test/com/lmax/disruptor/SingleProducerSequencerTest.java +++ b/src/test/java/com/lmax/disruptor/SingleProducerSequencerTest.java @@ -180,18 +180,18 @@ public void run() doneLatch.await(); assertEquals(sequencer.getCursor(), expectedFullSequence + 1L); } - + @Test(expected = InsufficientCapacityException.class) public void shouldThrowInsufficientCapacityExceptionWhenSequencerIsFull() throws Exception { for (int i = 0; i < 4; i++) - { + { long sequence = sequencer.next(); sequencer.publish(sequence); } sequencer.tryNext(); } - + @Test public void shouldCalculateRemainingCapacity() throws Exception { @@ -203,7 +203,7 @@ public void shouldCalculateRemainingCapacity() throws Exception sequencer.publish(sequencer.next()); assertThat(sequencer.remainingCapacity(), is(1L)); } - + private void fillBuffer() { for (int i = 0; i < BUFFER_SIZE; i++) diff --git a/code/src/test/com/lmax/disruptor/SleepingWaitStrategyTest.java b/src/test/java/com/lmax/disruptor/SleepingWaitStrategyTest.java similarity index 100% rename from code/src/test/com/lmax/disruptor/SleepingWaitStrategyTest.java rename to src/test/java/com/lmax/disruptor/SleepingWaitStrategyTest.java diff --git a/code/src/test/com/lmax/disruptor/WaitStrategyTestUtil.java b/src/test/java/com/lmax/disruptor/WaitStrategyTestUtil.java similarity index 99% rename from code/src/test/com/lmax/disruptor/WaitStrategyTestUtil.java rename to src/test/java/com/lmax/disruptor/WaitStrategyTestUtil.java index ed99a2031..81031d6cd 100644 --- a/code/src/test/com/lmax/disruptor/WaitStrategyTestUtil.java +++ b/src/test/java/com/lmax/disruptor/WaitStrategyTestUtil.java @@ -19,7 +19,7 @@ static void assertWaitForWithDelayOf(long sleepTimeMillis, WaitStrategy waitStra sequenceUpdater.waitForStartup(); Sequence cursor = new Sequence(0); long sequence = waitStrategy.waitFor(0, cursor, sequenceUpdater.sequence, new DummySequenceBarrier()); - + assertThat(sequence, is(0L)); } } diff --git a/code/src/test/com/lmax/disruptor/YieldingWaitStrategyTest.java b/src/test/java/com/lmax/disruptor/YieldingWaitStrategyTest.java similarity index 98% rename from code/src/test/com/lmax/disruptor/YieldingWaitStrategyTest.java rename to src/test/java/com/lmax/disruptor/YieldingWaitStrategyTest.java index 0a49aa68a..5ae321a0e 100644 --- a/code/src/test/com/lmax/disruptor/YieldingWaitStrategyTest.java +++ b/src/test/java/com/lmax/disruptor/YieldingWaitStrategyTest.java @@ -6,7 +6,7 @@ public class YieldingWaitStrategyTest { - + @Test public void shouldWaitForValue() throws Exception { diff --git a/code/src/test/com/lmax/disruptor/collections/HistogramTest.java b/src/test/java/com/lmax/disruptor/collections/HistogramTest.java similarity index 100% rename from code/src/test/com/lmax/disruptor/collections/HistogramTest.java rename to src/test/java/com/lmax/disruptor/collections/HistogramTest.java diff --git a/code/src/test/com/lmax/disruptor/dsl/DisruptorTest.java b/src/test/java/com/lmax/disruptor/dsl/DisruptorTest.java similarity index 99% rename from code/src/test/com/lmax/disruptor/dsl/DisruptorTest.java rename to src/test/java/com/lmax/disruptor/dsl/DisruptorTest.java index 70b908c95..6770bd2b7 100644 --- a/code/src/test/com/lmax/disruptor/dsl/DisruptorTest.java +++ b/src/test/java/com/lmax/disruptor/dsl/DisruptorTest.java @@ -368,7 +368,7 @@ private TestEvent publishEvent() throws InterruptedException, BrokenBarrierExcep if (ringBuffer == null) { ringBuffer = disruptor.start(); - + for (DelayedEventHandler eventHandler : delayedEventHandlers) { eventHandler.awaitStart(); diff --git a/code/src/test/com/lmax/disruptor/dsl/EventProcessorRepositoryTest.java b/src/test/java/com/lmax/disruptor/dsl/EventProcessorRepositoryTest.java similarity index 100% rename from code/src/test/com/lmax/disruptor/dsl/EventProcessorRepositoryTest.java rename to src/test/java/com/lmax/disruptor/dsl/EventProcessorRepositoryTest.java diff --git a/code/src/test/com/lmax/disruptor/dsl/stubs/DelayedEventHandler.java b/src/test/java/com/lmax/disruptor/dsl/stubs/DelayedEventHandler.java similarity index 99% rename from code/src/test/com/lmax/disruptor/dsl/stubs/DelayedEventHandler.java rename to src/test/java/com/lmax/disruptor/dsl/stubs/DelayedEventHandler.java index 1c47b5743..5a4347b35 100644 --- a/code/src/test/com/lmax/disruptor/dsl/stubs/DelayedEventHandler.java +++ b/src/test/java/com/lmax/disruptor/dsl/stubs/DelayedEventHandler.java @@ -28,12 +28,12 @@ public class DelayedEventHandler implements EventHandler, LifecycleAw private final AtomicBoolean readyToProcessEvent = new AtomicBoolean(false); private volatile boolean stopped = false; private final CyclicBarrier barrier; - + public DelayedEventHandler(CyclicBarrier barrier) { this.barrier = barrier; } - + public DelayedEventHandler() { this(new CyclicBarrier(2)); diff --git a/code/src/test/com/lmax/disruptor/dsl/stubs/EventHandlerStub.java b/src/test/java/com/lmax/disruptor/dsl/stubs/EventHandlerStub.java similarity index 100% rename from code/src/test/com/lmax/disruptor/dsl/stubs/EventHandlerStub.java rename to src/test/java/com/lmax/disruptor/dsl/stubs/EventHandlerStub.java diff --git a/code/src/test/com/lmax/disruptor/dsl/stubs/EvilEqualsEventHandler.java b/src/test/java/com/lmax/disruptor/dsl/stubs/EvilEqualsEventHandler.java similarity index 100% rename from code/src/test/com/lmax/disruptor/dsl/stubs/EvilEqualsEventHandler.java rename to src/test/java/com/lmax/disruptor/dsl/stubs/EvilEqualsEventHandler.java diff --git a/code/src/test/com/lmax/disruptor/dsl/stubs/ExceptionThrowingEventHandler.java b/src/test/java/com/lmax/disruptor/dsl/stubs/ExceptionThrowingEventHandler.java similarity index 100% rename from code/src/test/com/lmax/disruptor/dsl/stubs/ExceptionThrowingEventHandler.java rename to src/test/java/com/lmax/disruptor/dsl/stubs/ExceptionThrowingEventHandler.java diff --git a/code/src/test/com/lmax/disruptor/dsl/stubs/SleepingEventHandler.java b/src/test/java/com/lmax/disruptor/dsl/stubs/SleepingEventHandler.java similarity index 100% rename from code/src/test/com/lmax/disruptor/dsl/stubs/SleepingEventHandler.java rename to src/test/java/com/lmax/disruptor/dsl/stubs/SleepingEventHandler.java diff --git a/code/src/test/com/lmax/disruptor/dsl/stubs/StubExceptionHandler.java b/src/test/java/com/lmax/disruptor/dsl/stubs/StubExceptionHandler.java similarity index 100% rename from code/src/test/com/lmax/disruptor/dsl/stubs/StubExceptionHandler.java rename to src/test/java/com/lmax/disruptor/dsl/stubs/StubExceptionHandler.java diff --git a/code/src/test/com/lmax/disruptor/dsl/stubs/StubExecutor.java b/src/test/java/com/lmax/disruptor/dsl/stubs/StubExecutor.java similarity index 100% rename from code/src/test/com/lmax/disruptor/dsl/stubs/StubExecutor.java rename to src/test/java/com/lmax/disruptor/dsl/stubs/StubExecutor.java diff --git a/code/src/test/com/lmax/disruptor/dsl/stubs/StubPublisher.java b/src/test/java/com/lmax/disruptor/dsl/stubs/StubPublisher.java similarity index 100% rename from code/src/test/com/lmax/disruptor/dsl/stubs/StubPublisher.java rename to src/test/java/com/lmax/disruptor/dsl/stubs/StubPublisher.java diff --git a/code/src/test/com/lmax/disruptor/support/Actions.java b/src/test/java/com/lmax/disruptor/support/Actions.java similarity index 100% rename from code/src/test/com/lmax/disruptor/support/Actions.java rename to src/test/java/com/lmax/disruptor/support/Actions.java diff --git a/code/src/test/com/lmax/disruptor/support/DaemonThreadFactory.java b/src/test/java/com/lmax/disruptor/support/DaemonThreadFactory.java similarity index 100% rename from code/src/test/com/lmax/disruptor/support/DaemonThreadFactory.java rename to src/test/java/com/lmax/disruptor/support/DaemonThreadFactory.java diff --git a/code/src/test/com/lmax/disruptor/support/LongEvent.java b/src/test/java/com/lmax/disruptor/support/LongEvent.java similarity index 96% rename from code/src/test/com/lmax/disruptor/support/LongEvent.java rename to src/test/java/com/lmax/disruptor/support/LongEvent.java index b0e849287..a5f8a250f 100644 --- a/code/src/test/com/lmax/disruptor/support/LongEvent.java +++ b/src/test/java/com/lmax/disruptor/support/LongEvent.java @@ -5,17 +5,17 @@ public class LongEvent { private long value; - + public void set(long value) { this.value = value; } - + public long get() { return value; } - + public static final EventFactory FACTORY = new EventFactory() { @Override diff --git a/code/src/test/com/lmax/disruptor/support/StubEvent.java b/src/test/java/com/lmax/disruptor/support/StubEvent.java similarity index 99% rename from code/src/test/com/lmax/disruptor/support/StubEvent.java rename to src/test/java/com/lmax/disruptor/support/StubEvent.java index e4c5bfe37..e22edc1dd 100644 --- a/code/src/test/com/lmax/disruptor/support/StubEvent.java +++ b/src/test/java/com/lmax/disruptor/support/StubEvent.java @@ -30,7 +30,7 @@ public void translateTo(StubEvent event, long sequence, Integer arg0, String arg event.setValue(arg0); event.setTestString(arg1); } - }; + }; public StubEvent(int i) { diff --git a/code/src/test/com/lmax/disruptor/support/TestEvent.java b/src/test/java/com/lmax/disruptor/support/TestEvent.java similarity index 100% rename from code/src/test/com/lmax/disruptor/support/TestEvent.java rename to src/test/java/com/lmax/disruptor/support/TestEvent.java diff --git a/code/src/test/com/lmax/disruptor/support/TestWaiter.java b/src/test/java/com/lmax/disruptor/support/TestWaiter.java similarity index 100% rename from code/src/test/com/lmax/disruptor/support/TestWaiter.java rename to src/test/java/com/lmax/disruptor/support/TestWaiter.java diff --git a/code/src/test/com/lmax/disruptor/util/UtilTest.java b/src/test/java/com/lmax/disruptor/util/UtilTest.java similarity index 99% rename from code/src/test/com/lmax/disruptor/util/UtilTest.java rename to src/test/java/com/lmax/disruptor/util/UtilTest.java index dde7a3d8a..fbf1d6925 100644 --- a/code/src/test/com/lmax/disruptor/util/UtilTest.java +++ b/src/test/java/com/lmax/disruptor/util/UtilTest.java @@ -87,7 +87,7 @@ public void shouldReturnLongMaxWhenNoEventProcessors() Assert.assertEquals(Long.MAX_VALUE, Util.getMinimumSequence(sequences)); } - + @Test public void shouldGetByteBufferAddress() throws Exception {