summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/other_tools/just_mr/TARGETS2
-rw-r--r--src/other_tools/just_mr/fetch.cpp18
-rw-r--r--src/other_tools/ops_maps/TARGETS8
-rw-r--r--src/other_tools/ops_maps/archive_fetch_map.cpp (renamed from src/other_tools/ops_maps/repo_fetch_map.cpp)30
-rw-r--r--src/other_tools/ops_maps/archive_fetch_map.hpp (renamed from src/other_tools/ops_maps/repo_fetch_map.hpp)12
5 files changed, 35 insertions, 35 deletions
diff --git a/src/other_tools/just_mr/TARGETS b/src/other_tools/just_mr/TARGETS
index c4a75aef..391a8240 100644
--- a/src/other_tools/just_mr/TARGETS
+++ b/src/other_tools/just_mr/TARGETS
@@ -110,8 +110,8 @@
, "exit_codes"
, ["src/other_tools/just_mr/progress_reporting", "progress"]
, ["src/other_tools/just_mr/progress_reporting", "progress_reporter"]
+ , ["src/other_tools/ops_maps", "archive_fetch_map"]
, ["src/other_tools/ops_maps", "content_cas_map"]
- , ["src/other_tools/ops_maps", "repo_fetch_map"]
, "setup_utils"
, ["src/buildtool/execution_api/common", "common"]
, ["src/buildtool/execution_api/local", "local"]
diff --git a/src/other_tools/just_mr/fetch.cpp b/src/other_tools/just_mr/fetch.cpp
index 1f4a04d1..bfddf5ce 100644
--- a/src/other_tools/just_mr/fetch.cpp
+++ b/src/other_tools/just_mr/fetch.cpp
@@ -26,8 +26,8 @@
#include "src/other_tools/just_mr/progress_reporting/progress.hpp"
#include "src/other_tools/just_mr/progress_reporting/progress_reporter.hpp"
#include "src/other_tools/just_mr/setup_utils.hpp"
+#include "src/other_tools/ops_maps/archive_fetch_map.hpp"
#include "src/other_tools/ops_maps/content_cas_map.hpp"
-#include "src/other_tools/ops_maps/repo_fetch_map.hpp"
auto MultiRepoFetch(std::shared_ptr<Configuration> const& config,
MultiRepoCommonArguments const& common_args,
@@ -120,8 +120,8 @@ auto MultiRepoFetch(std::shared_ptr<Configuration> const& config,
Logger::Log(LogLevel::Info, "Fetching to {}", fetch_dir->string());
// gather all repos to be fetched
- std::vector<ArchiveRepoInfo> repos_to_fetch{};
- repos_to_fetch.reserve(
+ std::vector<ArchiveRepoInfo> archives_to_fetch{};
+ archives_to_fetch.reserve(
fetch_repos->to_include.size()); // pre-reserve a maximum size
for (auto const& repo_name : fetch_repos->to_include) {
auto repo_desc = repos->At(repo_name);
@@ -249,7 +249,7 @@ auto MultiRepoFetch(std::shared_ptr<Configuration> const& config,
.absent = false // not used
};
// add to list
- repos_to_fetch.emplace_back(std::move(archive_info));
+ archives_to_fetch.emplace_back(std::move(archive_info));
}
}
}
@@ -262,7 +262,7 @@ auto MultiRepoFetch(std::shared_ptr<Configuration> const& config,
}
// report progress
- auto nr = repos_to_fetch.size();
+ auto nr = archives_to_fetch.size();
Logger::Log(LogLevel::Info,
"Found {} {} to fetch",
nr,
@@ -287,7 +287,7 @@ auto MultiRepoFetch(std::shared_ptr<Configuration> const& config,
local_api ? &(*local_api) : nullptr,
remote_api ? &(*remote_api) : nullptr,
common_args.jobs);
- auto repo_fetch_map = CreateRepoFetchMap(
+ auto archive_fetch_map = CreateArchiveFetchMap(
&content_cas_map,
*fetch_dir,
(fetch_args.backup_to_remote and local_api) ? &(*local_api) : nullptr,
@@ -295,7 +295,7 @@ auto MultiRepoFetch(std::shared_ptr<Configuration> const& config,
common_args.jobs);
// set up progress observer
- JustMRProgress::Instance().SetTotal(repos_to_fetch.size());
+ JustMRProgress::Instance().SetTotal(archives_to_fetch.size());
std::atomic<bool> done{false};
std::condition_variable cv{};
auto reporter = JustMRProgressReporter::Reporter();
@@ -306,9 +306,9 @@ auto MultiRepoFetch(std::shared_ptr<Configuration> const& config,
bool failed{false};
{
TaskSystem ts{common_args.jobs};
- repo_fetch_map.ConsumeAfterKeysReady(
+ archive_fetch_map.ConsumeAfterKeysReady(
&ts,
- repos_to_fetch,
+ archives_to_fetch,
[]([[maybe_unused]] auto const& values) {},
[&failed](auto const& msg, bool fatal) {
Logger::Log(fatal ? LogLevel::Error : LogLevel::Warning,
diff --git a/src/other_tools/ops_maps/TARGETS b/src/other_tools/ops_maps/TARGETS
index 5745f69c..c0f05d63 100644
--- a/src/other_tools/ops_maps/TARGETS
+++ b/src/other_tools/ops_maps/TARGETS
@@ -76,11 +76,11 @@
, ["src/other_tools/just_mr/progress_reporting", "progress"]
]
}
-, "repo_fetch_map":
+, "archive_fetch_map":
{ "type": ["@", "rules", "CC", "library"]
- , "name": ["repo_fetch_map"]
- , "hdrs": ["repo_fetch_map.hpp"]
- , "srcs": ["repo_fetch_map.cpp"]
+ , "name": ["archive_fetch_map"]
+ , "hdrs": ["archive_fetch_map.hpp"]
+ , "srcs": ["archive_fetch_map.cpp"]
, "deps":
["content_cas_map", ["src/buildtool/execution_api/common", "common"]]
, "stage": ["src", "other_tools", "ops_maps"]
diff --git a/src/other_tools/ops_maps/repo_fetch_map.cpp b/src/other_tools/ops_maps/archive_fetch_map.cpp
index f8d28d8d..67b99e9a 100644
--- a/src/other_tools/ops_maps/repo_fetch_map.cpp
+++ b/src/other_tools/ops_maps/archive_fetch_map.cpp
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/other_tools/ops_maps/repo_fetch_map.hpp"
+#include "src/other_tools/ops_maps/archive_fetch_map.hpp"
#include "src/buildtool/file_system/file_storage.hpp"
#include "src/buildtool/storage/storage.hpp"
@@ -28,8 +28,8 @@ void ProcessContent(std::filesystem::path const& content_path,
IExecutionApi* remote_api,
std::string const& content,
ArtifactDigest const& digest,
- RepoFetchMap::SetterPtr const& setter,
- RepoFetchMap::LoggerPtr const& logger) {
+ ArchiveFetchMap::SetterPtr const& setter,
+ ArchiveFetchMap::LoggerPtr const& logger) {
// try to back up to remote CAS
if (local_api != nullptr and remote_api != nullptr) {
if (not local_api->RetrieveToCas(
@@ -63,17 +63,17 @@ void ProcessContent(std::filesystem::path const& content_path,
} // namespace
-auto CreateRepoFetchMap(gsl::not_null<ContentCASMap*> const& content_cas_map,
- std::filesystem::path const& fetch_dir,
- IExecutionApi* local_api,
- IExecutionApi* remote_api,
- std::size_t jobs) -> RepoFetchMap {
- auto fetch_repo = [content_cas_map, fetch_dir, local_api, remote_api](
- auto ts,
- auto setter,
- auto logger,
- auto /* unused */,
- auto const& key) {
+auto CreateArchiveFetchMap(gsl::not_null<ContentCASMap*> const& content_cas_map,
+ std::filesystem::path const& fetch_dir,
+ IExecutionApi* local_api,
+ IExecutionApi* remote_api,
+ std::size_t jobs) -> ArchiveFetchMap {
+ auto fetch_archive = [content_cas_map, fetch_dir, local_api, remote_api](
+ auto ts,
+ auto setter,
+ auto logger,
+ auto /* unused */,
+ auto const& key) {
// get corresponding distfile
auto distfile =
(key.archive.distfile ? key.archive.distfile.value()
@@ -131,5 +131,5 @@ auto CreateRepoFetchMap(gsl::not_null<ContentCASMap*> const& content_cas_map,
logger);
}
};
- return AsyncMapConsumer<ArchiveRepoInfo, bool>(fetch_repo, jobs);
+ return AsyncMapConsumer<ArchiveRepoInfo, bool>(fetch_archive, jobs);
}
diff --git a/src/other_tools/ops_maps/repo_fetch_map.hpp b/src/other_tools/ops_maps/archive_fetch_map.hpp
index 424c9122..a74b2428 100644
--- a/src/other_tools/ops_maps/repo_fetch_map.hpp
+++ b/src/other_tools/ops_maps/archive_fetch_map.hpp
@@ -12,20 +12,20 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef INCLUDED_SRC_OTHER_TOOLS_OPS_MAPS_REPO_FETCH_MAP_HPP
-#define INCLUDED_SRC_OTHER_TOOLS_OPS_MAPS_REPO_FETCH_MAP_HPP
+#ifndef INCLUDED_SRC_OTHER_TOOLS_OPS_MAPS_ARCHIVE_FETCH_MAP_HPP
+#define INCLUDED_SRC_OTHER_TOOLS_OPS_MAPS_ARCHIVE_FETCH_MAP_HPP
#include "src/buildtool/execution_api/common/execution_api.hpp"
#include "src/other_tools/ops_maps/content_cas_map.hpp"
/// \brief Maps an archive content hash to a status flag.
-using RepoFetchMap = AsyncMapConsumer<ArchiveRepoInfo, bool>;
+using ArchiveFetchMap = AsyncMapConsumer<ArchiveRepoInfo, bool>;
-[[nodiscard]] auto CreateRepoFetchMap(
+[[nodiscard]] auto CreateArchiveFetchMap(
gsl::not_null<ContentCASMap*> const& content_cas_map,
std::filesystem::path const& fetch_dir, // should exist!
IExecutionApi* local_api,
IExecutionApi* remote_api,
- std::size_t jobs) -> RepoFetchMap;
+ std::size_t jobs) -> ArchiveFetchMap;
-#endif // INCLUDED_SRC_OTHER_TOOLS_OPS_MAPS_REPO_FETCH_MAP_HPP \ No newline at end of file
+#endif // INCLUDED_SRC_OTHER_TOOLS_OPS_MAPS_ARCHIVE_FETCH_MAP_HPP \ No newline at end of file
generated by cgit v1.2.3 (git 2.39.1) at 2025-07-03 14:57:06 +0000