commit bb1c7d30d6799b4e0fcd0b3fc4f97be9a253e6c0
author Ed Tanous <etanous@nvidia.com> Sun Feb 09 09:39:19 2025 -0800
committer Ed Tanous <etanous@nvidia.com> Thu Feb 13 10:22:09 2025 -0800
tree 289c0dda3698debac9eb9e9476edb015bf188750
parent 9a56031931c498ea44abf006540b9a243bbd0574

Break out dbus utilities into compile unit

ClangBuildAnalyzer shows that each of these dbus calls is relatively
expensive to compile, so put them in their own compile unit so they can
be compiled separately.

Tested: Redfish service validator passes

Change-Id: Ia383611182d8bc93c125248c4196898cb51fd807
Signed-off-by: Ed Tanous <etanous@nvidia.com>

include/dbus_privileges.hpp

diff --git a/include/dbus_privileges.hpp b/include/dbus_privileges.hpp
index a2bdd1f..9b12244 100644
--- a/include/dbus_privileges.hpp
+++ b/include/dbus_privileges.hpp
@@ -18,6 +18,7 @@
 #include <boost/url/format.hpp>
 #include <sdbusplus/unpack_properties.hpp>
 
+#include <functional>
 #include <memory>
 #include <optional>
 #include <string>
@@ -132,13 +133,14 @@
     return true;
 }
 
-template <typename CallbackFn>
-void requestUserInfo(const std::string& username,
-                     const std::shared_ptr<bmcweb::AsyncResp>& asyncResp,
-                     CallbackFn&& callback)
+inline void requestUserInfo(
+    const std::string& username,
+    const std::shared_ptr<bmcweb::AsyncResp>& asyncResp,
+    std::move_only_function<void(const dbus::utility::DBusPropertiesMap&)>&&
+        callback)
 {
     crow::connections::systemBus->async_method_call(
-        [asyncResp, callback = std::forward<CallbackFn>(callback)](
+        [asyncResp, callback = std::move(callback)](
             const boost::system::error_code& ec,
             const dbus::utility::DBusPropertiesMap& userInfoMap) mutable {
             if (ec)
@@ -154,10 +156,10 @@
         "xyz.openbmc_project.User.Manager", "GetUserInfo", username);
 }
 
-template <typename CallbackFn>
-void validatePrivilege(const std::shared_ptr<Request>& req,
-                       const std::shared_ptr<bmcweb::AsyncResp>& asyncResp,
-                       BaseRule& rule, CallbackFn&& callback)
+inline void validatePrivilege(
+    const std::shared_ptr<Request>& req,
+    const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, BaseRule& rule,
+    std::move_only_function<void()>&& callback)
 {
     if (req->session == nullptr)
     {
@@ -166,7 +168,7 @@
 
     requestUserInfo(
         req->session->username, asyncResp,
-        [req, asyncResp, &rule, callback = std::forward<CallbackFn>(callback)](
+        [req, asyncResp, &rule, callback = std::move(callback)](
             const dbus::utility::DBusPropertiesMap& userInfoMap) mutable {
             if (afterGetUserInfoValidate(*req, asyncResp, rule, userInfoMap))
             {
@@ -175,16 +177,15 @@
         });
 }
 
-template <typename CallbackFn>
-void getUserInfo(const std::shared_ptr<bmcweb::AsyncResp>& asyncResp,
-                 const std::string& username,
-                 std::shared_ptr<persistent_data::UserSession>& session,
-                 CallbackFn&& callback)
+inline void getUserInfo(const std::shared_ptr<bmcweb::AsyncResp>& asyncResp,
+                        const std::string& username,
+                        std::shared_ptr<persistent_data::UserSession>& session,
+                        std::move_only_function<void()>&& callback)
 {
     requestUserInfo(
         username, asyncResp,
-        [asyncResp, session, callback = std::forward<CallbackFn>(callback)](
-            const dbus::utility::DBusPropertiesMap& userInfoMap) {
+        [asyncResp, session, callback = std::move(callback)](
+            const dbus::utility::DBusPropertiesMap& userInfoMap) mutable {
             if (!populateUserInfo(*session, userInfoMap))
             {
                 BMCWEB_LOG_ERROR("Failed to populate user information");