commit 9a25ed407ce8ed21d379ce273f67892689480250
author James Feist <james.feist@linux.intel.com> Tue Oct 15 15:43:44 2019 -0700
committer James Feist <james.feist@linux.intel.com> Tue Oct 15 23:02:16 2019 +0000
tree 4553977aa87914011a4b79cdfd64dfa38270ec88
parent 1a70a588dc6d57e68e684a789f46178efeeaf1cb

exitAir: Remove 'this' captures

'this' captures cause race conditions in matches and
async calls. Use shared_from_this() instead. Also move
cfmSensor storage into global space so they work without
an exitAirSensor

Tested: Removed exit air sensor and sensor list worked.
Also tested works on system with exit air sensor.

Change-Id: Iabbf5393fbf07f7d19ef104e87c37bc172c202e4
Signed-off-by: James Feist <james.feist@linux.intel.com>

include/ExitAirTempSensor.hpp

diff --git a/include/ExitAirTempSensor.hpp b/include/ExitAirTempSensor.hpp
index 70c3f68..2142923 100644
--- a/include/ExitAirTempSensor.hpp
+++ b/include/ExitAirTempSensor.hpp
@@ -7,7 +7,7 @@
 #include <vector>
 
 struct ExitAirTempSensor;
-struct CFMSensor : public Sensor
+struct CFMSensor : public Sensor, std::enable_shared_from_this<CFMSensor>
 {
     std::vector<std::string> tachs;
     double c1;
@@ -27,7 +27,9 @@
 
     bool calculate(double&);
     void updateReading(void);
+    void setupMatches(void);
     void createMaxCFMIface(void);
+    void addTachRanges(const std::string& serviceName, const std::string& path);
     void checkThresholds(void) override;
     uint64_t getMaxRpm(uint64_t cfmMax);
 
@@ -40,10 +42,10 @@
     std::shared_ptr<sdbusplus::asio::dbus_interface> pwmLimitIface;
     std::shared_ptr<sdbusplus::asio::dbus_interface> cfmLimitIface;
     sdbusplus::asio::object_server& objServer;
-    void addTachRanges(const std::string& serviceName, const std::string& path);
 };
 
-struct ExitAirTempSensor : public Sensor
+struct ExitAirTempSensor : public Sensor,
+                           std::enable_shared_from_this<ExitAirTempSensor>
 {
 
     double powerFactorMin;
@@ -57,7 +59,6 @@
     // todo: make this private once we don't have to hack in a reading
     boost::container::flat_map<std::string, double> powerReadings;
 
-    std::vector<std::unique_ptr<CFMSensor>> cfmSensors;
     ExitAirTempSensor(std::shared_ptr<sdbusplus::asio::connection>& conn,
                       const std::string& name,
                       const std::string& sensorConfiguration,
@@ -67,6 +68,7 @@
 
     void checkThresholds(void) override;
     void updateReading(void);
+    void setupMatches(void);
 
   private:
     double lastReading;
@@ -79,5 +81,4 @@
     std::chrono::time_point<std::chrono::system_clock> lastTime;
     double getTotalCFM(void);
     bool calculate(double& val);
-    void setupMatches(void);
 };