commit b7e083ea32f6997ad32cbfcfd6f0909dc0beaf83
author Tom Joseph <rushtotom@gmail.com> Tue Oct 26 15:10:03 2021 +0530
committer Tom Joseph <rushtotom@gmail.com> Sun Oct 31 10:21:38 2021 +0000
tree de0f3a809e75659705b16235aa8dfe6b4b7fd39b
parent fb3bc06f607d87da2588aefa116d75b2127d255a

fw-update : Optimize passing infra parameters

Refactor UpdateManager and DeviceUpdater to optimize passing the D-Bus event
loop handle, handler for requester and instance ID requester.

Signed-off-by: Tom Joseph <rushtotom@gmail.com>
Change-Id: I1860ffc49513d941af372423a197b1d42eda6e36

fw-update/device_updater.hpp

diff --git a/fw-update/device_updater.hpp b/fw-update/device_updater.hpp
index 95f8adf..03ee0c3 100644
--- a/fw-update/device_updater.hpp
+++ b/fw-update/device_updater.hpp
@@ -35,9 +35,6 @@
     /** @brief Constructor
      *
      *  @param[in] eid - Endpoint ID of the firmware device
-     *  @param[in] event - PLDM daemon's main event loop
-     *  @param[in] requester - Instance ID manager for PLDM requests
-     *  @param[in] handler - PLDM request handler
      *  @param[in] package - File stream for firmware update package
      *  @param[in] fwDeviceIDRecord - FirmwareDeviceIDRecord in the fw update
      *                                package that matches this firmware device
@@ -50,19 +47,16 @@
      *  @param[in] updateManager - To update the status of fw update of the
      *                             device
      */
-    explicit DeviceUpdater(
-        mctp_eid_t eid, sdeventplus::Event& event,
-        pldm::dbus_api::Requester& requester,
-        pldm::requester::Handler<pldm::requester::Request>& handler,
-        std::ifstream& package, const FirmwareDeviceIDRecord& fwDeviceIDRecord,
-        const ComponentImageInfos& compImageInfos,
-        const ComponentInfo& compInfo, uint32_t maxTransferSize,
-        UpdateManager* updateManager) :
+    explicit DeviceUpdater(mctp_eid_t eid, std::ifstream& package,
+                           const FirmwareDeviceIDRecord& fwDeviceIDRecord,
+                           const ComponentImageInfos& compImageInfos,
+                           const ComponentInfo& compInfo,
+                           uint32_t maxTransferSize,
+                           UpdateManager* updateManager) :
         eid(eid),
-        event(event), requester(requester), handler(handler), package(package),
-        fwDeviceIDRecord(fwDeviceIDRecord), compImageInfos(compImageInfos),
-        compInfo(compInfo), maxTransferSize(maxTransferSize),
-        updateManager(updateManager)
+        package(package), fwDeviceIDRecord(fwDeviceIDRecord),
+        compImageInfos(compImageInfos), compInfo(compInfo),
+        maxTransferSize(maxTransferSize), updateManager(updateManager)
     {}
 
     /** @brief Start the firmware update flow for the FD
@@ -179,15 +173,6 @@
     /** @brief Endpoint ID of the firmware device */
     mctp_eid_t eid;
 
-    /** @brief PLDM daemon's main event loop */
-    sdeventplus::Event& event;
-
-    /** @brief Instance ID manager for PLDM requests */
-    pldm::dbus_api::Requester& requester;
-
-    /** @brief PLDM request handler */
-    pldm::requester::Handler<pldm::requester::Request>& handler;
-
     /** @brief File stream for firmware update package */
     std::ifstream& package;