From 82647427794ff7e929bd2377d2d9afcd362fa2ba Mon Sep 17 00:00:00 2001
From: David Renshaw <dwrenshaw@gmail.com>
Date: Mon, 29 Sep 2014 14:34:17 -0400
Subject: [PATCH] enable packed encode in benchmarks. still some bugs

---
 .../org/capnproto/benchmark/Compression.java  | 15 +++++
 .../java/org/capnproto/benchmark/Packed.java  | 15 +++++
 .../org/capnproto/benchmark/TestCase.java     | 62 +++++++++++--------
 .../org/capnproto/benchmark/Uncompressed.java | 16 +++++
 .../capnproto/BufferedInputStreamWrapper.java |  1 -
 .../capnproto/ByteChannelMessageReader.java   |  1 -
 6 files changed, 81 insertions(+), 29 deletions(-)
 create mode 100644 benchmark/src/main/java/org/capnproto/benchmark/Compression.java
 create mode 100644 benchmark/src/main/java/org/capnproto/benchmark/Packed.java
 create mode 100644 benchmark/src/main/java/org/capnproto/benchmark/Uncompressed.java

diff --git a/benchmark/src/main/java/org/capnproto/benchmark/Compression.java b/benchmark/src/main/java/org/capnproto/benchmark/Compression.java
new file mode 100644
index 0000000..68983e7
--- /dev/null
+++ b/benchmark/src/main/java/org/capnproto/benchmark/Compression.java
@@ -0,0 +1,15 @@
+package org.capnproto.benchmark;
+
+import java.io.IOException;
+
+public interface Compression {
+    public void writeBuffered(org.capnproto.BufferedOutputStream writer,
+                              org.capnproto.MessageBuilder message) throws IOException;
+
+    public org.capnproto.MessageReader newBufferedReader(
+        org.capnproto.BufferedInputStream inputStream) throws IOException;
+
+    public final Compression PACKED = new Packed();
+    public final Compression UNCOMPRESSED = new Uncompressed();
+}
+
diff --git a/benchmark/src/main/java/org/capnproto/benchmark/Packed.java b/benchmark/src/main/java/org/capnproto/benchmark/Packed.java
new file mode 100644
index 0000000..2baab86
--- /dev/null
+++ b/benchmark/src/main/java/org/capnproto/benchmark/Packed.java
@@ -0,0 +1,15 @@
+package org.capnproto.benchmark;
+
+import java.io.IOException;
+
+public final class Packed implements Compression {
+    public void writeBuffered(org.capnproto.BufferedOutputStream writer,
+                              org.capnproto.MessageBuilder message) throws IOException {
+        org.capnproto.SerializePacked.writeMessage(writer, message);
+    }
+
+    public org.capnproto.MessageReader newBufferedReader(
+        org.capnproto.BufferedInputStream inputStream) throws IOException {
+        return org.capnproto.SerializePacked.newReader(inputStream);
+    }
+}
diff --git a/benchmark/src/main/java/org/capnproto/benchmark/TestCase.java b/benchmark/src/main/java/org/capnproto/benchmark/TestCase.java
index 98c656c..6ef36ad 100644
--- a/benchmark/src/main/java/org/capnproto/benchmark/TestCase.java
+++ b/benchmark/src/main/java/org/capnproto/benchmark/TestCase.java
@@ -23,7 +23,7 @@ public abstract class TestCase<RequestFactory extends StructFactory<RequestBuild
 
 
     public void passByObject(RequestFactory requestFactory, ResponseFactory responseFactory,
-                             long iters) {
+                             Compression compression, long iters) {
 
         Common.FastRand rng = new Common.FastRand();
 
@@ -43,7 +43,7 @@ public abstract class TestCase<RequestFactory extends StructFactory<RequestBuild
     static final int SCRATCH_SIZE = 128 * 1024;
 
     public void passByBytes(RequestFactory requestFactory, ResponseFactory responseFactory,
-                            long iters) throws IOException {
+                            Compression compression, long iters) throws IOException {
 
         ByteBuffer requestBytes = ByteBuffer.allocate(SCRATCH_SIZE * 8);
         ByteBuffer responseBytes = ByteBuffer.allocate(SCRATCH_SIZE * 8);
@@ -58,23 +58,23 @@ public abstract class TestCase<RequestFactory extends StructFactory<RequestBuild
 
             {
                 org.capnproto.ArrayOutputStream writer = new org.capnproto.ArrayOutputStream(requestBytes);
-                org.capnproto.Serialize.writeMessage(writer, requestMessage);
+                compression.writeBuffered(writer, requestMessage);
             }
 
             {
                 org.capnproto.MessageReader messageReader =
-                    org.capnproto.ByteChannelMessageReader.create(new org.capnproto.ArrayInputStream(requestBytes));
+                    compression.newBufferedReader(new org.capnproto.ArrayInputStream(requestBytes));
                 this.handleRequest(messageReader.getRoot(requestFactory), response);
             }
 
             {
                 org.capnproto.ArrayOutputStream writer = new org.capnproto.ArrayOutputStream(responseBytes);
-                org.capnproto.Serialize.writeMessage(writer, responseMessage);
+                compression.writeBuffered(writer, responseMessage);
             }
 
             {
                 org.capnproto.MessageReader messageReader =
-                    org.capnproto.ByteChannelMessageReader.create(new org.capnproto.ArrayInputStream(responseBytes));
+                    compression.newBufferedReader(new org.capnproto.ArrayInputStream(responseBytes));
                 if (!this.checkResponse(messageReader.getRoot(responseFactory), expected)) {
                     throw new Error("incorrect response");
                 }
@@ -83,38 +83,39 @@ public abstract class TestCase<RequestFactory extends StructFactory<RequestBuild
     }
 
     public void syncServer(RequestFactory requestFactory, ResponseFactory responseFactory,
-                           long iters) throws IOException {
+                           Compression compression, long iters) throws IOException {
+        org.capnproto.BufferedOutputStreamWrapper outBuffered =
+            new org.capnproto.BufferedOutputStreamWrapper((new FileOutputStream(FileDescriptor.out)).getChannel());
+        org.capnproto.BufferedInputStreamWrapper inBuffered =
+            new org.capnproto.BufferedInputStreamWrapper((new FileInputStream(FileDescriptor.in)).getChannel());
+
         for (int ii = 0; ii < iters; ++ii) {
             MessageBuilder responseMessage = new MessageBuilder();
             {
                 ResponseBuilder response = responseMessage.initRoot(responseFactory);
-
-                MessageReader messageReader = org.capnproto.ByteChannelMessageReader.create(
-                    (new FileInputStream(FileDescriptor.in)).getChannel());
-
+                MessageReader messageReader = compression.newBufferedReader(inBuffered);
                 RequestReader request = messageReader.getRoot(requestFactory);
                 this.handleRequest(request, response);
             }
-
-            org.capnproto.Serialize.writeMessage((new FileOutputStream(FileDescriptor.out)).getChannel(),
-                                                 responseMessage);
+            compression.writeBuffered(outBuffered, responseMessage);
         }
     }
 
     public void syncClient(RequestFactory requestFactory, ResponseFactory responseFactory,
-                           long iters) throws IOException {
+                           Compression compression, long iters) throws IOException {
         Common.FastRand rng = new Common.FastRand();
+        org.capnproto.BufferedOutputStreamWrapper outBuffered =
+            new org.capnproto.BufferedOutputStreamWrapper((new FileOutputStream(FileDescriptor.out)).getChannel());
+        org.capnproto.BufferedInputStreamWrapper inBuffered =
+            new org.capnproto.BufferedInputStreamWrapper((new FileInputStream(FileDescriptor.in)).getChannel());
+
         for (int ii = 0; ii < iters; ++ii) {
             MessageBuilder requestMessage = new MessageBuilder();
             RequestBuilder request = requestMessage.initRoot(requestFactory);
             Expectation expected = this.setupRequest(rng, request);
 
-            org.capnproto.Serialize.writeMessage((new FileOutputStream(FileDescriptor.out)).getChannel(),
-                                                 requestMessage);
-
-            MessageReader messageReader = org.capnproto.ByteChannelMessageReader.create(
-                (new FileInputStream(FileDescriptor.in)).getChannel());
-
+            compression.writeBuffered(outBuffered, requestMessage);
+            MessageReader messageReader = compression.newBufferedReader(inBuffered);
             ResponseReader response = messageReader.getRoot(responseFactory);
             if (!this.checkResponse(response, expected)) {
                 throw new Error("incorrect response");
@@ -131,20 +132,27 @@ public abstract class TestCase<RequestFactory extends StructFactory<RequestBuild
 
         String mode = args[0];
         String reuse = args[1];
-        String compression = args[2];
+        Compression compression = null;
+        if (args[2].equals("packed")) {
+            compression = Compression.PACKED;
+        } else if (args[2].equals("none")) {
+            compression = Compression.UNCOMPRESSED;
+        } else {
+            throw new Error("unrecognized compression: " + args[2]);
+        }
         long iters = Long.parseLong(args[3]);
 
         try {
             if (mode.equals("object")) {
-                passByObject(requestFactory, responseFactory, iters);
+                passByObject(requestFactory, responseFactory, compression, iters);
             } else if (mode.equals("bytes")) {
-                passByBytes(requestFactory, responseFactory, iters);
+                passByBytes(requestFactory, responseFactory, compression, iters);
             } else if (mode.equals("client")) {
-                syncClient(requestFactory, responseFactory, iters);
+                syncClient(requestFactory, responseFactory, compression, iters);
             } else if (mode.equals("server")) {
-                syncServer(requestFactory, responseFactory, iters);
+                syncServer(requestFactory, responseFactory, compression, iters);
             } else {
-                System.out.println("unknown mode: " + mode);
+                System.out.println("unrecognized mode: " + mode);
             }
         } catch (IOException e) {
             System.err.println("IOException: " + e);
diff --git a/benchmark/src/main/java/org/capnproto/benchmark/Uncompressed.java b/benchmark/src/main/java/org/capnproto/benchmark/Uncompressed.java
new file mode 100644
index 0000000..df35469
--- /dev/null
+++ b/benchmark/src/main/java/org/capnproto/benchmark/Uncompressed.java
@@ -0,0 +1,16 @@
+package org.capnproto.benchmark;
+
+import java.io.IOException;
+
+public final class Uncompressed implements Compression {
+    public final void writeBuffered(org.capnproto.BufferedOutputStream writer,
+                              org.capnproto.MessageBuilder message) throws IOException {
+        org.capnproto.Serialize.writeMessage(writer, message);
+        writer.flush();
+    }
+
+    public final org.capnproto.MessageReader newBufferedReader(
+        org.capnproto.BufferedInputStream inputStream) throws IOException {
+        return org.capnproto.ByteChannelMessageReader.create(inputStream);
+    }
+}
diff --git a/runtime/src/main/java/org/capnproto/BufferedInputStreamWrapper.java b/runtime/src/main/java/org/capnproto/BufferedInputStreamWrapper.java
index 315cbfd..885cc61 100644
--- a/runtime/src/main/java/org/capnproto/BufferedInputStreamWrapper.java
+++ b/runtime/src/main/java/org/capnproto/BufferedInputStreamWrapper.java
@@ -49,7 +49,6 @@ public final class BufferedInputStreamWrapper implements BufferedInputStream {
                 return fromFirstBuffer + numBytes;
             } else {
                 //# Forward large read to the underlying stream.
-
                 this.buf.clear();
                 return fromFirstBuffer + readAtLeast(this.inner, dst, numBytes);
             }
diff --git a/runtime/src/main/java/org/capnproto/ByteChannelMessageReader.java b/runtime/src/main/java/org/capnproto/ByteChannelMessageReader.java
index 330c3ec..55a6362 100644
--- a/runtime/src/main/java/org/capnproto/ByteChannelMessageReader.java
+++ b/runtime/src/main/java/org/capnproto/ByteChannelMessageReader.java
@@ -68,7 +68,6 @@ public final class ByteChannelMessageReader {
         segmentSlices[0].order(ByteOrder.LITTLE_ENDIAN);
 
         int offset = segment0Size;
-
         for (int ii = 1; ii < segmentCount; ++ii) {
             allSegments.position(offset * Constants.BYTES_PER_WORD);
             segmentSlices[ii] = allSegments.slice();