From ecb51e8c1d1703e923f36318d57e0013aefd9f77 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Fri, 17 Oct 2014 07:20:58 +0000
Subject: [PATCH] OPENDJ-1549: xxxrate tools warmup duration does not clear etimes * com.forgerock.opendj.ldap.tools.PerformanceRunner ** Makes the ResponseTimeBuckets inner class package private to allow unit tests. * com.forgerock.opendj.ldap.tools.PerformanceRunnerStatsTestCase ** Adds a simple black box unit test to control PerformanceRunner eTimes calculation.
---
opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PerformanceRunner.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PerformanceRunner.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PerformanceRunner.java
index feb78b2..50e0795 100644
--- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PerformanceRunner.java
+++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PerformanceRunner.java
@@ -71,7 +71,7 @@
* Benchmark application framework.
*/
abstract class PerformanceRunner implements ConnectionEventListener {
- private static final class ResponseTimeBuckets {
+ static final class ResponseTimeBuckets {
private static final long NS_1_US = NANOSECONDS.convert(1, MICROSECONDS);
private static final long NS_100_US = NANOSECONDS.convert(100, MICROSECONDS);
private static final long NS_1_MS = NANOSECONDS.convert(1, MILLISECONDS);
@@ -158,7 +158,7 @@
* @return array of response times in microseconds corresponding to
* percentiles.
*/
- private List<Long> getPercentile(double[] percentiles, long nbData) {
+ List<Long> getPercentile(double[] percentiles, long nbData) {
List<Long> responseTimes = new ArrayList<Long>();
Queue<Long> nbDataThresholds = new LinkedList<Long>();
long nbDataSum = nbData;
@@ -187,13 +187,13 @@
private void computePercentiles(Queue<Long> currentDataThreshold, List<Long> responseTimes, long currentSum,
long currentETime) {
- while (currentDataThreshold.peek() != null && currentDataThreshold.peek() > currentSum) {
+ while (currentDataThreshold.peek() != null && currentDataThreshold.peek() >= currentSum) {
responseTimes.add(currentETime);
currentDataThreshold.poll();
}
}
- private void addTimeToInterval(long responseTimeNanoSecs) {
+ void addTimeToInterval(long responseTimeNanoSecs) {
if (responseTimeNanoSecs >= NS_5_S) {
long matchingKey = responseTimeNanoSecs / NS_100_MS;
matchingKey -= matchingKey % 5;
@@ -226,6 +226,11 @@
}
}
+ //To allow tests
+ static ResponseTimeBuckets getResponseTimeBuckets() {
+ return new ResponseTimeBuckets();
+ }
+
/**
* Statistics thread base implementation.
--
Gitblit v1.10.0