commit c62a5548a1caa7a76aec8a7e0d5fdfeff1ae8db8
author Vijay Khemka <vijaykhemka@fb.com> Thu Sep 10 14:45:49 2020 -0700
committer Patrick Williams <patrick@stwcx.xyz> Mon Oct 12 20:05:18 2020 +0000
tree 6e4f1b5a8443c1f7e61c39a46700ee7f6bb8d6a0
parent 51f898e223ac59d8cee7f0eb5e606cc50ca2afa9

Fix threshold data copy

Removed storing threshold data in the class as it is being stored
in sensor threshold object.

Signed-off-by: Vijay Khemka <vijaykhemka@fb.com>
Change-Id: I86a96c576531c3c2fd62110792791ab2083012ab

virtualSensor.cpp

diff --git a/virtualSensor.cpp b/virtualSensor.cpp
index c8b70ab..fb6d456 100644
--- a/virtualSensor.cpp
+++ b/virtualSensor.cpp
@@ -81,6 +81,7 @@
     auto threshold = sensorConfig.value("Threshold", empty);
     if (!threshold.empty())
     {
+        Threshold sensorThreshold;
         sensorThreshold.criticalHigh =
             threshold.value("CriticalHigh", defaultHighThreshold);
         sensorThreshold.criticalLow =
@@ -89,10 +90,10 @@
             threshold.value("WarningHigh", defaultHighThreshold);
         sensorThreshold.warningLow =
             threshold.value("WarningLow", defaultLowThreshold);
-    }
 
-    /* Set threshold value to dbus */
-    setSensorThreshold();
+        /* Set threshold value to dbus */
+        setSensorThreshold(sensorThreshold);
+    }
 
     /* Get expression string */
     exprStr = sensorConfig.value("Expression", "");
@@ -167,7 +168,7 @@
     ValueIface::value(value);
 }
 
-void VirtualSensor::setSensorThreshold()
+void VirtualSensor::setSensorThreshold(Threshold& sensorThreshold)
 {
     CriticalInterface::criticalHigh(sensorThreshold.criticalHigh);
     CriticalInterface::criticalLow(sensorThreshold.criticalLow);

virtualSensor.hpp

diff --git a/virtualSensor.hpp b/virtualSensor.hpp
index c8fd04c..4f9de19 100644
--- a/virtualSensor.hpp
+++ b/virtualSensor.hpp
@@ -110,8 +110,6 @@
     sdbusplus::bus::bus& bus;
     /** @brief Expression string for virtual sensor value calculations */
     std::string exprStr;
-    /** @brief Sensor Threshold config values */
-    struct Threshold sensorThreshold;
     /** @brief symbol table from exprtk */
     exprtk::symbol_table<double> symbols{};
     /** @brief expression from exprtk to calculate sensor value */
@@ -122,7 +120,7 @@
      */
     void initVirtualSensor(const Json& sensorConfig);
     /** @brief Set Sensor Threshold to D-bus at beginning */
-    void setSensorThreshold();
+    void setSensorThreshold(Threshold& sensorThreshold);
 };
 
 class VirtualSensors