Make fewer copies
There are apparently places where we make complete copies of the request
structure, including the body data within it. Recently,
59b98b2222fddbea3d6f678d9e94006521f0c381 came along and made the size of
the Request structure include the body payload. This is good for object
ownership, but bad for code that wants to make a copy.
This commit tries to do something less insane, and construct the Payload
object (which only really includes the http headers, uri and method)
before jumping into callback hell, thus meaning that the Payload object
is copied 4 times instead of the Request object.
Tested:
Code compiles. Deleted the boost::beast::http::message copy
constructor, and observed that new code now compiles without needing a
copy.
Signed-off-by: Ed Tanous <edtanous@google.com>
Change-Id: Ie81bade61fb1f6f392b163f98c84540e09a26690
diff --git a/redfish-core/lib/update_service.hpp b/redfish-core/lib/update_service.hpp
index 663d48b..e420130 100644
--- a/redfish-core/lib/update_service.hpp
+++ b/redfish-core/lib/update_service.hpp
@@ -65,7 +65,7 @@
static void
softwareInterfaceAdded(const std::shared_ptr<bmcweb::AsyncResp>& asyncResp,
sdbusplus::message::message& m,
- const crow::Request& req)
+ task::Payload&& payload)
{
std::vector<std::pair<
std::string,
@@ -85,10 +85,11 @@
{
// Retrieve service and activate
crow::connections::systemBus->async_method_call(
- [objPath, asyncResp,
- req](const boost::system::error_code errorCode,
- const std::vector<std::pair<
- std::string, std::vector<std::string>>>& objInfo) {
+ [objPath, asyncResp, payload(std::move(payload))](
+ const boost::system::error_code errorCode,
+ const std::vector<
+ std::pair<std::string, std::vector<std::string>>>&
+ objInfo) mutable {
if (errorCode)
{
BMCWEB_LOG_DEBUG << "error_code = " << errorCode;
@@ -243,7 +244,7 @@
objPath.str + "'");
task->startTimer(std::chrono::minutes(5));
task->populateResp(asyncResp->res);
- task->payload.emplace(req);
+ task->payload.emplace(std::move(payload));
}
fwUpdateInProgress = false;
},
@@ -300,10 +301,11 @@
redfish::messages::internalError(asyncResp->res);
}
});
-
- auto callback = [asyncResp, req](sdbusplus::message::message& m) {
+ task::Payload payload(req);
+ auto callback = [asyncResp,
+ payload](sdbusplus::message::message& m) mutable {
BMCWEB_LOG_DEBUG << "Match fired";
- softwareInterfaceAdded(asyncResp, m, req);
+ softwareInterfaceAdded(asyncResp, m, std::move(payload));
};
fwUpdateInProgress = true;