From 9e52d1a7323fbf729bbf25ed37e35e8846792461 Mon Sep 17 00:00:00 2001
From: Christian Wulf <chw@informatik.uni-kiel.de>
Date: Sun, 28 Dec 2014 07:43:32 +0100
Subject: [PATCH] moved some files; added MooBenchStarter from teetime
---
.../ThroughputTimestampAnalysisTest.java | 2 +-
.../ChwHomeTcpTraceReadingTest.java | 2 +-
...omeTcpTraceReconstructionAnalysisTest.java | 2 +-
...hwHomeTraceReconstructionAnalysisTest.java | 2 +-
...orkTcpTraceReconstructionAnalysisTest.java | 2 +-
...hwWorkTraceReconstructionAnalysisTest.java | 2 +-
...KiekerTraceReconstructionAnalysisTest.java | 2 +-
...ReconstructionAnalysisWithThreadsTest.java | 2 +-
...ReconstructionAnalysisWithThreadsTest.java | 2 +-
...TraceReductionAnalysisWithThreadsTest.java | 4 +--
.../java/util/test}/KiekerLoadDriver.java | 2 +-
.../java/util/test/MooBenchStarter.java | 31 +++++++++++++++++++
.../java/util/test/PerformanceTest.java | 1 +
13 files changed, 44 insertions(+), 12 deletions(-)
rename src/{main/java/util => performancetest/java/util/test}/KiekerLoadDriver.java (99%)
create mode 100644 src/performancetest/java/util/test/MooBenchStarter.java
diff --git a/src/performancetest/java/kieker/analysis/examples/throughput/ThroughputTimestampAnalysisTest.java b/src/performancetest/java/kieker/analysis/examples/throughput/ThroughputTimestampAnalysisTest.java
index 2e92b7c4..53022a4b 100644
--- a/src/performancetest/java/kieker/analysis/examples/throughput/ThroughputTimestampAnalysisTest.java
+++ b/src/performancetest/java/kieker/analysis/examples/throughput/ThroughputTimestampAnalysisTest.java
@@ -24,7 +24,7 @@ import org.junit.Test;
import teetime.util.StopWatch;
import teetime.util.TimestampObject;
import util.test.PerformanceTest;
-import util.test.StatisticsUtil;
+import util.test.eval.StatisticsUtil;
import kieker.analysis.examples.ThroughputTimestampAnalysis;
import kieker.analysis.exception.AnalysisConfigurationException;
diff --git a/src/performancetest/java/teetime/examples/traceReading/ChwHomeTcpTraceReadingTest.java b/src/performancetest/java/teetime/examples/traceReading/ChwHomeTcpTraceReadingTest.java
index 7426d4e2..5b85f0a2 100644
--- a/src/performancetest/java/teetime/examples/traceReading/ChwHomeTcpTraceReadingTest.java
+++ b/src/performancetest/java/teetime/examples/traceReading/ChwHomeTcpTraceReadingTest.java
@@ -35,7 +35,7 @@ import org.junit.runners.MethodSorters;
import teetime.framework.Analysis;
import teetime.util.ListUtil;
import teetime.util.StopWatch;
-import util.test.StatisticsUtil;
+import util.test.eval.StatisticsUtil;
/**
* @author Christian Wulf
diff --git a/src/performancetest/java/teetime/examples/traceReconstruction/ChwHomeTcpTraceReconstructionAnalysisTest.java b/src/performancetest/java/teetime/examples/traceReconstruction/ChwHomeTcpTraceReconstructionAnalysisTest.java
index 811d030f..8dd6ca55 100644
--- a/src/performancetest/java/teetime/examples/traceReconstruction/ChwHomeTcpTraceReconstructionAnalysisTest.java
+++ b/src/performancetest/java/teetime/examples/traceReconstruction/ChwHomeTcpTraceReconstructionAnalysisTest.java
@@ -33,7 +33,7 @@ import org.junit.Test;
import teetime.framework.Analysis;
import teetime.util.ListUtil;
import teetime.util.StopWatch;
-import util.test.StatisticsUtil;
+import util.test.eval.StatisticsUtil;
/**
* @author Christian Wulf
diff --git a/src/performancetest/java/teetime/examples/traceReconstruction/ChwHomeTraceReconstructionAnalysisTest.java b/src/performancetest/java/teetime/examples/traceReconstruction/ChwHomeTraceReconstructionAnalysisTest.java
index bf37a514..3267eb75 100644
--- a/src/performancetest/java/teetime/examples/traceReconstruction/ChwHomeTraceReconstructionAnalysisTest.java
+++ b/src/performancetest/java/teetime/examples/traceReconstruction/ChwHomeTraceReconstructionAnalysisTest.java
@@ -33,7 +33,7 @@ import org.junit.Test;
import teetime.framework.Analysis;
import teetime.util.StopWatch;
-import util.test.StatisticsUtil;
+import util.test.eval.StatisticsUtil;
import kieker.analysis.plugin.filter.flow.TraceEventRecords;
diff --git a/src/performancetest/java/teetime/examples/traceReconstruction/ChwWorkTcpTraceReconstructionAnalysisTest.java b/src/performancetest/java/teetime/examples/traceReconstruction/ChwWorkTcpTraceReconstructionAnalysisTest.java
index e2d6fca3..3ea85cae 100644
--- a/src/performancetest/java/teetime/examples/traceReconstruction/ChwWorkTcpTraceReconstructionAnalysisTest.java
+++ b/src/performancetest/java/teetime/examples/traceReconstruction/ChwWorkTcpTraceReconstructionAnalysisTest.java
@@ -26,7 +26,7 @@ import org.junit.Test;
import teetime.framework.Analysis;
import teetime.util.StopWatch;
-import util.test.StatisticsUtil;
+import util.test.eval.StatisticsUtil;
/**
* @author Christian Wulf
diff --git a/src/performancetest/java/teetime/examples/traceReconstruction/ChwWorkTraceReconstructionAnalysisTest.java b/src/performancetest/java/teetime/examples/traceReconstruction/ChwWorkTraceReconstructionAnalysisTest.java
index 4ef91f30..20045c54 100644
--- a/src/performancetest/java/teetime/examples/traceReconstruction/ChwWorkTraceReconstructionAnalysisTest.java
+++ b/src/performancetest/java/teetime/examples/traceReconstruction/ChwWorkTraceReconstructionAnalysisTest.java
@@ -32,7 +32,7 @@ import org.junit.Test;
import teetime.framework.Analysis;
import teetime.util.StopWatch;
-import util.test.StatisticsUtil;
+import util.test.eval.StatisticsUtil;
import kieker.analysis.plugin.filter.flow.TraceEventRecords;
diff --git a/src/performancetest/java/teetime/examples/traceReconstruction/NieWorkKiekerTraceReconstructionAnalysisTest.java b/src/performancetest/java/teetime/examples/traceReconstruction/NieWorkKiekerTraceReconstructionAnalysisTest.java
index daa1b9ae..c61f9693 100644
--- a/src/performancetest/java/teetime/examples/traceReconstruction/NieWorkKiekerTraceReconstructionAnalysisTest.java
+++ b/src/performancetest/java/teetime/examples/traceReconstruction/NieWorkKiekerTraceReconstructionAnalysisTest.java
@@ -31,7 +31,7 @@ import org.junit.Before;
import org.junit.Test;
import teetime.util.StopWatch;
-import util.test.StatisticsUtil;
+import util.test.eval.StatisticsUtil;
import kieker.analysis.plugin.filter.flow.TraceEventRecords;
diff --git a/src/performancetest/java/teetime/examples/traceReconstructionWithThreads/ChwHomeTcpTraceReconstructionAnalysisWithThreadsTest.java b/src/performancetest/java/teetime/examples/traceReconstructionWithThreads/ChwHomeTcpTraceReconstructionAnalysisWithThreadsTest.java
index aa4b4f0b..34f96f7c 100644
--- a/src/performancetest/java/teetime/examples/traceReconstructionWithThreads/ChwHomeTcpTraceReconstructionAnalysisWithThreadsTest.java
+++ b/src/performancetest/java/teetime/examples/traceReconstructionWithThreads/ChwHomeTcpTraceReconstructionAnalysisWithThreadsTest.java
@@ -35,7 +35,7 @@ import org.junit.runners.MethodSorters;
import teetime.framework.Analysis;
import teetime.util.ListUtil;
import teetime.util.StopWatch;
-import util.test.StatisticsUtil;
+import util.test.eval.StatisticsUtil;
/**
* @author Christian Wulf
diff --git a/src/performancetest/java/teetime/examples/traceReconstructionWithThreads/ChwWorkTcpTraceReconstructionAnalysisWithThreadsTest.java b/src/performancetest/java/teetime/examples/traceReconstructionWithThreads/ChwWorkTcpTraceReconstructionAnalysisWithThreadsTest.java
index b76f39fc..301a7fa1 100644
--- a/src/performancetest/java/teetime/examples/traceReconstructionWithThreads/ChwWorkTcpTraceReconstructionAnalysisWithThreadsTest.java
+++ b/src/performancetest/java/teetime/examples/traceReconstructionWithThreads/ChwWorkTcpTraceReconstructionAnalysisWithThreadsTest.java
@@ -30,7 +30,7 @@ import org.junit.runners.MethodSorters;
import teetime.framework.Analysis;
import teetime.util.ListUtil;
import teetime.util.StopWatch;
-import util.test.StatisticsUtil;
+import util.test.eval.StatisticsUtil;
/**
* @author Christian Wulf
diff --git a/src/performancetest/java/teetime/examples/traceReductionWithThreads/ChwWorkTcpTraceReductionAnalysisWithThreadsTest.java b/src/performancetest/java/teetime/examples/traceReductionWithThreads/ChwWorkTcpTraceReductionAnalysisWithThreadsTest.java
index dc129f53..8fb011b9 100644
--- a/src/performancetest/java/teetime/examples/traceReductionWithThreads/ChwWorkTcpTraceReductionAnalysisWithThreadsTest.java
+++ b/src/performancetest/java/teetime/examples/traceReductionWithThreads/ChwWorkTcpTraceReductionAnalysisWithThreadsTest.java
@@ -32,8 +32,8 @@ import org.junit.runners.MethodSorters;
import teetime.framework.Analysis;
import teetime.util.ListUtil;
import teetime.util.StopWatch;
-import util.MooBenchStarter;
-import util.test.StatisticsUtil;
+import util.test.MooBenchStarter;
+import util.test.eval.StatisticsUtil;
/**
* @author Christian Wulf
diff --git a/src/main/java/util/KiekerLoadDriver.java b/src/performancetest/java/util/test/KiekerLoadDriver.java
similarity index 99%
rename from src/main/java/util/KiekerLoadDriver.java
rename to src/performancetest/java/util/test/KiekerLoadDriver.java
index d9a6b789..0d819a0c 100644
--- a/src/main/java/util/KiekerLoadDriver.java
+++ b/src/performancetest/java/util/test/KiekerLoadDriver.java
@@ -1,4 +1,4 @@
-package util;
+package util.test;
import java.io.BufferedOutputStream;
import java.io.File;
diff --git a/src/performancetest/java/util/test/MooBenchStarter.java b/src/performancetest/java/util/test/MooBenchStarter.java
new file mode 100644
index 00000000..b2e8ac94
--- /dev/null
+++ b/src/performancetest/java/util/test/MooBenchStarter.java
@@ -0,0 +1,31 @@
+package util.test;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.LinkedList;
+import java.util.List;
+
+public class MooBenchStarter {
+
+ private final File execDir;
+
+ public MooBenchStarter() {
+ this.execDir = new File("scripts/MooBench-cmd");
+ System.out.println("execDir: " + this.execDir.getAbsolutePath());
+ }
+
+ public void start(final int runs, final long calls) throws IOException {
+ final List<String> command = new LinkedList<String>();
+ command.add("cmd");
+ command.add("/c");
+ command.add("start");
+ command.add("/D");
+ command.add(this.execDir.getAbsolutePath());
+ command.add("Load Driver");
+ command.add("startMooBench.cmd");
+ command.add(String.valueOf(runs));
+ command.add(String.valueOf(calls));
+
+ new ProcessBuilder(command).start();
+ }
+}
diff --git a/src/performancetest/java/util/test/PerformanceTest.java b/src/performancetest/java/util/test/PerformanceTest.java
index 9a37bccd..7189ad5f 100644
--- a/src/performancetest/java/util/test/PerformanceTest.java
+++ b/src/performancetest/java/util/test/PerformanceTest.java
@@ -13,6 +13,7 @@ import org.junit.runner.Description;
import teetime.util.StopWatch;
import teetime.util.TimestampObject;
+import util.test.eval.StatisticsUtil;
public abstract class PerformanceTest {
--
GitLab