summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/buildtool/execution_api/execution_service/execution_server.cpp2
-rw-r--r--src/buildtool/execution_api/execution_service/execution_server.hpp6
-rw-r--r--src/buildtool/execution_api/utils/TARGETS1
-rw-r--r--src/buildtool/execution_api/utils/subobject.cpp5
-rw-r--r--src/buildtool/execution_api/utils/subobject.hpp3
-rw-r--r--src/buildtool/graph_traverser/graph_traverser.hpp11
-rw-r--r--src/buildtool/main/archive.cpp6
-rw-r--r--src/buildtool/main/archive.hpp2
-rw-r--r--src/buildtool/main/install_cas.cpp4
9 files changed, 18 insertions, 22 deletions
diff --git a/src/buildtool/execution_api/execution_service/execution_server.cpp b/src/buildtool/execution_api/execution_service/execution_server.cpp
index c3802ea7..b71380f5 100644
--- a/src/buildtool/execution_api/execution_service/execution_server.cpp
+++ b/src/buildtool/execution_api/execution_service/execution_server.cpp
@@ -133,7 +133,7 @@ auto ExecutionServiceImpl::GetIExecutionAction(
auto env_vars = GetEnvVars(*c);
- auto i_execution_action = api_->CreateAction(
+ auto i_execution_action = api_.CreateAction(
ArtifactDigest{action.input_root_digest()},
{c->arguments().begin(), c->arguments().end()},
{c->output_files().begin(), c->output_files().end()},
diff --git a/src/buildtool/execution_api/execution_service/execution_server.hpp b/src/buildtool/execution_api/execution_service/execution_server.hpp
index 48f50624..98223938 100644
--- a/src/buildtool/execution_api/execution_service/execution_server.hpp
+++ b/src/buildtool/execution_api/execution_service/execution_server.hpp
@@ -25,8 +25,8 @@
class ExecutionServiceImpl final : public bazel_re::Execution::Service {
public:
explicit ExecutionServiceImpl(
- gsl::not_null<IExecutionApi*> const& local_api) noexcept
- : api_{local_api} {}
+ gsl::not_null<IExecutionApi const*> const& local_api) noexcept
+ : api_{*local_api} {}
// Execute an action remotely.
//
// In order to execute an action, the client must first upload all of the
@@ -111,7 +111,7 @@ class ExecutionServiceImpl final : public bazel_re::Execution::Service {
private:
gsl::not_null<Storage const*> storage_ = &Storage::Instance();
- gsl::not_null<IExecutionApi*> const api_;
+ IExecutionApi const& api_;
Logger logger_{"execution-service"};
[[nodiscard]] auto GetAction(::bazel_re::ExecuteRequest const* request)
diff --git a/src/buildtool/execution_api/utils/TARGETS b/src/buildtool/execution_api/utils/TARGETS
index 1c5bb6c5..77a29955 100644
--- a/src/buildtool/execution_api/utils/TARGETS
+++ b/src/buildtool/execution_api/utils/TARGETS
@@ -6,7 +6,6 @@
, "deps":
[ ["src/buildtool/common", "common"]
, ["src/buildtool/execution_api/common", "common"]
- , ["@", "gsl", "", "gsl"]
]
, "private-deps":
[ ["src/buildtool/compatibility", "compatibility"]
diff --git a/src/buildtool/execution_api/utils/subobject.cpp b/src/buildtool/execution_api/utils/subobject.cpp
index 46ec58a7..5523d784 100644
--- a/src/buildtool/execution_api/utils/subobject.cpp
+++ b/src/buildtool/execution_api/utils/subobject.cpp
@@ -21,10 +21,9 @@
#include "src/buildtool/logging/logger.hpp"
auto RetrieveSubPathId(Artifact::ObjectInfo object_info,
- gsl::not_null<IExecutionApi*> const& api,
+ IExecutionApi const& api,
const std::filesystem::path& sub_path)
-> std::optional<Artifact::ObjectInfo> {
-
std::filesystem::path sofar{};
for (auto const& segment : sub_path) {
if (object_info.type != ObjectType::Tree) {
@@ -34,7 +33,7 @@ auto RetrieveSubPathId(Artifact::ObjectInfo object_info,
segment.string());
break;
}
- auto data = api->RetrieveToMemory(object_info);
+ auto data = api.RetrieveToMemory(object_info);
if (not data) {
Logger::Log(LogLevel::Error,
"Failed to retrieve artifact {} at path '{}'",
diff --git a/src/buildtool/execution_api/utils/subobject.hpp b/src/buildtool/execution_api/utils/subobject.hpp
index 85fc7bdb..c5cee935 100644
--- a/src/buildtool/execution_api/utils/subobject.hpp
+++ b/src/buildtool/execution_api/utils/subobject.hpp
@@ -20,12 +20,11 @@
#include <filesystem>
#include <optional>
-#include "gsl/gsl"
#include "src/buildtool/common/artifact.hpp"
#include "src/buildtool/execution_api/common/execution_api.hpp"
auto RetrieveSubPathId(Artifact::ObjectInfo object_info,
- gsl::not_null<IExecutionApi*> const& api,
+ IExecutionApi const& api,
const std::filesystem::path& sub_path)
-> std::optional<Artifact::ObjectInfo>;
diff --git a/src/buildtool/graph_traverser/graph_traverser.hpp b/src/buildtool/graph_traverser/graph_traverser.hpp
index 668a4a4b..ef5316a6 100644
--- a/src/buildtool/graph_traverser/graph_traverser.hpp
+++ b/src/buildtool/graph_traverser/graph_traverser.hpp
@@ -702,7 +702,7 @@ class GraphTraverser {
auto target_path = ToNormalPath(std::filesystem::path{
*clargs_.build.print_to_stdout})
.relative_path();
- auto remote = apis_.remote;
+ auto const& remote = *apis_.remote;
for (std::size_t i = 0; i < paths.size(); i++) {
auto const& path = paths[i];
auto relpath = target_path.lexically_relative(path);
@@ -718,12 +718,11 @@ class GraphTraverser {
auto info = artifacts[i]->Content().Info();
if (info) {
auto new_info =
- RetrieveSubPathId(*info, &*remote, relpath);
+ RetrieveSubPathId(*info, remote, relpath);
if (new_info) {
- if (not apis_.remote->RetrieveToFds(
- {*new_info},
- {dup(fileno(stdout))},
- /*raw_tree=*/false)) {
+ if (not remote.RetrieveToFds({*new_info},
+ {dup(fileno(stdout))},
+ /*raw_tree=*/false)) {
Logger::Log(logger_,
LogLevel::Error,
"Failed to retrieve artifact {} at "
diff --git a/src/buildtool/main/archive.cpp b/src/buildtool/main/archive.cpp
index 997857b4..92610397 100644
--- a/src/buildtool/main/archive.cpp
+++ b/src/buildtool/main/archive.cpp
@@ -49,13 +49,13 @@ void archive_entry_cleanup(archive_entry* entry) {
// NOLINTNEXTLINE(misc-no-recursion)
auto add_to_archive(archive* archive,
- gsl::not_null<IExecutionApi*> const& api,
+ IExecutionApi const& api,
const Artifact::ObjectInfo& artifact,
const std::filesystem::path& location) -> bool {
auto constexpr kExecutable = 0555;
auto constexpr kFile = 0444;
- auto payload = api->RetrieveToMemory(artifact);
+ auto payload = api.RetrieveToMemory(artifact);
if (not payload) {
Logger::Log(LogLevel::Error,
"Failed to retrieve artifact {}",
@@ -124,7 +124,7 @@ auto add_to_archive(archive* archive,
} // namespace
[[nodiscard]] auto GenerateArchive(
- gsl::not_null<IExecutionApi*> const& api,
+ IExecutionApi const& api,
const Artifact::ObjectInfo& artifact,
const std::optional<std::filesystem::path>& output_path) -> bool {
diff --git a/src/buildtool/main/archive.hpp b/src/buildtool/main/archive.hpp
index c60aa337..209675d6 100644
--- a/src/buildtool/main/archive.hpp
+++ b/src/buildtool/main/archive.hpp
@@ -24,7 +24,7 @@
#include "src/buildtool/execution_api/common/execution_api.hpp"
[[nodiscard]] auto GenerateArchive(
- gsl::not_null<IExecutionApi*> const& api,
+ IExecutionApi const& api,
const Artifact::ObjectInfo& artifact,
const std::optional<std::filesystem::path>& output_path) -> bool;
diff --git a/src/buildtool/main/install_cas.cpp b/src/buildtool/main/install_cas.cpp
index 3c06a91c..2e1b6917 100644
--- a/src/buildtool/main/install_cas.cpp
+++ b/src/buildtool/main/install_cas.cpp
@@ -87,7 +87,7 @@ auto FetchAndInstallArtifacts(ApiBundle const& apis,
if (clargs.sub_path) {
std::filesystem::path sofar{};
auto new_object_info =
- RetrieveSubPathId(object_info, &*apis.remote, *clargs.sub_path);
+ RetrieveSubPathId(object_info, *apis.remote, *clargs.sub_path);
if (new_object_info) {
object_info = *new_object_info;
}
@@ -120,7 +120,7 @@ auto FetchAndInstallArtifacts(ApiBundle const& apis,
object_info.ToString());
return false;
}
- return GenerateArchive(&*apis.remote, object_info, out);
+ return GenerateArchive(*apis.remote, object_info, out);
}
if (out) {
generated by cgit v1.2.3 (git 2.39.1) at 2025-07-03 18:11:01 +0000