commit ac18e14faca3eee1ee6f2ff7178e213b58102de8
author Yoo, Jae Hyun <jae.hyun.yoo@intel.com> Tue Oct 09 16:38:58 2018 -0700
committer Ed Tanous <ed.tanous@intel.com> Fri Nov 16 18:55:52 2018 +0000
tree 538bc6b9f8e52255927cb5d9532e6067da1a411e
parent af79dd3e757bfedab64b3c8232f7cb3d2b9ef3e9

Fix threshold parsing logic of CPU sensors

This commit fixes threshold parsing logic of CPU sensors to make
a sensor can be registered even in case there is no threshold
setting.

Change-Id: I95641fb37472b65e8bf70925605b41c66bdad60f
Signed-off-by: Yoo, Jae Hyun <jae.hyun.yoo@intel.com>

sensors/include/Thresholds.hpp

diff --git a/sensors/include/Thresholds.hpp b/sensors/include/Thresholds.hpp
index 90e148c..1a6f752 100644
--- a/sensors/include/Thresholds.hpp
+++ b/sensors/include/Thresholds.hpp
@@ -37,7 +37,7 @@
 
 bool ParseThresholdsFromAttr(std::vector<thresholds::Threshold> &thresholds,
                              const std::string &input_path,
-                             const double scale_factor);
+                             const double &scale_factor);
 bool HasCriticalInterface(
     const std::vector<thresholds::Threshold> &threshold_vector);
 

sensors/src/CPUSensorMain.cpp

diff --git a/sensors/src/CPUSensorMain.cpp b/sensors/src/CPUSensorMain.cpp
index d6d68ad..80f3f1c 100644
--- a/sensors/src/CPUSensorMain.cpp
+++ b/sensors/src/CPUSensorMain.cpp
@@ -212,17 +212,15 @@
             std::string sensorName = label + " CPU" + std::to_string(cpuId);
             std::vector<thresholds::Threshold> sensorThresholds;
             std::string labelHead = label.substr(0, label.find(" "));
-            if (!ParseThresholdsFromConfig(*sensorData, sensorThresholds,
-                                           &labelHead))
-            {
-                continue;
-            }
+            ParseThresholdsFromConfig(*sensorData, sensorThresholds,
+                                      &labelHead);
             if (!sensorThresholds.size())
             {
                 if (!ParseThresholdsFromAttr(sensorThresholds, inputPathStr,
                                              CPUSensor::SENSOR_SCALE_FACTOR))
                 {
-                    continue;
+                    std::cerr << "error populating thresholds for "
+                              << sensorName << "\n";
                 }
             }
             sensors[sensorName] = std::make_unique<CPUSensor>(

sensors/src/Thresholds.cpp

diff --git a/sensors/src/Thresholds.cpp b/sensors/src/Thresholds.cpp
index b792a9b..c40d35d 100644
--- a/sensors/src/Thresholds.cpp
+++ b/sensors/src/Thresholds.cpp
@@ -253,7 +253,7 @@
 
 bool ParseThresholdsFromAttr(
     std::vector<thresholds::Threshold> &threshold_vector,
-    const std::string &input_path, const double scale_factor)
+    const std::string &input_path, const double &scale_factor)
 {
     for (auto &type : ATTR_TYPES)
     {