QUEUE-16 renamed chronicle to ChronicleQueue to be consistent with th…

…e naming we use for ChronicleMap

chronicle-queue/src/main/java/net/openhft/chronicle/queue/Chronicle.java → chronicle-queue/src/main/java/net/openhft/chronicle/queue/ChronicleQueue.java

@@ -22,11 +22,11 @@
  * C-type byte arrays that you can access any random index "directly" using pointers. File portions can be used as
  * ByteBuffers if the portion is mapped into memory.
  *
- * <p>{@link Chronicle} (now in the specific sense) is the main interface for management and can
+ * <p>{@link ChronicleQueue} (now in the specific sense) is the main interface for management and can
  * be seen as the "Collection class" of the <em>Chronicle</em> environment. You will reserve a portion of memory and
- * then put/fetch/update records using the {@link Chronicle} interface.</p>
+ * then put/fetch/update records using the {@link ChronicleQueue} interface.</p>
  *
- * <p>{@link Excerpt} is the main data container in a {@link Chronicle},
+ * <p>{@link Excerpt} is the main data container in a {@link ChronicleQueue},
  * each Chronicle is composed of Excerpts. Putting data to a chronicle means starting a new Excerpt, writing data into
  * it and finishing the Excerpt at the end.</p>
  *
@@ -36,7 +36,7 @@
  *
  * @author peter.lawrey
  */
-public interface Chronicle extends Closeable {
+public interface ChronicleQueue extends Closeable {
     /**
      * @return A descriptive name for this chronicle which can be used for logging.
      */

chronicle-queue/src/main/java/net/openhft/chronicle/queue/ChronicleQueueBuilder.java

@@ -1,6 +1,6 @@
 package net.openhft.chronicle.queue;
 
-import net.openhft.chronicle.queue.impl.SingleChronicle;
+import net.openhft.chronicle.queue.impl.SingleChronicleQueue;
 
 import java.io.IOException;
 
@@ -20,7 +20,7 @@ public ChronicleQueueBuilder blockSize(int blockSize) {
         return this;
     }
 
-    public Chronicle build() throws IOException {
-        return new SingleChronicle(name, blockSize);
+    public ChronicleQueue build() throws IOException {
+        return new SingleChronicleQueue(name, blockSize);
     }
 }

chronicle-queue/src/main/java/net/openhft/chronicle/queue/Excerpt.java

@@ -22,7 +22,7 @@
 import net.openhft.lang.model.constraints.NotNull;
 
 /**
- * The main data container of a {@link Chronicle}, an extended version of {@link ExcerptTailer} which also facilitates
+ * The main data container of a {@link ChronicleQueue}, an extended version of {@link ExcerptTailer} which also facilitates
  * random access.
  *
  * @author peter.lawrey

chronicle-queue/src/main/java/net/openhft/chronicle/queue/ExcerptAppender.java

@@ -24,7 +24,7 @@
 import java.util.function.Consumer;
 
 /**
- * The component that facilitates sequentially writing data to a {@link Chronicle}.
+ * The component that facilitates sequentially writing data to a {@link ChronicleQueue}.
  *
  * @author peter.lawrey
  */

chronicle-queue/src/main/java/net/openhft/chronicle/queue/ExcerptCommon.java

@@ -25,5 +25,5 @@ public interface ExcerptCommon {
     /**
      * @return the chronicle associated with this Excerpt
      */
-    Chronicle chronicle();
+    ChronicleQueue chronicle();
 }

chronicle-queue/src/main/java/net/openhft/chronicle/queue/ExcerptTailer.java

@@ -24,7 +24,7 @@
 import java.util.function.Function;
 
 /**
- * The component that facilitates sequentially reading data from a {@link Chronicle}.
+ * The component that facilitates sequentially reading data from a {@link ChronicleQueue}.
  *
  * @author peter.lawrey
  */

chronicle-queue/src/main/java/net/openhft/chronicle/queue/impl/DirectChronicle.java → chronicle-queue/src/main/java/net/openhft/chronicle/queue/impl/DirectChronicleQueue.java

@@ -1,6 +1,6 @@
 package net.openhft.chronicle.queue.impl;
 
-import net.openhft.chronicle.queue.Chronicle;
+import net.openhft.chronicle.queue.ChronicleQueue;
 import net.openhft.lang.io.Bytes;
 import net.openhft.lang.io.MultiStoreBytes;
 
@@ -9,7 +9,7 @@
 /**
  * Created by peter.lawrey on 03/02/15.
  */
-public interface DirectChronicle extends Chronicle {
+public interface DirectChronicleQueue extends ChronicleQueue {
     void appendDocument(Bytes buffer);
 
     boolean readDocument(AtomicLong offset, Bytes buffer);

chronicle-queue/src/main/java/net/openhft/chronicle/queue/impl/Header.java

@@ -33,7 +33,7 @@ public Header init(Compression compression) {
         uuid = UUID.randomUUID();
         created = ZonedDateTime.now();
         user = System.getProperty("user.name");
-        host = SingleChronicle.getHostName();
+        host = SingleChronicleQueue.getHostName();
         this.compression = compression.name();
         writeByte.setOrderedValue(PADDED_SIZE);
         return this;

chronicle-queue/src/main/java/net/openhft/chronicle/queue/impl/SingleAppender.java

@@ -1,6 +1,6 @@
 package net.openhft.chronicle.queue.impl;
 
-import net.openhft.chronicle.queue.Chronicle;
+import net.openhft.chronicle.queue.ChronicleQueue;
 import net.openhft.chronicle.queue.ExcerptAppender;
 import net.openhft.chronicle.wire.BinaryWire;
 import net.openhft.chronicle.wire.Wire;
@@ -15,13 +15,13 @@
  */
 public class SingleAppender implements ExcerptAppender {
 
-    private final DirectChronicle chronicle;
+    private final DirectChronicleQueue chronicle;
     private final ChronicleWireOut wireOut;
     private final Bytes buffer = DirectStore.allocateLazy(128 * 1024).bytes();
     private final Wire wire = new BinaryWire(buffer);
 
-    public SingleAppender(Chronicle chronicle) {
-        this.chronicle = (DirectChronicle) chronicle;
+    public SingleAppender(ChronicleQueue chronicle) {
+        this.chronicle = (DirectChronicleQueue) chronicle;
         wireOut = new ChronicleWireOut(null);
     }
 
@@ -54,7 +54,7 @@ public long lastWrittenIndex() {
     }
 
     @Override
-    public Chronicle chronicle() {
+    public ChronicleQueue chronicle() {
         return chronicle;
     }
 }

chronicle-queue/src/main/java/net/openhft/chronicle/queue/impl/SingleChronicle.java → chronicle-queue/src/main/java/net/openhft/chronicle/queue/impl/SingleChronicleQueue.java

@@ -27,7 +27,7 @@
  *
  * Created by peter on 30/01/15.
  */
-public class SingleChronicle implements Chronicle, DirectChronicle {
+public class SingleChronicleQueue implements ChronicleQueue, DirectChronicleQueue {
     static final long MAGIC_OFFSET = 0L;
     static final long HEADER_OFFSET = 8L;
     static final long UNINITIALISED = 0L;
@@ -46,7 +46,7 @@ public class SingleChronicle implements Chronicle, DirectChronicle {
     private final Bytes bytes;
     private long firstBytes = -1;
 
-    public SingleChronicle(String filename, long blockSize) throws IOException {
+    public SingleChronicleQueue(String filename, long blockSize) throws IOException {
         file = new MappedFile(filename, blockSize);
         headerMemory = file.acquire(0);
         bytes = headerMemory.bytes();

chronicle-queue/src/main/java/net/openhft/chronicle/queue/impl/SingleTailer.java

@@ -1,6 +1,6 @@
 package net.openhft.chronicle.queue.impl;
 
-import net.openhft.chronicle.queue.Chronicle;
+import net.openhft.chronicle.queue.ChronicleQueue;
 import net.openhft.chronicle.queue.ExcerptTailer;
 import net.openhft.chronicle.wire.BinaryWire;
 import net.openhft.chronicle.wire.Wire;
@@ -13,13 +13,13 @@
  * Created by peter.lawrey on 30/01/15.
  */
 public class SingleTailer implements ExcerptTailer {
-    private final DirectChronicle chronicle;
+    private final DirectChronicleQueue chronicle;
     long index;
     private final MultiStoreBytes bytes = new MultiStoreBytes();
     private final Wire wire = new BinaryWire(bytes);
 
-    public SingleTailer(Chronicle chronicle) {
-        this.chronicle = (DirectChronicle) chronicle;
+    public SingleTailer(ChronicleQueue chronicle) {
+        this.chronicle = (DirectChronicleQueue) chronicle;
         toStart();
     }
 
@@ -53,7 +53,7 @@ public ExcerptTailer toEnd() {
     }
 
     @Override
-    public Chronicle chronicle() {
+    public ChronicleQueue chronicle() {
         return chronicle;
     }
 }

chronicle-queue/src/main/java/net/openhft/chronicle/queue/impl/ringbuffer/BytesQueue.java

@@ -1,12 +1,10 @@
 package net.openhft.chronicle.queue.impl.ringbuffer;
 
+import net.openhft.lang.Jvm;
 import net.openhft.lang.io.Bytes;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.lang.reflect.Field;
-import java.util.concurrent.atomic.AtomicLong;
-
 /**
  * Multi writer single Reader, zero GC, ring buffer
  *
@@ -177,7 +175,7 @@ private class Header {
         private final long writeUpToOffset;
         private final long readLocationOffset;
         private final Bytes buffer;
-        private final boolean vmSupportsLongCAS;
+
 
         /**
          * @param buffer the bytes for the header
@@ -201,17 +199,12 @@ private Header(@NotNull Bytes buffer) throws Exception {
 
             this.buffer = buffer.bytes(start, buffer.position());
 
-
-            Field vm_supports_long_cas = AtomicLong.class.getDeclaredField("VM_SUPPORTS_LONG_CAS");
-            vm_supports_long_cas.setAccessible(true);
-            vmSupportsLongCAS = (Boolean) vm_supports_long_cas.get(null);
-
-
         }
 
         private boolean compareAndSetWriteLocation(long expectedValue, long newValue) {
 
-            //      return buffer.compareAndSwapLong(writeLocationOffset, expectedValue, newValue);
+            if (Jvm.VMSupportsCS8())
+                return buffer.compareAndSwapLong(writeLocationOffset, expectedValue, newValue);
             synchronized (this) {
                 if (expectedValue == getWriteLocation()) {
                     setWriteLocation(newValue);

chronicle-queue/src/test/java/net/openhft/chronicle/queue/ChronicleTest.java → chronicle-queue/src/test/java/net/openhft/chronicle/queue/ChronicleQueueTest.java

@@ -14,7 +14,7 @@
 
 import static org.junit.Assert.assertTrue;
 
-public class ChronicleTest {
+public class ChronicleQueueTest {
 
     public static final int RUNS = 1000000;
     public static final String TMP = new File("/tmp").isDirectory() ? "/tmp" : System.getProperty("java.io.tmpdir");
@@ -28,7 +28,7 @@ public void testCreateAppender() throws Exception {
                 for (int j = 0; j < 4; j++) {
                     String name = TMP + "/single" + start + "-" + j + ".q";
                     new File(name).deleteOnExit();
-                    Chronicle chronicle = new ChronicleQueueBuilder(name).build();
+                    ChronicleQueue chronicle = new ChronicleQueueBuilder(name).build();
 
                     futureList.add(ForkJoinPool.commonPool().submit(() -> {
                         writeSome(chronicle);
@@ -43,7 +43,7 @@ public void testCreateAppender() throws Exception {
                 for (int j = 0; j < 4; j++) {
                     String name = TMP + "/single" + start + "-" + j + ".q";
                     new File(name).deleteOnExit();
-                    Chronicle chronicle = new ChronicleQueueBuilder(name).build();
+                    ChronicleQueue chronicle = new ChronicleQueueBuilder(name).build();
 
                     futureList.add(ForkJoinPool.commonPool().submit(() -> {
                         readSome(chronicle);
@@ -59,7 +59,7 @@ public void testCreateAppender() throws Exception {
         }
     }
 
-    private void readSome(Chronicle chronicle) throws IOException {
+    private void readSome(ChronicleQueue chronicle) throws IOException {
         ExcerptTailer tailer = chronicle.createTailer();
         StringBuilder sb = new StringBuilder();
         // TODO check this is still needed in future versions.
@@ -69,7 +69,7 @@ private void readSome(Chronicle chronicle) throws IOException {
         }
     }
 
-    private void writeSome(Chronicle chronicle) throws IOException {
+    private void writeSome(ChronicleQueue chronicle) throws IOException {
         ExcerptAppender appender = chronicle.createAppender();
         for (int i = 0; i < RUNS; i++) {
             appender.writeDocument(wire -> wire.write(TestKey.test).text("Hello World23456789012345678901234567890"));

chronicle-queue/src/test/java/net/openhft/chronicle/queue/DirectChronicleStringTest.java → chronicle-queue/src/test/java/net/openhft/chronicle/queue/DirectChronicleQueueStringTest.java

@@ -1,6 +1,6 @@
 package net.openhft.chronicle.queue;
 
-import net.openhft.chronicle.queue.impl.DirectChronicle;
+import net.openhft.chronicle.queue.impl.DirectChronicleQueue;
 import net.openhft.lang.io.Bytes;
 import net.openhft.lang.io.DirectStore;
 import org.junit.Test;
@@ -29,7 +29,7 @@
 Threads: 10 - Write rate 143.6 M/s - Read rate 268.7 M/s
 Threads: 11 - Write rate 161.7 M/s - Read rate 260.8 M/s
  */
-public class DirectChronicleStringTest {
+public class DirectChronicleQueueStringTest {
 
     public static final int RUNS = 1000000;
     public static final String EXPECTED_STRING = "Hello World23456789012345678901234567890";
@@ -45,7 +45,7 @@ public void testCreateAppender() throws Exception {
                 for (int j = 0; j < t; j++) {
                     String name = TMP + "/single" + start + "-" + j + ".q";
                     new File(name).deleteOnExit();
-                    DirectChronicle chronicle = (DirectChronicle) new ChronicleQueueBuilder(name)
+                    DirectChronicleQueue chronicle = (DirectChronicleQueue) new ChronicleQueueBuilder(name)
                             .build();
 
                     futureList.add(ForkJoinPool.commonPool().submit(() -> {
@@ -61,7 +61,7 @@ public void testCreateAppender() throws Exception {
                 for (int j = 0; j < t; j++) {
                     String name = TMP + "/single" + start + "-" + j + ".q";
                     new File(name).deleteOnExit();
-                    DirectChronicle chronicle = (DirectChronicle) new ChronicleQueueBuilder(name)
+                    DirectChronicleQueue chronicle = (DirectChronicleQueue) new ChronicleQueueBuilder(name)
                             .build();
 
                     futureList.add(ForkJoinPool.commonPool().submit(() -> {
@@ -78,7 +78,7 @@ public void testCreateAppender() throws Exception {
         }
     }
 
-    private void readSome(DirectChronicle chronicle) throws IOException {
+    private void readSome(DirectChronicleQueue chronicle) throws IOException {
         final Bytes toRead = DirectStore.allocate(EXPECTED_BYTES.length).bytes();
         AtomicLong offset = new AtomicLong(chronicle.firstBytes());
         for (int i = 0; i < RUNS; i++) {
@@ -87,7 +87,7 @@ private void readSome(DirectChronicle chronicle) throws IOException {
         }
     }
 
-    private void writeSome(DirectChronicle chronicle) throws IOException {
+    private void writeSome(DirectChronicleQueue chronicle) throws IOException {
         final Bytes toWrite = DirectStore.allocate(EXPECTED_BYTES.length).bytes();
         toWrite.write(EXPECTED_BYTES);
         for (int i = 0; i < RUNS; i++) {