Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Parallelize ObjectStorageProvider downloads #1485

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions src/vcpkg/binarycaching.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include <vcpkg/base/json.h>
#include <vcpkg/base/message_sinks.h>
#include <vcpkg/base/messages.h>
#include <vcpkg/base/parallel-algorithms.h>
#include <vcpkg/base/parse.h>
#include <vcpkg/base/strings.h>
#include <vcpkg/base/system.debug.h>
Expand Down Expand Up @@ -1010,8 +1011,7 @@ namespace
void acquire_zips(View<const InstallPlanAction*> actions,
Span<Optional<ZipResource>> out_zip_paths) const override
{
for (size_t idx = 0; idx < actions.size(); ++idx)
{
execute_in_parallel(actions.size(), [&](size_t idx) {
auto&& action = *actions[idx];
const auto& abi = action.package_abi().value_or_exit(VCPKG_LINE_INFO);
auto tmp = make_temp_archive_path(m_buildtrees, action.spec);
Expand All @@ -1027,13 +1027,12 @@ namespace
{
out_sink.println_warning(res.error());
}
}
});
}

void precheck(View<const InstallPlanAction*> actions, Span<CacheAvailability> cache_status) const override
{
for (size_t idx = 0; idx < actions.size(); ++idx)
{
execute_in_parallel(actions.size(), [&](size_t idx) {
auto&& action = *actions[idx];
const auto& abi = action.package_abi().value_or_exit(VCPKG_LINE_INFO);
auto maybe_res = m_tool->stat(make_object_path(m_prefix, abi));
Expand All @@ -1045,7 +1044,7 @@ namespace
{
cache_status[idx] = CacheAvailability::unavailable;
}
}
});
}

LocalizedString restored_message(size_t count,
Expand Down
Loading