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.

Sign up for GitHub

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

Jump to bottom

parallel operations for some binary caching providers #1392

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

parallel operations for some binary caching providers #1392

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c3493d6
parallel operations for some binary caching providers
Crzyrndm Apr 25, 2024
6e386ed
revert changes to upload path
Crzyrndm May 15, 2024
e454927
remove the variable rename
Crzyrndm May 27, 2024
d94ca2c
add comment noting calls will occur in parallel
Crzyrndm May 27, 2024
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
47 changes: 25 additions & 22 deletions src/vcpkg/binarycaching.cpp
View file
Open in desktop
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 @@ -961,7 +962,11 @@ namespace

virtual LocalizedString restored_message(size_t count,
std::chrono::high_resolution_clock::duration elapsed) const = 0;
/// checks if package abi is present in this storage
/// NOTE: Operation must be thread safe. Multiple calls will occur in parallel
virtual ExpectedL<Unit> stat(StringView url) const = 0;
/// download a package zip from this storage
/// NOTE: Operation must be thread safe. Multiple calls will occur in parallel
virtual ExpectedL<Unit> download_file(StringView object, const Path& archive) const = 0;
virtual ExpectedL<Unit> upload_file(StringView object, const Path& archive) const = 0;
};
Expand All @@ -988,38 +993,36 @@ 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)
{
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);
auto res = m_tool->download_file(make_object_path(m_prefix, abi), tmp);
if (res)
{
out_zip_paths[idx].emplace(std::move(tmp), RemoveWhen::always);
}
else
{
out_sink.println_warning(res.error());
}
}
parallel_transform(
actions, out_zip_paths.begin(), [&](const InstallPlanAction* plan) -> Optional<ZipResource> {
const auto& abi = plan->package_abi().value_or_exit(VCPKG_LINE_INFO);
auto tmp = make_temp_archive_path(m_buildtrees, plan->spec);
auto res = m_tool->download_file(make_object_path(m_prefix, abi), tmp);
if (res)
{
return ZipResource{ZipResource(std::move(tmp), RemoveWhen::always)};
}
else
{
out_sink.println_warning(res.error());
Copy link
Author

@Crzyrndm Crzyrndm Jun 6, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missed prints not being synchronised in previous assessment.

This particular print could be extracted relatively easily and is the only print inside the parallel execution.

return nullopt;
}
});
}

void precheck(View<const InstallPlanAction*> actions, Span<CacheAvailability> cache_status) const override
{
for (size_t idx = 0; idx < actions.size(); ++idx)
{
auto&& action = *actions[idx];
const auto& abi = action.package_abi().value_or_exit(VCPKG_LINE_INFO);
parallel_transform(actions, cache_status.begin(), [&](const InstallPlanAction* plan) {
const auto& abi = plan->package_abi().value_or_exit(VCPKG_LINE_INFO);
if (m_tool->stat(make_object_path(m_prefix, abi)))
{
cache_status[idx] = CacheAvailability::available;
return CacheAvailability::available;
}
else
{
cache_status[idx] = CacheAvailability::unavailable;
return CacheAvailability::unavailable;
}
}
});
}

LocalizedString restored_message(size_t count,
Expand Down
Loading