Optimisation for calculating the byte sum

OpenHFT · Jan 22, 2016 · 41cb5c7 · 41cb5c7
1 parent 8f26591
commit 41cb5c7
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 24 deletions.
diff --git a/chronicle-queue/src/main/java/net/openhft/chronicle/queue/impl/Excerpts.java b/chronicle-queue/src/main/java/net/openhft/chronicle/queue/impl/Excerpts.java
@@ -16,7 +16,10 @@
 
 package net.openhft.chronicle.queue.impl;
 
-import net.openhft.chronicle.bytes.*;
+import net.openhft.chronicle.bytes.Bytes;
+import net.openhft.chronicle.bytes.MappedBytes;
+import net.openhft.chronicle.bytes.ReadBytesMarshallable;
+import net.openhft.chronicle.bytes.WriteBytesMarshallable;
 import net.openhft.chronicle.core.Jvm;
 import net.openhft.chronicle.core.OS;
 import net.openhft.chronicle.core.annotation.ForceInline;
@@ -212,14 +215,9 @@ public BufferAppender(@NotNull final EventLoop eventLoop,
                 }
 
             };
-            Bytes bytes2 = NativeBytes.nativeBytes(128).unchecked(true);
+
             eventLoop.addHandler(handler);
-            /*eventLoop.addHandler(() -> {
-                bytes2.clear();
-                ringBuffer.read(bytes2);
-                return true;
-            });
-                  */
+
             eventLoop.addHandler(new EventHandler() {
                 @Override
                 public boolean action() throws InvalidEventHandlerException {

diff --git a/...icle-queue/src/main/java/net/openhft/chronicle/queue/impl/ringbuffer/BytesRingBuffer.java b/...icle-queue/src/main/java/net/openhft/chronicle/queue/impl/ringbuffer/BytesRingBuffer.java
@@ -495,6 +495,8 @@ private long read(@NotNull Bytes bytes, long offset, long len) {
             //other words is that start of the data at the end of the ring and the remaining
             //data at the start of the ring.
             if (endOffSet >= offset) {
+                if (len > 1000)
+                    System.out.println("len:" + len);
                 bytes.write(byteStore, offset, len);
                 return endOffSet;
             }

diff --git a/...src/test/java/net/openhft/chronicle/queue/ChronicleQueueLatencyDistributionWithBytes.java b/...src/test/java/net/openhft/chronicle/queue/ChronicleQueueLatencyDistributionWithBytes.java
@@ -18,7 +18,6 @@
 
 package net.openhft.chronicle.queue;
 
-import net.openhft.affinity.Affinity;
 import net.openhft.affinity.AffinityLock;
 import net.openhft.chronicle.bytes.Bytes;
 import net.openhft.chronicle.bytes.NativeBytes;
@@ -66,7 +65,7 @@ public void test() throws IOException, InterruptedException {
         Histogram histogram = new Histogram();
         Histogram writeHistogram = new Histogram();
 
-        String path = "deleteme" + System.nanoTime() + ".q"; /*getTmpDir()*/
+        String path = "deleteme" + System.nanoTime() + ".q";
 //        String path = getTmpDir() + "/deleteme.q";
 
         new File(path).deleteOnExit();
@@ -88,14 +87,9 @@ public void test() throws IOException, InterruptedException {
         ExcerptTailer tailer = rqueue.createTailer();
 
         Thread tailerThread = new Thread(() -> {
-
+            AffinityLock rlock = AffinityLock.acquireLock();
             Bytes bytes = NativeBytes.nativeBytes(BYTES_LENGTH).unchecked(true);
-            //   Bytes bytes = Bytes.allocateDirect(BYTES_LENGTH).unchecked(true);
-            AffinityLock lock = null;
             try {
-                if (Boolean.getBoolean("enableTailerAffinity")) {
-                    lock = Affinity.acquireLock();
-                }
 
                 while (true) {
                     try {
@@ -111,18 +105,15 @@ public void test() throws IOException, InterruptedException {
                     }
                 }
             } finally {
-                if (lock != null) {
-                    lock.release();
+                if (rlock != null) {
+                    rlock.release();
                 }
             }
         }, "tailer thread");
 
         Thread appenderThread = new Thread(() -> {
-            AffinityLock lock = null;
+            AffinityLock wlock = AffinityLock.acquireLock();
             try {
-                if (Boolean.getBoolean("enableAppenderAffinity")) {
-                    lock = Affinity.acquireLock();
-                }
                 Bytes bytes = Bytes.allocateDirect(BYTES_LENGTH).unchecked(true);
 
                 long next = System.nanoTime() + INTERVAL_US * 1000;
@@ -143,8 +134,8 @@ public void test() throws IOException, InterruptedException {
             } catch (IOException e) {
                 e.printStackTrace();
             } finally {
-                if (lock != null) {
-                    lock.release();
+                if (wlock != null) {
+                    wlock.release();
                 }
             }
         }, "appender thread");