From 273177eb8f406e4891f5de00b79890c0d7d27e3c Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Thu, 10 Sep 2020 09:59:26 -0500
Subject: [PATCH] add improvements from oshi maintainer recommendations

---
 .../engine/api/activityimpl/CpuInfo.java         | 16 +++++++---------
 mvn-defaults/pom.xml                             |  3 +--
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/CpuInfo.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/CpuInfo.java
index 8b624b0c8..84b293d3c 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/CpuInfo.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/CpuInfo.java
@@ -17,16 +17,14 @@
 
 package io.nosqlbench.engine.api.activityimpl;
 
-import oshi.SystemInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import oshi.SystemInfo;
 import oshi.hardware.CentralProcessor;
 import oshi.hardware.HardwareAbstractionLayer;
 
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.*;
+import java.util.DoubleSummaryStatistics;
+import java.util.Optional;
 
 public class CpuInfo {
     private final static Logger logger = LoggerFactory.getLogger(CpuInfo.class);
@@ -61,8 +59,8 @@ public class CpuInfo {
         }
 
         public String getMhz() {
-            // or use processor.getCurrentFreq, and average, or min?
-            return Long.toString(processor.getMaxFreq()/ (1024*1024));
+            double vendorFreq = processor.getProcessorIdentifier().getVendorFreq();
+            return String.valueOf((long) (vendorFreq/1E6));
         }
 
         public String toString() {
@@ -84,8 +82,8 @@ public class CpuInfo {
         public double getCurrentSpeed(int cpu) {
             double curFreq = getCurFreq(cpu);
             double maxFreq = getMaxFreq(cpu);
-            if (Double.isNaN(curFreq) || Double.isNaN(maxFreq)) {
-                return Double.NaN;
+            if (curFreq < 0 || maxFreq < 0) {
+                return -1;
             }
             return curFreq / maxFreq;
         }
diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml
index 98a6a26a2..e4a953295 100644
--- a/mvn-defaults/pom.xml
+++ b/mvn-defaults/pom.xml
@@ -51,7 +51,6 @@
         <netty.version>4.1.47.Final</netty.version>
         <!--        <netty.version>4.1.31.Final</netty.version>-->
         <number.to.words.version>1.0.0</number.to.words.version>
-        <oshi.version>4.5.0</oshi.version>
         <slf4j.version>1.7.29</slf4j.version>
         <snakeyaml.version>1.23</snakeyaml.version>
         <snappy.version>1.1.2.6</snappy.version>
@@ -269,7 +268,7 @@
             <dependency>
                 <groupId>com.github.oshi</groupId>
                 <artifactId>oshi-core</artifactId>
-                <version>${oshi.version}</version>
+                <version>5.2.2</version>
             </dependency>
 
             <dependency>