From 8974ea3fd05dbecba0671dccb058866001c8ef5f Mon Sep 17 00:00:00 2001
From: Christian Wulf <chw@informatik.uni-kiel.de>
Date: Thu, 26 Mar 2015 15:20:43 +0100
Subject: [PATCH] refactored performance tests; removed some logging from
RunnableConsumerStage
---
.../java/teetime/framework/RunnableConsumerStage.java | 7 +------
.../examples/ChwWorkComparisonMethodcallWithPorts.java | 2 +-
.../examples/experiment01/ChwWorkPerformanceCheck.java | 5 +++--
.../experiment09pipeimpls/ChwWorkPerformanceCheck.java | 3 ++-
.../examples/experiment11/ChwWorkPerformanceCheck.java | 5 +++--
.../examples/experiment16/ChwWorkPerformanceCheck.java | 10 ++++++----
6 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/main/java/teetime/framework/RunnableConsumerStage.java b/src/main/java/teetime/framework/RunnableConsumerStage.java
index 79649142..ae4b2dda 100644
--- a/src/main/java/teetime/framework/RunnableConsumerStage.java
+++ b/src/main/java/teetime/framework/RunnableConsumerStage.java
@@ -40,19 +40,14 @@ final class RunnableConsumerStage extends AbstractRunnableStage {
this.inputPorts = stage.getInputPorts(); // FIXME should getInputPorts() really be defined in Stage?
}
+ @SuppressWarnings("PMD.GuardLogStatement")
@Override
protected void beforeStageExecution(final Stage stage) throws InterruptedException {
- logger.trace("ENTRY beforeStageExecution");
-
logger.trace("Waiting for start signals..." + inputPorts);
for (InputPort<?> inputPort : inputPorts) {
inputPort.waitForStartSignal();
}
logger.trace("Starting..." + stage);
-
- // stage.onSignal(signal, inputPort);
-
- logger.trace("EXIT beforeStageExecution");
}
@Override
diff --git a/src/performancetest/java/teetime/examples/ChwWorkComparisonMethodcallWithPorts.java b/src/performancetest/java/teetime/examples/ChwWorkComparisonMethodcallWithPorts.java
index d65e58f5..ac34f1b4 100644
--- a/src/performancetest/java/teetime/examples/ChwWorkComparisonMethodcallWithPorts.java
+++ b/src/performancetest/java/teetime/examples/ChwWorkComparisonMethodcallWithPorts.java
@@ -28,7 +28,7 @@ public class ChwWorkComparisonMethodcallWithPorts extends AbstractProfiledPerfor
@Override
public String getCorrespondingPerformanceProfile() {
- return "ChwWork";
+ return HostName.CHW_WORK.toString();
}
@Override
diff --git a/src/performancetest/java/teetime/examples/experiment01/ChwWorkPerformanceCheck.java b/src/performancetest/java/teetime/examples/experiment01/ChwWorkPerformanceCheck.java
index 6c7a37bb..d7762b8c 100644
--- a/src/performancetest/java/teetime/examples/experiment01/ChwWorkPerformanceCheck.java
+++ b/src/performancetest/java/teetime/examples/experiment01/ChwWorkPerformanceCheck.java
@@ -16,15 +16,16 @@
package teetime.examples.experiment01;
import static org.junit.Assert.assertEquals;
+import teetime.examples.HostName;
import teetime.util.test.eval.PerformanceResult;
-import util.test.PerformanceTest;
import util.test.AbstractProfiledPerformanceAssertion;
+import util.test.PerformanceTest;
class ChwWorkPerformanceCheck extends AbstractProfiledPerformanceAssertion {
@Override
public String getCorrespondingPerformanceProfile() {
- return "ChwWork";
+ return HostName.CHW_WORK.toString();
}
@Override
diff --git a/src/performancetest/java/teetime/examples/experiment09pipeimpls/ChwWorkPerformanceCheck.java b/src/performancetest/java/teetime/examples/experiment09pipeimpls/ChwWorkPerformanceCheck.java
index 38404905..cc670a79 100644
--- a/src/performancetest/java/teetime/examples/experiment09pipeimpls/ChwWorkPerformanceCheck.java
+++ b/src/performancetest/java/teetime/examples/experiment09pipeimpls/ChwWorkPerformanceCheck.java
@@ -16,12 +16,13 @@
package teetime.examples.experiment09pipeimpls;
import static org.junit.Assert.assertEquals;
+import teetime.examples.HostName;
class ChwWorkPerformanceCheck extends AbstractPerformanceCheck {
@Override
public String getCorrespondingPerformanceProfile() {
- return "ChwWork";
+ return HostName.CHW_WORK.toString();
}
@Override
diff --git a/src/performancetest/java/teetime/examples/experiment11/ChwWorkPerformanceCheck.java b/src/performancetest/java/teetime/examples/experiment11/ChwWorkPerformanceCheck.java
index f20539b6..ea4c302b 100644
--- a/src/performancetest/java/teetime/examples/experiment11/ChwWorkPerformanceCheck.java
+++ b/src/performancetest/java/teetime/examples/experiment11/ChwWorkPerformanceCheck.java
@@ -16,15 +16,16 @@
package teetime.examples.experiment11;
import static org.junit.Assert.assertEquals;
+import teetime.examples.HostName;
import teetime.util.test.eval.PerformanceResult;
-import util.test.PerformanceTest;
import util.test.AbstractProfiledPerformanceAssertion;
+import util.test.PerformanceTest;
class ChwWorkPerformanceCheck extends AbstractProfiledPerformanceAssertion {
@Override
public String getCorrespondingPerformanceProfile() {
- return "ChwWork";
+ return HostName.CHW_WORK.toString();
}
@Override
diff --git a/src/performancetest/java/teetime/examples/experiment16/ChwWorkPerformanceCheck.java b/src/performancetest/java/teetime/examples/experiment16/ChwWorkPerformanceCheck.java
index c9c07e70..210b13f6 100644
--- a/src/performancetest/java/teetime/examples/experiment16/ChwWorkPerformanceCheck.java
+++ b/src/performancetest/java/teetime/examples/experiment16/ChwWorkPerformanceCheck.java
@@ -16,12 +16,18 @@
package teetime.examples.experiment16;
import static org.junit.Assert.assertEquals;
+import teetime.examples.HostName;
import teetime.util.test.eval.PerformanceResult;
import util.test.AbstractProfiledPerformanceAssertion;
import util.test.PerformanceTest;
class ChwWorkPerformanceCheck extends AbstractProfiledPerformanceAssertion {
+ @Override
+ public String getCorrespondingPerformanceProfile() {
+ return HostName.CHW_WORK.toString();
+ }
+
@Override
public void check() {
PerformanceResult test16a = PerformanceTest.measurementRepository.performanceResults
@@ -43,8 +49,4 @@ class ChwWorkPerformanceCheck extends AbstractProfiledPerformanceAssertion {
assertEquals(2.0, speedupC, 0.3);
}
- @Override
- public String getCorrespondingPerformanceProfile() {
- return "ChwWork";
- }
}
--
GitLab