From 3afd3d5b613ea2ffd8d85b4d64a22a44ae3f708c Mon Sep 17 00:00:00 2001
From: David Renshaw <dwrenshaw@gmail.com>
Date: Sat, 21 Jun 2014 08:13:20 -0400
Subject: [PATCH] CatRank stub

---
 .../org/capnproto/benchmark/CarSales.java     | 10 ++------
 .../java/org/capnproto/benchmark/CatRank.java | 24 +++++++++++++++++++
 .../java/org/capnproto/benchmark/Eval.java    |  5 ++++
 .../org/capnproto/benchmark/TestCase.java     | 12 ++++++++--
 benchmark/src/main/schema/catrank.capnp       |  2 +-
 5 files changed, 42 insertions(+), 11 deletions(-)
 create mode 100644 benchmark/src/main/java/org/capnproto/benchmark/CatRank.java

diff --git a/benchmark/src/main/java/org/capnproto/benchmark/CarSales.java b/benchmark/src/main/java/org/capnproto/benchmark/CarSales.java
index 7f56c56..d0ac3bd 100644
--- a/benchmark/src/main/java/org/capnproto/benchmark/CarSales.java
+++ b/benchmark/src/main/java/org/capnproto/benchmark/CarSales.java
@@ -1,6 +1,5 @@
 package org.capnproto.benchmark;
 
-import org.capnproto.MessageBuilder;
 import org.capnproto.StructList;
 import org.capnproto.Text;
 import org.capnproto.benchmark.CarSalesSchema.*;
@@ -115,13 +114,8 @@ public class CarSales
 
 
     public static void main(String[] args) {
-        Common.FastRand rng = new Common.FastRand();
-
-        TestCase<ParkingLot.Factory, ParkingLot.Builder, ParkingLot.Reader,
-            TotalValue.Factory, TotalValue.Builder, TotalValue.Reader, Long> testCase = new CarSales();
-
-        testCase.execute(ParkingLot.factory, TotalValue.factory);
-
+        CarSales testCase = new CarSales();
+        testCase.execute(args, ParkingLot.factory, TotalValue.factory);
     }
 
 }
diff --git a/benchmark/src/main/java/org/capnproto/benchmark/CatRank.java b/benchmark/src/main/java/org/capnproto/benchmark/CatRank.java
new file mode 100644
index 0000000..edce78f
--- /dev/null
+++ b/benchmark/src/main/java/org/capnproto/benchmark/CatRank.java
@@ -0,0 +1,24 @@
+package org.capnproto.benchmark;
+
+import org.capnproto.MessageBuilder;
+import org.capnproto.StructList;
+import org.capnproto.Text;
+import org.capnproto.benchmark.CatRankSchema.*;
+
+public class CatRank
+    extends TestCase<SearchResultList.Factory, SearchResultList.Builder, SearchResultList.Reader,
+    SearchResultList.Factory, SearchResultList.Builder, SearchResultList.Reader, Integer> {
+
+
+    public Integer setupRequest(Common.FastRand rng, SearchResultList.Builder request) {
+        return 0;
+    }
+
+    public void handleRequest(SearchResultList.Reader request, SearchResultList.Builder response) {
+    }
+
+    public boolean checkResponse(SearchResultList.Reader response, Integer expectedGoodCount) {
+        return true;
+    }
+
+}
diff --git a/benchmark/src/main/java/org/capnproto/benchmark/Eval.java b/benchmark/src/main/java/org/capnproto/benchmark/Eval.java
index 65e5017..96df889 100644
--- a/benchmark/src/main/java/org/capnproto/benchmark/Eval.java
+++ b/benchmark/src/main/java/org/capnproto/benchmark/Eval.java
@@ -82,4 +82,9 @@ public class Eval
     public final boolean checkResponse(EvaluationResult.Reader response, Integer expected) {
         return response.getValue() == expected;
     }
+
+    public static void main(String[] args) {
+        Eval testCase = new Eval();
+        testCase.execute(args, Expression.factory, EvaluationResult.factory);
+    }
 }
diff --git a/benchmark/src/main/java/org/capnproto/benchmark/TestCase.java b/benchmark/src/main/java/org/capnproto/benchmark/TestCase.java
index 29af2f5..7800c6c 100644
--- a/benchmark/src/main/java/org/capnproto/benchmark/TestCase.java
+++ b/benchmark/src/main/java/org/capnproto/benchmark/TestCase.java
@@ -13,10 +13,18 @@ public abstract class TestCase<RequestFactory extends StructFactory<RequestBuild
     public abstract void handleRequest(RequestReader request, ResponseBuilder response);
     public abstract boolean checkResponse(ResponseReader response, Expectation expected);
 
-    public void execute(RequestFactory requestFactory, ResponseFactory responseFactory) {
+    public void execute(String[] args, RequestFactory requestFactory, ResponseFactory responseFactory) {
+
+        if (args.length != 4) {
+            System.out.println("USAGE: TestCase MODE REUSE COMPRESSION ITERATION_COUNT");
+            return;
+        }
+
+        long iters = Long.parseLong(args[3]);
+
         Common.FastRand rng = new Common.FastRand();
 
-        for (int i = 0; i < 50000; ++i) {
+        for (int i = 0; i < iters; ++i) {
             MessageBuilder requestMessage = new MessageBuilder();
             MessageBuilder responseMessage = new MessageBuilder();
             RequestBuilder request = requestMessage.initRoot(requestFactory);
diff --git a/benchmark/src/main/schema/catrank.capnp b/benchmark/src/main/schema/catrank.capnp
index f30e6c3..b833799 100644
--- a/benchmark/src/main/schema/catrank.capnp
+++ b/benchmark/src/main/schema/catrank.capnp
@@ -28,7 +28,7 @@ $Cxx.namespace("capnp::benchmark::capnp");
 
 using Java = import "/java_support/java.capnp";
 $Java.package("org.capnproto.benchmark");
-$Java.outerClassname("CatrankSchema");
+$Java.outerClassname("CatRankSchema");
 
 struct SearchResultList {
   results@0: List(SearchResult);