diff options
author | Klaus Aehlig <klaus.aehlig@huawei.com> | 2022-02-28 13:24:26 +0100 |
---|---|---|
committer | Klaus Aehlig <klaus.aehlig@huawei.com> | 2022-03-01 10:46:54 +0100 |
commit | 1ef03a1c7043d617885d319b0803d69907c3c9cc (patch) | |
tree | acfcd33dab8e2355863356af88d14ac6e3578b2d /src/buildtool/common/action_description.hpp | |
parent | fffee539ec37e9e68189e71994aa2c901d30c9fb (diff) | |
download | justbuild-1ef03a1c7043d617885d319b0803d69907c3c9cc.tar.gz |
Pass actions and trees in analysis result as shared pointer
... to avoid unnecessary copying and moving of larger objects.
Diffstat (limited to 'src/buildtool/common/action_description.hpp')
-rw-r--r-- | src/buildtool/common/action_description.hpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/buildtool/common/action_description.hpp b/src/buildtool/common/action_description.hpp index 9b3469c1..f830eb82 100644 --- a/src/buildtool/common/action_description.hpp +++ b/src/buildtool/common/action_description.hpp @@ -2,6 +2,7 @@ #define INCLUDED_SRC_BUILDTOOL_COMMON_ACTION_DESCRIPTION_HPP #include <map> +#include <memory> #include <optional> #include <string> #include <unordered_map> @@ -15,6 +16,7 @@ class ActionDescription { public: using outputs_t = std::vector<std::string>; using inputs_t = std::unordered_map<std::string, ArtifactDescription>; + using Ptr = std::shared_ptr<ActionDescription>; ActionDescription(outputs_t output_files, outputs_t output_dirs, @@ -27,7 +29,7 @@ class ActionDescription { [[nodiscard]] static auto FromJson(std::string const& id, nlohmann::json const& desc) noexcept - -> std::optional<ActionDescription> { + -> std::optional<ActionDescription::Ptr> { try { auto outputs = ExtractValueAs<std::vector<std::string>>(desc, "output"); @@ -113,11 +115,11 @@ class ActionDescription { no_cache = *no_cache_it; } - return ActionDescription{ + return std::make_shared<ActionDescription>( std::move(*outputs), std::move(*output_dirs), Action{id, std::move(*command), env, may_fail, no_cache}, - inputs}; + inputs); } catch (std::exception const& ex) { Logger::Log( LogLevel::Error, |