From 891f8d0bd04e4a4018c354629cb960f0871de4a9 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Thu, 01 Oct 2015 17:01:56 +0000
Subject: [PATCH] OPENDJ-1910 Fix xxxrate tools stats
---
opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java
index 68172f7..75954aa 100644
--- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java
+++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java
@@ -26,8 +26,6 @@
*/
package com.forgerock.opendj.ldap.tools;
-import static java.util.Locale.ENGLISH;
-
import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static com.forgerock.opendj.cli.Utils.*;
import static com.forgerock.opendj.ldap.tools.ToolsMessages.*;
@@ -90,9 +88,9 @@
String[] getAdditionalColumns() {
invalidCredRecentCount.set(0);
if (extraColumn.length != 0) {
- final long searchWaitTime = searchWaitRecentTime.getAndSet(0);
- extraColumn[0] =
- String.format(ENGLISH, "%.1f", ((float) (waitTime - searchWaitTime) / waitTime) * 100.0);
+ final long searchWaitTimeNs = searchWaitRecentTimeNs.getAndSet(0);
+ extraColumn[0] = getDivisionResult(
+ 100 * (intervalWaitTimeNs - searchWaitTimeNs), intervalWaitTimeNs, 1, "-");
}
return extraColumn;
}
@@ -167,7 +165,7 @@
@Override
public Promise<BindResult, LdapException> apply(SearchResultEntry result)
throws LdapException {
- searchWaitRecentTime.getAndAdd(System.nanoTime() - startTime);
+ searchWaitRecentTimeNs.getAndAdd(System.nanoTime() - startTime);
if (data == null) {
data = new Object[1];
}
@@ -310,7 +308,7 @@
}
}
- private final AtomicLong searchWaitRecentTime = new AtomicLong();
+ private final AtomicLong searchWaitRecentTimeNs = new AtomicLong();
private final AtomicInteger invalidCredRecentCount = new AtomicInteger();
private String filter;
private String baseDN;
--
Gitblit v1.10.0