commit 9403a21718528dd0793fcb7048f3fad1a2c471dd
author Matthew Barth <msbarth@us.ibm.com> Mon May 17 09:31:50 2021 -0500
committer Matthew Barth <msbarth@us.ibm.com> Thu Jun 10 16:07:01 2021 -0500
tree 431841d12b9ff056c11c94a3d6078ed36442b4c3
parent e6d1f781226af3dc78397561d2ea4dd662811c0b

control: Switch to using static instance of bus

Update main to use the static reference of the bus from
util::SDBusPlus.getBus() and have each object that needs the bus call
that same util::SDBusPlus.getBus() function to retrieve the same static
reference.

Change-Id: Icd5a0e61819bf1bec8b46daae05443fdcc542b05
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>

control/json/manager.cpp

diff --git a/control/json/manager.cpp b/control/json/manager.cpp
index 2365a7d..3653300 100644
--- a/control/json/manager.cpp
+++ b/control/json/manager.cpp
@@ -23,6 +23,7 @@
 #include "group.hpp"
 #include "json_config.hpp"
 #include "profile.hpp"
+#include "sdbusplus.hpp"
 #include "zone.hpp"
 
 #include <nlohmann/json.hpp>
@@ -53,12 +54,12 @@
          std::map<std::string, std::map<std::string, PropertyVariantType>>>
     Manager::_objects;
 
-Manager::Manager(sdbusplus::bus::bus& bus, const sdeventplus::Event& event) :
-    _bus(bus), _event(event)
+Manager::Manager(const sdeventplus::Event& event) :
+    _bus(util::SDBusPlus::getBus()), _event(event)
 {
     // Manager JSON config file is optional
     auto confFile =
-        fan::JsonConfig::getConfFile(bus, confAppName, confFileName, true);
+        fan::JsonConfig::getConfFile(_bus, confAppName, confFileName, true);
     if (!confFile.empty())
     {
         _jsonObj = fan::JsonConfig::load(confFile);
@@ -68,10 +69,10 @@
     setProfiles();
 
     // Load the zone configurations
-    _zones = getConfig<Zone>(false, bus, event, this);
+    _zones = getConfig<Zone>(false, event, this);
 
     // Load the fan configurations and move each fan into its zone
-    auto fans = getConfig<Fan>(false, bus);
+    auto fans = getConfig<Fan>(false);
     for (auto& fan : fans)
     {
         configKey fanProfile =
@@ -93,12 +94,12 @@
     }
 
     // Load the configured groups that are copied into events where they're used
-    auto groups = getConfig<Group>(true, bus);
+    auto groups = getConfig<Group>(true);
 
     // Load any events configured
-    _events = getConfig<Event>(true, bus, this, groups, _zones);
+    _events = getConfig<Event>(true, this, groups, _zones);
 
-    bus.request_name(CONTROL_BUSNAME);
+    _bus.request_name(CONTROL_BUSNAME);
 }
 
 const std::vector<std::string>& Manager::getActiveProfiles()