diff options
| author | Klaus Aehlig <klaus.aehlig@huawei.com> | 2023-03-17 11:40:57 +0100 |
|---|---|---|
| committer | Klaus Aehlig <klaus.aehlig@huawei.com> | 2023-03-20 11:10:05 +0100 |
| commit | 7104c7f1dc04187bd23e9499f247d628592e0dd8 (patch) | |
| tree | c719775c5f3fb5e1219c333979fda7ed994e8294 /src/other_tools/ops_maps/repo_fetch_map.cpp | |
| parent | fe99ba0bb02ca2032a464ae0eddc41e0e9ebdb2c (diff) | |
| download | justbuild-7104c7f1dc04187bd23e9499f247d628592e0dd8.tar.gz | |
just-mr: rework progress reporting and statistics
To avoid unnecessary work, just-mr uses on-disk caches, including
for the mapping of a distdir to the corresponding git tree. This,
however, implies that the number of repositories that are actually
considered varies: in order to fetch a distdir repository, all
involved archives have to be fetched, but if we have a cache hit
none of them is even looked at.
So, in order to have a consistent reporting only count top-level
targets (i.e., the reachable repositories) in the statistics,
not the archives implicitly contained in a distdir, nor low-level
sub tasks. The actual fetch acitvity is shown separately by the
task tracker.
Diffstat (limited to 'src/other_tools/ops_maps/repo_fetch_map.cpp')
| -rw-r--r-- | src/other_tools/ops_maps/repo_fetch_map.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/other_tools/ops_maps/repo_fetch_map.cpp b/src/other_tools/ops_maps/repo_fetch_map.cpp index 1c903fe3..5d58e4b0 100644 --- a/src/other_tools/ops_maps/repo_fetch_map.cpp +++ b/src/other_tools/ops_maps/repo_fetch_map.cpp @@ -39,9 +39,6 @@ auto CreateRepoFetchMap(gsl::not_null<ContentCASMap*> const& content_cas_map, auto tree_id_file = JustMR::Utils::GetArchiveTreeIDFile( key.repo_type, key.archive.content); if (not FileSystemManager::Exists(tree_id_file)) { - // start work reporting - JustMRProgress::Instance().TaskTracker().Start(key.archive.origin); - JustMRStatistics::Instance().IncrementQueuedCounter(); // make sure content is in CAS content_cas_map->ConsumeAfterKeysReady( ts, @@ -77,10 +74,8 @@ auto CreateRepoFetchMap(gsl::not_null<ContentCASMap*> const& content_cas_map, return; } // success - (*setter)(true); - // report work done - JustMRProgress::Instance().TaskTracker().Stop(origin); JustMRStatistics::Instance().IncrementExecutedCounter(); + (*setter)(true); } else { (*logger)( @@ -123,9 +118,8 @@ auto CreateRepoFetchMap(gsl::not_null<ContentCASMap*> const& content_cas_map, return; } // success - (*setter)(true); - // report cache hit JustMRStatistics::Instance().IncrementCacheHitsCounter(); + (*setter)(true); } else { (*logger)(fmt::format("Content {} could not be found in CAS", |