Compare commits
No commits in common. "e0a913b16c3a5629ce2b9f7574693cbdcc73139e" and "e3803b9852143a06a87712f27e8aafa8a90e93d9" have entirely different histories.
e0a913b16c
...
e3803b9852
|
@ -499,26 +499,23 @@ LIBPKG_EXPORT void pull<LibPkg::PackageSearchResult>(LibPkg::PackageSearchResult
|
|||
namespace BinaryReflector {
|
||||
|
||||
template <>
|
||||
LIBPKG_EXPORT void writeCustomType<LibPkg::PackageSearchResult>(
|
||||
BinarySerializer &serializer, const LibPkg::PackageSearchResult &packageSearchResult, BinaryVersion version)
|
||||
LIBPKG_EXPORT void writeCustomType<LibPkg::PackageSearchResult>(BinarySerializer &serializer, const LibPkg::PackageSearchResult &packageSearchResult)
|
||||
{
|
||||
if (const auto *const dbInfo = std::get_if<LibPkg::DatabaseInfo>(&packageSearchResult.db)) {
|
||||
serializer.write(dbInfo->name, version);
|
||||
serializer.write(dbInfo->name);
|
||||
} else if (const auto *const db = std::get<LibPkg::Database *>(packageSearchResult.db)) {
|
||||
serializer.write(db->name, version);
|
||||
serializer.write(db->name);
|
||||
} else {
|
||||
serializer.write(std::string(), version);
|
||||
serializer.write(std::string());
|
||||
}
|
||||
serializer.write(packageSearchResult.pkg, version);
|
||||
serializer.write(packageSearchResult.pkg);
|
||||
}
|
||||
|
||||
template <>
|
||||
LIBPKG_EXPORT BinaryVersion readCustomType<LibPkg::PackageSearchResult>(
|
||||
BinaryDeserializer &deserializer, LibPkg::PackageSearchResult &packageSearchResult, BinaryVersion version)
|
||||
LIBPKG_EXPORT void readCustomType<LibPkg::PackageSearchResult>(BinaryDeserializer &deserializer, LibPkg::PackageSearchResult &packageSearchResult)
|
||||
{
|
||||
deserializer.read(packageSearchResult.db.emplace<LibPkg::DatabaseInfo>().name, version);
|
||||
deserializer.read(packageSearchResult.pkg, version);
|
||||
return 0;
|
||||
deserializer.read(packageSearchResult.db.emplace<LibPkg::DatabaseInfo>().name);
|
||||
deserializer.read(packageSearchResult.pkg);
|
||||
}
|
||||
|
||||
} // namespace BinaryReflector
|
||||
|
|
|
@ -214,11 +214,9 @@ LIBPKG_EXPORT void pull<LibPkg::PackageSearchResult>(LibPkg::PackageSearchResult
|
|||
namespace BinaryReflector {
|
||||
|
||||
template <>
|
||||
LIBPKG_EXPORT void writeCustomType<LibPkg::PackageSearchResult>(
|
||||
BinarySerializer &serializer, const LibPkg::PackageSearchResult &packageSearchResult, BinaryVersion version);
|
||||
LIBPKG_EXPORT void writeCustomType<LibPkg::PackageSearchResult>(BinarySerializer &serializer, const LibPkg::PackageSearchResult &packageSearchResult);
|
||||
template <>
|
||||
LIBPKG_EXPORT BinaryVersion readCustomType<LibPkg::PackageSearchResult>(
|
||||
BinaryDeserializer &deserializer, LibPkg::PackageSearchResult &packageSearchResult, BinaryVersion version);
|
||||
LIBPKG_EXPORT void readCustomType<LibPkg::PackageSearchResult>(BinaryDeserializer &deserializer, LibPkg::PackageSearchResult &packageSearchResult);
|
||||
|
||||
} // namespace BinaryReflector
|
||||
|
||||
|
|
|
@ -181,7 +181,8 @@ void DataTests::testDependencyMatching()
|
|||
"equal constraint with explicitly specified pkgrel must not match", !pkg3.providesDependency(Dependency::fromString(depStr, 16)));
|
||||
|
||||
depStr = "crypto++>=5.6.5-1";
|
||||
CPPUNIT_ASSERT_MESSAGE("greater equal constraint with explicitly specified pkgrel", pkg2.providesDependency(Dependency::fromString(depStr, 17)));
|
||||
CPPUNIT_ASSERT_MESSAGE(
|
||||
"greater equal constraint with explicitly specified pkgrel", pkg2.providesDependency(Dependency::fromString(depStr, 17)));
|
||||
CPPUNIT_ASSERT_MESSAGE("greater equal constraint, default pkgrel should match", pkg2.providesDependency(Dependency::fromString(depStr, 15)));
|
||||
CPPUNIT_ASSERT_MESSAGE("greater equal constrainer, any pkgrel should match", pkg3.providesDependency(Dependency::fromString(depStr, 15)));
|
||||
CPPUNIT_ASSERT_MESSAGE(
|
||||
|
|
|
@ -238,8 +238,7 @@ void LibRepoMgr::ReloadLibraryDependencies::downloadPackagesFromMirror()
|
|||
m_buildAction->appendOutput(Phrases::SuccessMessage, "Downloading ", packagesWhichNeedCaching, " binary packages from mirror ...\n");
|
||||
WebClient::cachePackages(m_buildAction->log(),
|
||||
std::make_shared<WebClient::PackageCachingSession>(m_cachingData, m_setup.building.ioContext, m_setup.webServer.sslContext,
|
||||
std::bind(&ReloadLibraryDependencies::loadPackageInfoFromContents, this)),
|
||||
m_packageDownloadSizeLimit);
|
||||
std::bind(&ReloadLibraryDependencies::loadPackageInfoFromContents, this)), m_packageDownloadSizeLimit);
|
||||
}
|
||||
|
||||
void ReloadLibraryDependencies::loadPackageInfoFromContents()
|
||||
|
|
|
@ -190,8 +190,7 @@ PackageCachingDataForPackage *PackageCachingSession::getCurrentDataAndSelectNext
|
|||
return data;
|
||||
}
|
||||
|
||||
void cachePackages(LogContext &log, std::shared_ptr<PackageCachingSession> &&packageCachingSession, std::optional<std::uint64_t> bodyLimit,
|
||||
std::size_t maxParallelDownloads)
|
||||
void cachePackages(LogContext &log, std::shared_ptr<PackageCachingSession> &&packageCachingSession, std::optional<std::uint64_t> bodyLimit, std::size_t maxParallelDownloads)
|
||||
{
|
||||
for (std::size_t startedDownloads = 0; startedDownloads < maxParallelDownloads; ++startedDownloads) {
|
||||
auto *const cachingData = packageCachingSession->getCurrentDataAndSelectNext();
|
||||
|
|
|
@ -45,8 +45,7 @@ using PackageCachingDataForDatabase = std::unordered_map<std::string_view, Packa
|
|||
using PackageCachingDataForSession = std::unordered_map<std::string_view, PackageCachingDataForDatabase>;
|
||||
|
||||
struct PackageCachingSession;
|
||||
void cachePackages(LogContext &log, std::shared_ptr<PackageCachingSession> &&packageCachingSession,
|
||||
std::optional<std::uint64_t> bodyLimit = std::nullopt, std::size_t maxParallelDownloads = 8);
|
||||
void cachePackages(LogContext &log, std::shared_ptr<PackageCachingSession> &&packageCachingSession, std::optional<std::uint64_t> bodyLimit = std::nullopt, std::size_t maxParallelDownloads = 8);
|
||||
|
||||
struct PackageCachingSession : public MultiSession<void> {
|
||||
friend void cachePackages(LogContext &, std::shared_ptr<PackageCachingSession> &&, std::optional<std::uint64_t>, std::size_t);
|
||||
|
|
|
@ -41,8 +41,7 @@ void Session::setChunkHandler(ChunkHandler &&handler)
|
|||
m_chunkProcessing->handler = std::move(handler);
|
||||
}
|
||||
|
||||
void Session::run(
|
||||
const char *host, const char *port, http::verb verb, const char *target, std::optional<std::uint64_t> bodyLimit, unsigned int version)
|
||||
void Session::run(const char *host, const char *port, http::verb verb, const char *target, std::optional<std::uint64_t> bodyLimit, unsigned int version)
|
||||
{
|
||||
// set SNI Hostname (many hosts need this to handshake successfully)
|
||||
auto *const sslStream = std::get_if<SslStream>(&m_stream);
|
||||
|
|
|
@ -62,8 +62,7 @@ public:
|
|||
explicit Session(boost::asio::io_context &ioContext, boost::asio::ssl::context &sslContext, Handler &&handler);
|
||||
|
||||
void setChunkHandler(ChunkHandler &&handler);
|
||||
void run(const char *host, const char *port, boost::beast::http::verb verb, const char *target,
|
||||
std::optional<std::uint64_t> bodyLimit = std::nullopt, unsigned int version = 11);
|
||||
void run(const char *host, const char *port, boost::beast::http::verb verb, const char *target, std::optional<std::uint64_t> bodyLimit = std::nullopt, unsigned int version = 11);
|
||||
|
||||
private:
|
||||
using RawSocket = boost::asio::ip::tcp::socket;
|
||||
|
|
Loading…
Reference in New Issue