From 0bc285cb177ada3d5c840942262ec38a4bb1c52d Mon Sep 17 00:00:00 2001
From: Christian Wulf <chw@informatik.uni-kiel.de>
Date: Tue, 3 Jun 2014 21:51:17 +0200
Subject: [PATCH] fixed encoding
---
.../framework/concurrent/NextStageScheduler.java | 2 +-
.../teetime/framework/concurrent/WorkerThread.java | 4 ++--
.../teetime/framework/core/AbstractFilter.java | 2 +-
src/main/java/teetime/util/StatisticsUtil.java | 14 +++++++-------
src/main/java/teetime/util/StopWatch.java | 12 ++++++------
.../MethodCallThoughputTimestampAnalysisTest.java | 2 +-
.../throughput/ThroughputAnalysisTest.java | 8 ++++----
.../ThroughputTimestampAnalysisTest.java | 2 +-
.../concurrent/CircularWorkStealingDequeTest.java | 4 ++--
.../alternative/CircularWorkStealingDequeTest.java | 2 +-
.../CircularWorkStealingDequeWithSentinelTest.java | 2 +-
...rkStealingDequeWithThreadLocalSentinelTest.java | 2 +-
.../ExceptionalCircularWorkStealingDequeTest.java | 2 +-
.../UntypedCircularWorkStealingDequeTest.java | 4 ++--
...edExceptionalCircularWorkStealingDequeTest.java | 2 +-
15 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/src/main/java/teetime/framework/concurrent/NextStageScheduler.java b/src/main/java/teetime/framework/concurrent/NextStageScheduler.java
index 8eda5657..e45a786a 100644
--- a/src/main/java/teetime/framework/concurrent/NextStageScheduler.java
+++ b/src/main/java/teetime/framework/concurrent/NextStageScheduler.java
@@ -123,7 +123,7 @@ public class NextStageScheduler implements IStageScheduler {
this.stopWatch.end();
- this.durationInNs += this.stopWatch.getDuration();
+ this.durationInNs += this.stopWatch.getDurationInNs();
if ((this.iterations % 10000) == 0) {
this.durations.add(this.durationInNs);
this.durationInNs = 0;
diff --git a/src/main/java/teetime/framework/concurrent/WorkerThread.java b/src/main/java/teetime/framework/concurrent/WorkerThread.java
index ca2a15c7..db5abd01 100644
--- a/src/main/java/teetime/framework/concurrent/WorkerThread.java
+++ b/src/main/java/teetime/framework/concurrent/WorkerThread.java
@@ -78,7 +78,7 @@ public class WorkerThread extends Thread {
this.stageScheduler.determineNextStage(stage, executedSuccessfully);
this.iterationStopWatch.end();
- final long schedulingOverhead = this.iterationStopWatch.getDuration() - stage.getLastDuration();
+ final long schedulingOverhead = this.iterationStopWatch.getDurationInNs() - stage.getLastDuration();
schedulingOverheadInNs += schedulingOverhead;
if ((iterations % 10000) == 0) {
this.schedulingOverheadsInNs.add(schedulingOverheadInNs);
@@ -87,7 +87,7 @@ public class WorkerThread extends Thread {
}
this.stopWatch.end();
- this.durationInNs = this.stopWatch.getDuration();
+ this.durationInNs = this.stopWatch.getDurationInNs();
final List<Long> durations = ((NextStageScheduler) this.stageScheduler).getDurations();
long overallDuration = 0;
diff --git a/src/main/java/teetime/framework/core/AbstractFilter.java b/src/main/java/teetime/framework/core/AbstractFilter.java
index 0de24159..f0a246a7 100644
--- a/src/main/java/teetime/framework/core/AbstractFilter.java
+++ b/src/main/java/teetime/framework/core/AbstractFilter.java
@@ -128,7 +128,7 @@ public abstract class AbstractFilter<S extends IStage> extends AbstractStage imp
return success;
} finally {
this.stopWatch.end();
- this.lastDuration = this.stopWatch.getDuration();
+ this.lastDuration = this.stopWatch.getDurationInNs();
this.overallDurationInNs += this.lastDuration;
}
}
diff --git a/src/main/java/teetime/util/StatisticsUtil.java b/src/main/java/teetime/util/StatisticsUtil.java
index 48a023b2..dce702c4 100644
--- a/src/main/java/teetime/util/StatisticsUtil.java
+++ b/src/main/java/teetime/util/StatisticsUtil.java
@@ -27,7 +27,7 @@ import teetime.examples.throughput.TimestampObject;
/**
* @author Christian Wulf
- *
+ *
* @since 1.10
*/
public class StatisticsUtil {
@@ -62,20 +62,20 @@ public class StatisticsUtil {
final Map<Double, Long> quintileValues = StatisticsUtil.calculateQuintiles(sortedDurationsInNs);
- System.out.println("min: " + TimeUnit.NANOSECONDS.toMicros(minDurationInNs) + " µs");
- System.out.println("max: " + TimeUnit.NANOSECONDS.toMicros(maxDurationInNs) + " µs");
+ System.out.println("min: " + TimeUnit.NANOSECONDS.toMicros(minDurationInNs) + " µs");
+ System.out.println("max: " + TimeUnit.NANOSECONDS.toMicros(maxDurationInNs) + " µs");
final long avgDurInNs = sumInNs / (timestampObjects.size() / 2);
- System.out.println("avg duration: " + TimeUnit.NANOSECONDS.toMicros(avgDurInNs) + " µs");
+ System.out.println("avg duration: " + TimeUnit.NANOSECONDS.toMicros(avgDurInNs) + " µs");
for (final Entry<Double, Long> entry : quintileValues.entrySet()) {
- System.out.println((entry.getKey() * 100) + " % : " + TimeUnit.NANOSECONDS.toMicros(entry.getValue()) + " µs");
+ System.out.println((entry.getKey() * 100) + " % : " + TimeUnit.NANOSECONDS.toMicros(entry.getValue()) + " µs");
}
final long confidenceWidthInNs = StatisticsUtil.calculateConfidenceWidth(sortedDurationsInNs, avgDurInNs);
System.out.println("confidenceWidth: " + confidenceWidthInNs + " ns");
- System.out.println("[" + TimeUnit.NANOSECONDS.toMicros(avgDurInNs - confidenceWidthInNs) + " µs, "
- + TimeUnit.NANOSECONDS.toMicros(avgDurInNs + confidenceWidthInNs) + " µs]");
+ System.out.println("[" + TimeUnit.NANOSECONDS.toMicros(avgDurInNs - confidenceWidthInNs) + " µs, "
+ + TimeUnit.NANOSECONDS.toMicros(avgDurInNs + confidenceWidthInNs) + " µs]");
}
public static long calculateConfidenceWidth(final List<Long> durations, final long avgDurInNs) {
diff --git a/src/main/java/teetime/util/StopWatch.java b/src/main/java/teetime/util/StopWatch.java
index bd593859..8b13d083 100644
--- a/src/main/java/teetime/util/StopWatch.java
+++ b/src/main/java/teetime/util/StopWatch.java
@@ -2,18 +2,18 @@ package teetime.util;
public final class StopWatch {
- private long startTimeInMs;
- private long endTimeInMs;
+ private long startTimeInNs;
+ private long endTimeInNs;
public final void start() {
- this.startTimeInMs = System.nanoTime();
+ this.startTimeInNs = System.nanoTime();
}
public final void end() {
- this.endTimeInMs = System.nanoTime();
+ this.endTimeInNs = System.nanoTime();
}
- public final long getDuration() {
- return this.endTimeInMs - this.startTimeInMs;
+ public final long getDurationInNs() {
+ return this.endTimeInNs - this.startTimeInNs;
}
}
diff --git a/src/test/java/teetime/examples/throughput/MethodCallThoughputTimestampAnalysisTest.java b/src/test/java/teetime/examples/throughput/MethodCallThoughputTimestampAnalysisTest.java
index b5dd36d6..f6d10d99 100644
--- a/src/test/java/teetime/examples/throughput/MethodCallThoughputTimestampAnalysisTest.java
+++ b/src/test/java/teetime/examples/throughput/MethodCallThoughputTimestampAnalysisTest.java
@@ -68,7 +68,7 @@ public class MethodCallThoughputTimestampAnalysisTest {
stopWatch.end();
}
- StatisticsUtil.printStatistics(stopWatch.getDuration(), timestampObjects);
+ StatisticsUtil.printStatistics(stopWatch.getDurationInNs(), timestampObjects);
}
}
diff --git a/src/test/java/teetime/examples/throughput/ThroughputAnalysisTest.java b/src/test/java/teetime/examples/throughput/ThroughputAnalysisTest.java
index 12538bec..ef0e72ce 100644
--- a/src/test/java/teetime/examples/throughput/ThroughputAnalysisTest.java
+++ b/src/test/java/teetime/examples/throughput/ThroughputAnalysisTest.java
@@ -26,7 +26,7 @@ import teetime.util.StopWatch;
/**
* @author Christian Wulf
- *
+ *
* @since 1.10
*/
public class ThroughputAnalysisTest {
@@ -63,11 +63,11 @@ public class ThroughputAnalysisTest {
stopWatch.end();
}
- durations[i] = stopWatch.getDuration();
+ durations[i] = stopWatch.getDurationInNs();
}
// for (final long dur : durations) {
- // System.out.println("Duration: " + (dur / 1000) + " �s");
+ // System.out.println("Duration: " + (dur / 1000) + " µs");
// }
long sum = 0;
@@ -76,7 +76,7 @@ public class ThroughputAnalysisTest {
}
final long avgDur = sum / (numRuns / 2);
- System.out.println("avg duration: " + (avgDur / 1000) + " �s");
+ System.out.println("avg duration: " + (avgDur / 1000) + " µs");
}
}
diff --git a/src/test/java/teetime/examples/throughput/ThroughputTimestampAnalysisTest.java b/src/test/java/teetime/examples/throughput/ThroughputTimestampAnalysisTest.java
index e4289f49..d940bd1b 100644
--- a/src/test/java/teetime/examples/throughput/ThroughputTimestampAnalysisTest.java
+++ b/src/test/java/teetime/examples/throughput/ThroughputTimestampAnalysisTest.java
@@ -81,7 +81,7 @@ public class ThroughputTimestampAnalysisTest {
stopWatch.end();
}
- StatisticsUtil.printStatistics(stopWatch.getDuration(), timestampObjects);
+ StatisticsUtil.printStatistics(stopWatch.getDurationInNs(), timestampObjects);
}
}
diff --git a/src/test/java/teetime/util/concurrent/CircularWorkStealingDequeTest.java b/src/test/java/teetime/util/concurrent/CircularWorkStealingDequeTest.java
index ca0fc714..c62ced60 100644
--- a/src/test/java/teetime/util/concurrent/CircularWorkStealingDequeTest.java
+++ b/src/test/java/teetime/util/concurrent/CircularWorkStealingDequeTest.java
@@ -28,7 +28,7 @@ public class CircularWorkStealingDequeTest {
}
this.stopWatch.end();
- Assert.assertThat(this.stopWatch.getDuration(),
- OrderingComparison.lessThan(UntypedCircularWorkStealingDequeTest.EXPECTED_DURATION));
+ Assert.assertThat(this.stopWatch.getDurationInNs(),
+ OrderingComparison.lessThan(UntypedCircularWorkStealingDequeTest.EXPECTED_DURATION_IN_NS));
}
}
diff --git a/src/test/java/teetime/util/concurrent/workstealing/alternative/CircularWorkStealingDequeTest.java b/src/test/java/teetime/util/concurrent/workstealing/alternative/CircularWorkStealingDequeTest.java
index 9ad2c0b9..4ed31d09 100644
--- a/src/test/java/teetime/util/concurrent/workstealing/alternative/CircularWorkStealingDequeTest.java
+++ b/src/test/java/teetime/util/concurrent/workstealing/alternative/CircularWorkStealingDequeTest.java
@@ -27,6 +27,6 @@ public class CircularWorkStealingDequeTest {
}
this.stopWatch.end();
- Assert.assertThat(this.stopWatch.getDuration(), OrderingComparison.lessThan(UntypedCircularWorkStealingDequeTest.EXPECTED_DURATION));
+ Assert.assertThat(this.stopWatch.getDurationInNs(), OrderingComparison.lessThan(UntypedCircularWorkStealingDequeTest.EXPECTED_DURATION_IN_NS));
}
}
diff --git a/src/test/java/teetime/util/concurrent/workstealing/alternative/CircularWorkStealingDequeWithSentinelTest.java b/src/test/java/teetime/util/concurrent/workstealing/alternative/CircularWorkStealingDequeWithSentinelTest.java
index 896123f1..401c1606 100644
--- a/src/test/java/teetime/util/concurrent/workstealing/alternative/CircularWorkStealingDequeWithSentinelTest.java
+++ b/src/test/java/teetime/util/concurrent/workstealing/alternative/CircularWorkStealingDequeWithSentinelTest.java
@@ -29,6 +29,6 @@ public class CircularWorkStealingDequeWithSentinelTest {
}
this.stopWatch.end();
- Assert.assertThat(this.stopWatch.getDuration(), OrderingComparison.lessThan(UntypedCircularWorkStealingDequeTest.EXPECTED_DURATION));
+ Assert.assertThat(this.stopWatch.getDurationInNs(), OrderingComparison.lessThan(UntypedCircularWorkStealingDequeTest.EXPECTED_DURATION_IN_NS));
}
}
diff --git a/src/test/java/teetime/util/concurrent/workstealing/alternative/CircularWorkStealingDequeWithThreadLocalSentinelTest.java b/src/test/java/teetime/util/concurrent/workstealing/alternative/CircularWorkStealingDequeWithThreadLocalSentinelTest.java
index dc1a0cfb..42555e67 100644
--- a/src/test/java/teetime/util/concurrent/workstealing/alternative/CircularWorkStealingDequeWithThreadLocalSentinelTest.java
+++ b/src/test/java/teetime/util/concurrent/workstealing/alternative/CircularWorkStealingDequeWithThreadLocalSentinelTest.java
@@ -29,6 +29,6 @@ public class CircularWorkStealingDequeWithThreadLocalSentinelTest {
}
this.stopWatch.end();
- Assert.assertThat(this.stopWatch.getDuration(), OrderingComparison.lessThan(UntypedCircularWorkStealingDequeTest.EXPECTED_DURATION));
+ Assert.assertThat(this.stopWatch.getDurationInNs(), OrderingComparison.lessThan(UntypedCircularWorkStealingDequeTest.EXPECTED_DURATION_IN_NS));
}
}
diff --git a/src/test/java/teetime/util/concurrent/workstealing/alternative/ExceptionalCircularWorkStealingDequeTest.java b/src/test/java/teetime/util/concurrent/workstealing/alternative/ExceptionalCircularWorkStealingDequeTest.java
index 89f5c97c..21858b03 100644
--- a/src/test/java/teetime/util/concurrent/workstealing/alternative/ExceptionalCircularWorkStealingDequeTest.java
+++ b/src/test/java/teetime/util/concurrent/workstealing/alternative/ExceptionalCircularWorkStealingDequeTest.java
@@ -34,6 +34,6 @@ public class ExceptionalCircularWorkStealingDequeTest {
}
this.stopWatch.end();
- Assert.assertThat(this.stopWatch.getDuration(), OrderingComparison.lessThan(UntypedCircularWorkStealingDequeTest.EXPECTED_DURATION));
+ Assert.assertThat(this.stopWatch.getDurationInNs(), OrderingComparison.lessThan(UntypedCircularWorkStealingDequeTest.EXPECTED_DURATION_IN_NS));
}
}
diff --git a/src/test/java/teetime/util/concurrent/workstealing/alternative/UntypedCircularWorkStealingDequeTest.java b/src/test/java/teetime/util/concurrent/workstealing/alternative/UntypedCircularWorkStealingDequeTest.java
index 2f5bd5a5..aedc786b 100644
--- a/src/test/java/teetime/util/concurrent/workstealing/alternative/UntypedCircularWorkStealingDequeTest.java
+++ b/src/test/java/teetime/util/concurrent/workstealing/alternative/UntypedCircularWorkStealingDequeTest.java
@@ -10,7 +10,7 @@ import teetime.util.StopWatch;
public class UntypedCircularWorkStealingDequeTest {
public static final int NUM_ITERATIONS = 100000000;
- public static final long EXPECTED_DURATION = 1100;
+ public static final long EXPECTED_DURATION_IN_NS = 1100*1000*1000;
private StopWatch stopWatch;
@@ -30,6 +30,6 @@ public class UntypedCircularWorkStealingDequeTest {
}
this.stopWatch.end();
- Assert.assertThat(this.stopWatch.getDuration(), OrderingComparison.lessThan(UntypedCircularWorkStealingDequeTest.EXPECTED_DURATION));
+ Assert.assertThat(this.stopWatch.getDurationInNs(), OrderingComparison.lessThan(UntypedCircularWorkStealingDequeTest.EXPECTED_DURATION_IN_NS));
}
}
diff --git a/src/test/java/teetime/util/concurrent/workstealing/alternative/UntypedExceptionalCircularWorkStealingDequeTest.java b/src/test/java/teetime/util/concurrent/workstealing/alternative/UntypedExceptionalCircularWorkStealingDequeTest.java
index cc77fff3..8ed614d1 100644
--- a/src/test/java/teetime/util/concurrent/workstealing/alternative/UntypedExceptionalCircularWorkStealingDequeTest.java
+++ b/src/test/java/teetime/util/concurrent/workstealing/alternative/UntypedExceptionalCircularWorkStealingDequeTest.java
@@ -36,7 +36,7 @@ public class UntypedExceptionalCircularWorkStealingDequeTest {
}
this.stopWatch.end();
- Assert.assertThat(this.stopWatch.getDuration(), OrderingComparison.lessThan(UntypedCircularWorkStealingDequeTest.EXPECTED_DURATION));
+ Assert.assertThat(this.stopWatch.getDurationInNs(), OrderingComparison.lessThan(UntypedCircularWorkStealingDequeTest.EXPECTED_DURATION_IN_NS));
Assert.assertThat(counter, OrderingComparison.comparesEqualTo(UntypedCircularWorkStealingDequeTest.NUM_ITERATIONS));
}
}
--
GitLab