From 13a85bf5f9754eda7a63ba592ee26e2edfb8a8b3 Mon Sep 17 00:00:00 2001 From: Calvin Date: Fri, 18 Jan 2013 00:09:05 +0800 Subject: [PATCH] =?UTF-8?q?#171=20Redis=E4=B8=8EMongoDB=E7=9A=84Benchmark?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B=EF=BC=8Csome=20renaming.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demos/mongodb/MongoJavaDriverBenchmark.java | 2 +- .../demos/mongodb/MongoSpringDataBenchmark.java | 2 +- .../showcase/demos/redis/RedisJedisBenchmark.java | 2 +- .../modules/test/benchmark/BenchmarkBase.java | 13 +++++++------ 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/demos/mongodb/MongoJavaDriverBenchmark.java b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/mongodb/MongoJavaDriverBenchmark.java index 4462e244..8e90fa44 100644 --- a/examples/showcase/src/main/java/org/springside/examples/showcase/demos/mongodb/MongoJavaDriverBenchmark.java +++ b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/mongodb/MongoJavaDriverBenchmark.java @@ -30,7 +30,7 @@ public class MongoJavaDriverBenchmark extends BenchmarkBase { } @Override - protected void onPrepare() { + protected void onStart() { Mongo mongoClient = null; try { mongoClient = new Mongo(host); diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/demos/mongodb/MongoSpringDataBenchmark.java b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/mongodb/MongoSpringDataBenchmark.java index b65161ec..bddab6f8 100644 --- a/examples/showcase/src/main/java/org/springside/examples/showcase/demos/mongodb/MongoSpringDataBenchmark.java +++ b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/mongodb/MongoSpringDataBenchmark.java @@ -32,7 +32,7 @@ public class MongoSpringDataBenchmark extends BenchmarkBase { } @Override - protected void onPrepare() { + protected void onStart() { try { Mongo client = new Mongo(host); client.setWriteConcern(WriteConcern.SAFE); diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/demos/redis/RedisJedisBenchmark.java b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/redis/RedisJedisBenchmark.java index d209c35e..356565b5 100644 --- a/examples/showcase/src/main/java/org/springside/examples/showcase/demos/redis/RedisJedisBenchmark.java +++ b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/redis/RedisJedisBenchmark.java @@ -23,7 +23,7 @@ public class RedisJedisBenchmark extends BenchmarkBase { } @Override - protected void onPrepare() { + protected void onStart() { //reset counter Jedis jedis = new Jedis(host); jedis.set(counterName, "0"); diff --git a/modules/test/src/main/java/org/springside/modules/test/benchmark/BenchmarkBase.java b/modules/test/src/main/java/org/springside/modules/test/benchmark/BenchmarkBase.java index c9173cf0..51ce6e42 100644 --- a/modules/test/src/main/java/org/springside/modules/test/benchmark/BenchmarkBase.java +++ b/modules/test/src/main/java/org/springside/modules/test/benchmark/BenchmarkBase.java @@ -22,7 +22,7 @@ public abstract class BenchmarkBase { } public void run() throws Exception { - onPrepare(); + onStart(); //start threads ExecutorService threadPool = Executors.newFixedThreadPool(threadCount); @@ -40,11 +40,13 @@ public abstract class BenchmarkBase { finishLock.await(); long timeInMills = new Date().getTime() - startTime.getTime(); - long totalTimes = threadCount * loopCount; + long invokeTimes = threadCount * loopCount; System.out.printf("Thread count is %d, Spend %d ms for %d request, TPS is %d\n", threadCount, timeInMills, - totalTimes, (totalTimes * 1000 / timeInMills)); + invokeTimes, (invokeTimes * 1000 / timeInMills)); threadPool.shutdownNow(); + + onFinish(); } protected Date onThreadStart() { @@ -67,13 +69,12 @@ public abstract class BenchmarkBase { System.out.println("Thread average latency " + latency + "ms"); } - protected void onPrepare() { - + protected void onStart() { } protected void onFinish() { - } abstract protected Runnable getTask(); + }