commit 2418a61f6b8554e91e5b816d0aba7603ccaa1b11
author Jonathan Doman <jonathan.doman@intel.com> Mon Feb 14 18:20:58 2022 -0800
committer Ed Tanous <ed@tanous.net> Mon Mar 21 04:16:11 2022 +0000
tree 351b7be59a84a7ba1a5c31f20e987ddd5df2b82f
parent de602c5ddadd00c44351f667bdbaaa87fba96224

Fix dangling references to powerIsOn

After refactoring powerIsOn to be not global, there were several
dangling references introduced. Make it a `const bool&` in all parameter
lists so that the various callbacks (and async thread) can safely access
its current value.

Signed-off-by: Jonathan Doman <jonathan.doman@intel.com>
Change-Id: Id86c0264cbbf91b0afdeb2f80d0103254fe160b4

src/FruDevice.cpp

diff --git a/src/FruDevice.cpp b/src/FruDevice.cpp
index dc7b77f..b1c4d1d 100644
--- a/src/FruDevice.cpp
+++ b/src/FruDevice.cpp
@@ -94,7 +94,7 @@
     boost::container::flat_map<
         std::pair<size_t, size_t>,
         std::shared_ptr<sdbusplus::asio::dbus_interface>>& dbusInterfaceMap,
-    size_t& unknownBusObjectCount, bool powerIsOn,
+    size_t& unknownBusObjectCount, const bool& powerIsOn,
     sdbusplus::asio::object_server& objServer,
     std::shared_ptr<sdbusplus::asio::connection>& systemBus);
 
@@ -352,7 +352,7 @@
 }
 
 int getBusFRUs(int file, int first, int last, int bus,
-               std::shared_ptr<DeviceMap> devices, bool powerIsOn,
+               std::shared_ptr<DeviceMap> devices, const bool& powerIsOn,
                sdbusplus::asio::object_server& objServer)
 {
 
@@ -531,7 +531,7 @@
 }
 
 static void findI2CDevices(const std::vector<fs::path>& i2cBuses,
-                           BusMap& busmap, bool powerIsOn,
+                           BusMap& busmap, const bool& powerIsOn,
                            sdbusplus::asio::object_server& objServer)
 {
     for (auto& i2cBus : i2cBuses)
@@ -604,7 +604,7 @@
     std::enable_shared_from_this<FindDevicesWithCallback>
 {
     FindDevicesWithCallback(const std::vector<fs::path>& i2cBuses,
-                            BusMap& busmap, bool powerIsOn,
+                            BusMap& busmap, const bool& powerIsOn,
                             sdbusplus::asio::object_server& objServer,
                             std::function<void(void)>&& callback) :
         _i2cBuses(i2cBuses),
@@ -622,7 +622,7 @@
 
     const std::vector<fs::path>& _i2cBuses;
     BusMap& _busMap;
-    bool _powerIsOn;
+    const bool& _powerIsOn;
     sdbusplus::asio::object_server& _objServer;
     std::function<void(void)> _callback;
 };
@@ -650,7 +650,7 @@
         std::pair<size_t, size_t>,
         std::shared_ptr<sdbusplus::asio::dbus_interface>>& dbusInterfaceMap,
     uint32_t bus, uint32_t address, size_t& unknownBusObjectCount,
-    bool powerIsOn, sdbusplus::asio::object_server& objServer,
+    const bool& powerIsOn, sdbusplus::asio::object_server& objServer,
     std::shared_ptr<sdbusplus::asio::connection>& systemBus)
 {
     boost::container::flat_map<std::string, std::string> formattedFRU;
@@ -937,7 +937,7 @@
     boost::container::flat_map<
         std::pair<size_t, size_t>,
         std::shared_ptr<sdbusplus::asio::dbus_interface>>& dbusInterfaceMap,
-    bool dbusCall, size_t& unknownBusObjectCount, bool powerIsOn,
+    bool dbusCall, size_t& unknownBusObjectCount, const bool& powerIsOn,
     sdbusplus::asio::object_server& objServer,
     std::shared_ptr<sdbusplus::asio::connection>& systemBus)
 {
@@ -997,7 +997,7 @@
     boost::container::flat_map<
         std::pair<size_t, size_t>,
         std::shared_ptr<sdbusplus::asio::dbus_interface>>& dbusInterfaceMap,
-    size_t& unknownBusObjectCount, bool powerIsOn,
+    size_t& unknownBusObjectCount, const bool& powerIsOn,
     sdbusplus::asio::object_server& objServer,
     std::shared_ptr<sdbusplus::asio::connection>& systemBus)
 {
@@ -1079,7 +1079,7 @@
     boost::container::flat_map<
         std::pair<size_t, size_t>,
         std::shared_ptr<sdbusplus::asio::dbus_interface>>& dbusInterfaceMap,
-    size_t& unknownBusObjectCount, bool powerIsOn,
+    size_t& unknownBusObjectCount, const bool& powerIsOn,
     sdbusplus::asio::object_server& objServer,
     std::shared_ptr<sdbusplus::asio::connection>& systemBus)
 {