commit ea4ff02bf4930d4f20add6200335aa3884c51700
author Andrew Jeffery <andrew@aj.id.au> Thu Apr 21 12:31:40 2022 +0930
committer Ed Tanous <edtanous@google.com> Tue May 10 09:49:00 2022 -0700
tree 46ca426f92ad5264eb1becd8c458ad861d9146dd
parent ae6c1a44787f3c9976684a85c095e7d8e961699a

PerformProbe: Invoke PerformScan::updateSystemConfiguration() directly

Drop the lambda we previously required.

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

include/EntityManager.hpp

diff --git a/include/EntityManager.hpp b/include/EntityManager.hpp
index 781d3a1..f443874 100644
--- a/include/EntityManager.hpp
+++ b/include/EntityManager.hpp
@@ -89,17 +89,15 @@
 // this class finds the needed dbus fields and on destruction runs the probe
 struct PerformProbe : std::enable_shared_from_this<PerformProbe>
 {
-    PerformProbe(
-        const std::vector<std::string>& probeCommand,
-        std::shared_ptr<PerformScan>& scanPtr,
-        std::function<void(FoundDevices&, const MapperGetSubTreeResponse&)>&&
-            callback);
+    PerformProbe(nlohmann::json& recordRef,
+                 const std::vector<std::string>& probeCommand,
+                 std::string probeName, std::shared_ptr<PerformScan>& scanPtr);
     virtual ~PerformProbe();
 
+    nlohmann::json& recordRef;
     std::vector<std::string> _probeCommand;
+    std::string probeName;
     std::shared_ptr<PerformScan> scan;
-    std::function<void(FoundDevices&, const MapperGetSubTreeResponse&)>
-        _callback;
 };
 
 inline void logDeviceAdded(const nlohmann::json& record)