control: Separate zone creation from enabling
Separate a zone object being created from its JSON configuration and
when the zone is enabled and active. This will allow support of the use
of SIGHUP to reload the zone configuration since the zones JSON
configuration must successfully be loaded before the newly created zones
can be enabled in place of the currently enabled zones.
Change-Id: Iea6fd632898d94f3702d2b00e2ddb7f771af9168
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
diff --git a/control/json/manager.cpp b/control/json/manager.cpp
index d0c254b..a519836 100644
--- a/control/json/manager.cpp
+++ b/control/json/manager.cpp
@@ -70,7 +70,6 @@
// Load the zone configurations
_zones = getConfig<Zone>(false, event, this);
-
// Load the fan configurations and move each fan into its zone
auto fans = getConfig<Fan>(false);
for (auto& fan : fans)
@@ -92,6 +91,9 @@
itZone->second->addFan(std::move(fan.second));
}
}
+ // Enable zones
+ std::for_each(_zones.begin(), _zones.end(),
+ [](const auto& entry) { entry.second->enable(); });
// Load any events configured and enable
_events = getConfig<Event>(true, this, _zones);
diff --git a/control/json/zone.cpp b/control/json/zone.cpp
index bf11cba..d7d1a90 100644
--- a/control/json/zone.cpp
+++ b/control/json/zone.cpp
@@ -74,7 +74,10 @@
{
setInterfaces(jsonObj);
}
+}
+void Zone::enable()
+{
// Restore thermal control current mode state
restoreCurrentMode();
diff --git a/control/json/zone.hpp b/control/json/zone.hpp
index 670781b..6ed90f8 100644
--- a/control/json/zone.hpp
+++ b/control/json/zone.hpp
@@ -185,6 +185,14 @@
}
/**
+ * @brief Enable the zone
+ *
+ * Performs the necessary tasks to enable the zone such as restoring any
+ * dbus property states(if persisted), starting the decrement timer, etc...
+ */
+ void enable();
+
+ /**
* @brief Add a fan object to the zone
*
* @param[in] fan - Unique pointer to a fan object that will be moved into