commit e35d0acb7ee1eca993964fec39ca04e4ebc96ce1
author Andrew Jeffery <andrew@aj.id.au> Thu Mar 24 15:53:13 2022 +1030
committer Andrew Jeffery <andrew@aj.id.au> Tue Mar 29 17:52:03 2022 +1030
tree 6213d52e7a1f1a998ad35329cefe75f05d0e25ef
parent 7c4cbbe7ef77954ca5f3b7a546c515c454081029

EntityManager: Extract publishNewConfiguration()

Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Change-Id: Icac8bee4cc7830ec203782372a3f79ff43413212

src/EntityManager.cpp

diff --git a/src/EntityManager.cpp b/src/EntityManager.cpp
index cd748df..d69af0b 100644
--- a/src/EntityManager.cpp
+++ b/src/EntityManager.cpp
@@ -38,6 +38,7 @@
 #include <charconv>
 #include <filesystem>
 #include <fstream>
+#include <functional>
 #include <iostream>
 #include <map>
 #include <regex>
@@ -961,6 +962,38 @@
     }
 }
 
+static void publishNewConfiguration(
+    const size_t& instance, const size_t count,
+    boost::asio::steady_timer& timer, nlohmann::json& systemConfiguration,
+    // Gerrit discussion:
+    // https://gerrit.openbmc-project.xyz/c/openbmc/entity-manager/+/52316/6
+    //
+    // Discord discussion:
+    // https://discord.com/channels/775381525260664832/867820390406422538/958048437729910854
+    //
+    // NOLINTNEXTLINE(performance-unnecessary-value-param)
+    const nlohmann::json newConfiguration,
+    sdbusplus::asio::object_server& objServer)
+{
+    loadOverlays(newConfiguration);
+
+    io.post([systemConfiguration]() {
+        if (!writeJsonFiles(systemConfiguration))
+        {
+            std::cerr << "Error writing json files\n";
+        }
+    });
+
+    io.post([&instance, count, &timer, newConfiguration, &systemConfiguration,
+             &objServer]() {
+        postToDbus(newConfiguration, systemConfiguration, objServer);
+        if (count == instance)
+        {
+            startRemovedTimer(timer, systemConfiguration);
+        }
+    });
+}
+
 // main properties changed entry
 void propertiesChangedCallback(nlohmann::json& systemConfiguration,
                                sdbusplus::asio::object_server& objServer)
@@ -1032,26 +1065,10 @@
 
                 inProgress = false;
 
-                io.post([count, newConfiguration, &systemConfiguration,
-                         &objServer]() {
-                    loadOverlays(newConfiguration);
-
-                    io.post([&systemConfiguration]() {
-                        if (!writeJsonFiles(systemConfiguration))
-                        {
-                            std::cerr << "Error writing json files\n";
-                        }
-                    });
-                    io.post([count, newConfiguration, &systemConfiguration,
-                             &objServer]() {
-                        postToDbus(newConfiguration, systemConfiguration,
-                                   objServer);
-                        if (count == instance)
-                        {
-                            startRemovedTimer(timer, systemConfiguration);
-                        }
-                    });
-                });
+                io.post(std::bind_front(
+                    publishNewConfiguration, std::ref(instance), count,
+                    std::ref(timer), std::ref(systemConfiguration),
+                    newConfiguration, std::ref(objServer)));
             });
         perfScan->run();
     });