diff options
| author | Klaus Aehlig <klaus.aehlig@huawei.com> | 2024-03-12 18:23:35 +0100 |
|---|---|---|
| committer | Klaus Aehlig <klaus.aehlig@huawei.com> | 2024-03-13 12:14:53 +0100 |
| commit | 2bd069cdecb5371d906f8df9f5fb36f308d6296f (patch) | |
| tree | 3db2cee634411639d520b2dee796b8a97b7342f6 /src/buildtool/execution_api | |
| parent | f487f592fdc85fbdb95856abb7f4281dd4353da9 (diff) | |
| download | justbuild-2bd069cdecb5371d906f8df9f5fb36f308d6296f.tar.gz | |
Move storage-aware tmpdir creation to config
... as the fs_utils have a lot more dependencies making them usable
in less places. Moreover, this function also serves to shape the
layout of the local build root and hence is more appropriately
placed in the config anyway.
Diffstat (limited to 'src/buildtool/execution_api')
| -rw-r--r-- | src/buildtool/execution_api/execution_service/TARGETS | 2 | ||||
| -rw-r--r-- | src/buildtool/execution_api/execution_service/cas_utils.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/buildtool/execution_api/execution_service/TARGETS b/src/buildtool/execution_api/execution_service/TARGETS index e494711c..a7d31a27 100644 --- a/src/buildtool/execution_api/execution_service/TARGETS +++ b/src/buildtool/execution_api/execution_service/TARGETS @@ -165,7 +165,7 @@ , ["src/buildtool/file_system", "git_repo"] , ["src/buildtool/file_system", "object_type"] , ["src/buildtool/file_system", "file_system_manager"] - , ["src/buildtool/storage", "fs_utils"] + , ["src/buildtool/storage", "config"] , ["src/utils/cpp", "hex_string"] ] } diff --git a/src/buildtool/execution_api/execution_service/cas_utils.cpp b/src/buildtool/execution_api/execution_service/cas_utils.cpp index b710dd36..e2c4a418 100644 --- a/src/buildtool/execution_api/execution_service/cas_utils.cpp +++ b/src/buildtool/execution_api/execution_service/cas_utils.cpp @@ -23,7 +23,7 @@ #include "src/buildtool/file_system/file_system_manager.hpp" #include "src/buildtool/file_system/git_repo.hpp" #include "src/buildtool/file_system/object_type.hpp" -#include "src/buildtool/storage/fs_utils.hpp" +#include "src/buildtool/storage/config.hpp" #include "src/utils/cpp/hex_string.hpp" auto CASUtils::EnsureTreeInvariant(std::string const& data, @@ -150,7 +150,7 @@ auto CASUtils::SpliceBlob(bazel_re::Digest const& blob_digest, -> std::variant<bazel_re::Digest, grpc::Status> { // Assemble blob from chunks. - auto tmp_dir = StorageUtils::CreateTypedTmpDir("splice"); + auto tmp_dir = StorageConfig::CreateTypedTmpDir("splice"); auto tmp_file = tmp_dir->GetPath() / "blob"; { std::ofstream tmp(tmp_file, std::ios::binary); |