QUEUE-14 improved write buffer

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

@@ -52,11 +52,7 @@ public boolean offer(@NotNull Bytes bytes) throws InterruptedException {
 
                 long nextWriteLocation = queue.nextlocation(writeLocation, 8);
 
-                for (; bytes.remaining() > 0; nextWriteLocation =
-                        queue.nextWrite(nextWriteLocation)) {
-                    assert nextWriteLocation != -1;
-                    queue.write(nextWriteLocation, bytes.readByte());
-                }
+                nextWriteLocation = queue.write(bytes, nextWriteLocation);
 
                 writeLocation = nextWriteLocation;
                 return true;
@@ -76,6 +72,7 @@ public boolean offer(@NotNull Bytes bytes) throws InterruptedException {
         }
     }
 
+
     /**
      * Retrieves and removes the head of this queue, or returns {@code null} if this queue is
      * empty.
@@ -211,14 +208,15 @@ private static byte long0(long x) {
     }
 
 
-    private class VanillaByteQueue {
+    private static class VanillaByteQueue {
 
 
         final AtomicLong readLocation = new AtomicLong();
         final AtomicLong writeLocation = new AtomicLong();
 
         final AtomicLong readupto = new AtomicLong();
         final AtomicLong writeupto = new AtomicLong();
+
         private boolean isBytesBigEndian;
         private final Bytes bytes;
 
@@ -229,6 +227,24 @@ public VanillaByteQueue(int size) {
             isBytesBigEndian = isBytesBigEndian();
         }
 
+        private long write(Bytes bytes, long offset) {
+
+           long endOffSet = nextlocation(offset, bytes.remaining());
+
+            if (endOffSet > offset) {
+                this.bytes.write(offset, bytes);
+                return endOffSet;
+            }
+
+
+            for (; bytes.remaining() > 0; offset =
+                    nextWrite(offset)) {
+                assert offset != -1;
+                write(offset, bytes.readByte());
+            }
+
+            return offset;
+        }
 
         boolean isBytesBigEndian() {
             try {
@@ -360,7 +376,7 @@ long nextlocation(long location) {
             return nextlocation(location, 1);
         }
 
-        long nextlocation(long location, int increment) {
+        long nextlocation(long location, long increment) {
 
             long result = location + increment;
             if (result < capacity())