You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by nt...@apache.org on 2016/02/01 15:21:29 UTC
[21/49] ignite git commit: WIP on local benchmarks.
WIP on local benchmarks.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/79db260f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/79db260f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/79db260f
Branch: refs/heads/ignite-2435
Commit: 79db260fff45aae9fb30a322ce12e4091dbcd48b
Parents: 62d6ce7
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Thu Jan 28 16:46:09 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Thu Jan 28 16:46:09 2016 +0300
----------------------------------------------------------------------
.../jmh/cache/JmhCachePutBenchmark.java | 22 ++++++++++----------
.../jmh/runner/JmhIdeBenchmarkRunner.java | 14 +++++++++++++
2 files changed, 25 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/79db260f/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/cache/JmhCachePutBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/cache/JmhCachePutBenchmark.java b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/cache/JmhCachePutBenchmark.java
index 6421243..1bc24af 100644
--- a/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/cache/JmhCachePutBenchmark.java
+++ b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/cache/JmhCachePutBenchmark.java
@@ -23,7 +23,6 @@ import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.internal.benchmarks.jmh.runner.JmhIdeBenchmarkRunner;
import org.apache.ignite.internal.benchmarks.model.IntValue;
import org.openjdk.jmh.annotations.Benchmark;
-import org.openjdk.jmh.annotations.Threads;
import java.util.concurrent.ThreadLocalRandom;
@@ -60,7 +59,6 @@ public class JmhCachePutBenchmark extends JmhCacheAbstractBenchmark {
* @throws Exception If failed.
*/
@Benchmark
- @Threads(4)
public void testPut() throws Exception {
int key = ThreadLocalRandom.current().nextInt(CNT);
@@ -68,13 +66,13 @@ public class JmhCachePutBenchmark extends JmhCacheAbstractBenchmark {
}
/**
- * Runner.
+ * Run benchmarks.
*
* @param args Arguments.
* @throws Exception If failed.
*/
public static void main(String[] args) throws Exception {
- runAtomic(CacheAtomicityMode.ATOMIC);
+ run(CacheAtomicityMode.ATOMIC);
}
/**
@@ -83,11 +81,11 @@ public class JmhCachePutBenchmark extends JmhCacheAbstractBenchmark {
* @param atomicityMode Atomicity mode.
* @throws Exception If failed.
*/
- private static void runAtomic(CacheAtomicityMode atomicityMode) throws Exception {
- run(true, atomicityMode, CacheWriteSynchronizationMode.PRIMARY_SYNC);
- run(true, atomicityMode, CacheWriteSynchronizationMode.FULL_SYNC);
- run(false, atomicityMode, CacheWriteSynchronizationMode.PRIMARY_SYNC);
- run(false, atomicityMode, CacheWriteSynchronizationMode.FULL_SYNC);
+ private static void run(CacheAtomicityMode atomicityMode) throws Exception {
+ run(4, true, atomicityMode, CacheWriteSynchronizationMode.PRIMARY_SYNC);
+ run(4, true, atomicityMode, CacheWriteSynchronizationMode.FULL_SYNC);
+ run(4, false, atomicityMode, CacheWriteSynchronizationMode.PRIMARY_SYNC);
+ run(4, false, atomicityMode, CacheWriteSynchronizationMode.FULL_SYNC);
}
/**
@@ -97,12 +95,14 @@ public class JmhCachePutBenchmark extends JmhCacheAbstractBenchmark {
* @param writeSyncMode Write synchronization mode.
* @throws Exception If failed.
*/
- private static void run(boolean client, CacheAtomicityMode atomicityMode,
+ private static void run(int threads, boolean client, CacheAtomicityMode atomicityMode,
CacheWriteSynchronizationMode writeSyncMode) throws Exception {
- String output = "ignite-cache-put-" + (client ? "client" : "data") + "-" + atomicityMode + "-" + writeSyncMode;
+ String output = "ignite-cache-put-" + threads + "-threads-" + (client ? "client" : "data") +
+ "-" + atomicityMode + "-" + writeSyncMode;
JmhIdeBenchmarkRunner.create()
.forks(1)
+ .threads(threads)
.warmupIterations(10)
.measurementIterations(60)
.classes(JmhCachePutBenchmark.class)
http://git-wip-us.apache.org/repos/asf/ignite/blob/79db260f/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/runner/JmhIdeBenchmarkRunner.java
----------------------------------------------------------------------
diff --git a/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/runner/JmhIdeBenchmarkRunner.java b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/runner/JmhIdeBenchmarkRunner.java
index a34cfb9..d92a879 100644
--- a/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/runner/JmhIdeBenchmarkRunner.java
+++ b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/runner/JmhIdeBenchmarkRunner.java
@@ -51,6 +51,9 @@ public class JmhIdeBenchmarkRunner {
/** Output. */
private String output;
+ /** Amount of threads. */
+ private int threads;
+
/**
* Create new runner.
*
@@ -147,6 +150,16 @@ public class JmhIdeBenchmarkRunner {
}
/**
+ * @param threads Threads.
+ * @return This instance.
+ */
+ public JmhIdeBenchmarkRunner threads(int threads) {
+ this.threads = threads;
+
+ return this;
+ }
+
+ /**
* Get prepared options builder.
*
* @return Options builder.
@@ -158,6 +171,7 @@ public class JmhIdeBenchmarkRunner {
builder.warmupIterations(warmupIterations);
builder.measurementIterations(measurementIterations);
builder.timeUnit(outputTimeUnit);
+ builder.threads(threads);
if (benchmarkModes != null) {
for (Mode benchmarkMode : benchmarkModes)