Benchmark switches to Typesafe config

Author: coderplay

build.gradle

@@ -58,6 +58,7 @@ project(':lightningrpc-netty') {
 project(':lightningrpc-benchmark') {
   dependencies {
     compile project(':lightningrpc-netty')
+    compile 'com.typesafe:config:1.3.0'
   }
 }
 

lightningrpc-benchmark/conf/application.conf

@@ -1,6 +1,20 @@
-akka {
-    loggers = ["akka.event.slf4j.Slf4jLogger"]
-    loglevel = "INFO"
+server {
+  host = 127.0.0.1
+  port = 3059
+  threads = 128
+  response.size = 100
+}
+
+client {
+  connections = 1
+  concurrency = 128
+  timeout = 1
+  request {
+    type = 3 // kryo
+    size = 100
+    duration = 1000
+    statistics = true
+  }
 }
 
 

lightningrpc-benchmark/src/main/java/info/minzhou/lightning/rpc/benchmark/AbstractBenchmarkClient.java

@@ -14,6 +14,8 @@
 
 import com.esotericsoftware.kryo.serializers.DefaultArraySerializers;
 
+import com.typesafe.config.Config;
+import com.typesafe.config.ConfigFactory;
 import info.minzhou.lightning.rpc.Codecs;
 import info.minzhou.lightning.rpc.protocol.KryoUtils;
 import info.minzhou.lightning.rpc.protocol.PBDecoder;
@@ -72,24 +74,21 @@ public abstract class AbstractBenchmarkClient {
 	private static long above1000sum;
 
 	public void run(String[] args) throws Exception {
-		if (args == null || (args.length != 7 && args.length != 8)) {
-			throw new IllegalArgumentException(
-					"must give seven or eight args, serverIP serverPort concurrents timeout codectype requestSize runtime(seconds) clientNums");
-		}
-
-		final String serverIP = args[0];
-		final int serverPort = Integer.parseInt(args[1]);
-		final int concurrents = Integer.parseInt(args[2]);
-		final int timeout = Integer.parseInt(args[3]);
-		final int codectype = Integer.parseInt(args[4]);
-		final int requestSize = Integer.parseInt(args[5]);
-		runtime = Integer.parseInt(args[6]);
+    Config conf = ConfigFactory.load();
+    // server config
+		final String serverIP = conf.getString("server.host");
+		final int serverPort = conf.getInt("server.port");
+    // client config
+		final int concurrents = conf.getInt("client.concurrency");
+    final int clientNums = conf.getInt("client.connections");
+    final int timeout = conf.getInt("client.timeout");
+
+    // reuqest config
+		final int codectype = conf.getInt("client.request.type");
+		final int requestSize = conf.getInt("client.request.size");
+		runtime = conf.getInt("client.request.duration");
+    boolean isWriteResult = conf.getBoolean("client.request.statistics");
 		final long endtime = System.currentTimeMillis() + runtime * 1000;
-		int tmpClientNums = 1;
-		if (args.length == 8) {
-			tmpClientNums = Integer.parseInt(args[7]);
-		}
-		final int clientNums = tmpClientNums;
 
 		// Print start info
 		Date currentDate = new Date();
@@ -215,7 +214,7 @@ public void run(String[] args) throws Exception {
 			}
 		}
 
-		boolean isWriteResult = Boolean.parseBoolean(System.getProperty("write.statistics", "false"));
+
 		if (isWriteResult) {
 			BufferedWriter writer = new BufferedWriter(new FileWriter(
 					"benchmark.all.results"));
@@ -272,12 +271,12 @@ public abstract ClientRunnable getClientRunnable(String targetIP, int targetPort
 			int clientNums, int rpcTimeout, int codecType, int requestSize,
 			CyclicBarrier barrier, CountDownLatch latch, long endTime, long startTime);
 
-    protected void startRunnables(List<ClientRunnable> runnables) {
-        for (int i = 0; i < runnables.size(); i++) {
-            final ClientRunnable runnable = runnables.get(i);
-            Thread thread = new Thread(runnable, "benchmarkclient-" + i);
-            thread.start();
-}
+  protected void startRunnables(List<ClientRunnable> runnables) {
+    for (int i = 0; i < runnables.size(); i++) {
+      final ClientRunnable runnable = runnables.get(i);
+      Thread thread = new Thread(runnable, "benchmarkclient-" + i);
+      thread.start();
     }
+  }
 
 }

lightningrpc-benchmark/src/main/java/info/minzhou/lightning/rpc/benchmark/AbstractBenchmarkServer.java

@@ -1,13 +1,9 @@
 package info.minzhou.lightning.rpc.benchmark;
 
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.SynchronousQueue;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-
+import com.esotericsoftware.kryo.serializers.DefaultArraySerializers;
+import com.google.protobuf.ByteString;
+import com.typesafe.config.Config;
+import com.typesafe.config.ConfigFactory;
 import info.minzhou.lightning.rpc.NamedThreadFactory;
 import info.minzhou.lightning.rpc.protocol.KryoUtils;
 import info.minzhou.lightning.rpc.protocol.PBDecoder;
@@ -16,8 +12,9 @@
 import info.minzhou.lightning.rpc.server.Server;
 import info.minzhou.lightning.rpc.server.ServerProcessor;
 
-import com.esotericsoftware.kryo.serializers.DefaultArraySerializers;
-import com.google.protobuf.ByteString;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.concurrent.*;
 
 /**
  * Abstract benchmark server
@@ -31,13 +28,10 @@ public abstract class AbstractBenchmarkServer {
 			"yyyy-MM-dd HH:mm:ss");
 
   public void run(String[] args) throws Exception {
-    if (args == null || args.length != 3) {
-      throw new IllegalArgumentException(
-          "must give three args: listenPort | maxThreads | responseSize");
-    }
-    int listenPort = Integer.parseInt(args[0]);
-    int maxThreads = Integer.parseInt(args[1]);
-    final int responseSize = Integer.parseInt(args[2]);
+    Config conf = ConfigFactory.load();
+    int listenPort = conf.getInt("server.port");
+    int maxThreads = conf.getInt("server.threads");
+    final int responseSize = conf.getInt("server.response.size");
     System.out.println(dateFormat.format(new Date())
         + " ready to start server,listenPort is: " + listenPort
         + ",maxThreads is:" + maxThreads + ",responseSize is:"

lightningrpc-common/src/main/java/info/minzhou/lightning/rpc/Codecs.java

@@ -17,11 +17,9 @@ public class Codecs {
 
 	public static final int JAVA_CODEC = 1;
 
-	public static final int HESSIAN_CODEC = 2;
+	public static final int PB_CODEC = 2;
 
-	public static final int PB_CODEC = 3;
-	
-	public static final int KRYO_CODEC = 4;
+	public static final int KRYO_CODEC = 3;
 
 	private static Encoder[] encoders = new Encoder[5];
 

lightningrpc-common/src/main/java/info/minzhou/lightning/rpc/RequestWrapper.java

@@ -30,7 +30,7 @@ public class RequestWrapper {
 
 	private int protocolType;
 
-	private int codecType = Codecs.HESSIAN_CODEC;
+	private final int codecType;
 
 	private int messageLen;
 

lightningrpc-common/src/main/java/info/minzhou/lightning/rpc/ResponseWrapper.java

@@ -15,7 +15,7 @@ public class ResponseWrapper {
 
 	private Throwable exception = null;
 
-	private int codecType = Codecs.HESSIAN_CODEC;
+	private final int codecType;
 
 	private int protocolType;