cafkafk/lix
cafkafk/lix
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

libstore: de-callback-ify Store::queryRealisation

Browse source 
Change-Id: I8d74745c519518f163f51dfaa39063836f17599e
This commit is contained in:
eldritch horrors 2024-04-28 00:56:10 +02:00
parent 17965bf11c
commit 28a98d152c
2 changed files with 26 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/libstore/store-api.cc
View file

@ -716,34 +716,26 @@ ref<const ValidPathInfo> Store::queryPathInfo(const StorePath & storePath)
return ref<const ValidPathInfo>(info);
}
void Store::queryRealisation(const DrvOutput & id,
Callback<std::shared_ptr<const Realisation>> callback) noexcept
std::shared_ptr<const Realisation> Store::queryRealisation(const DrvOutput & id)
{
try {
if (diskCache) {
auto [cacheOutcome, maybeCachedRealisation]
= diskCache->lookupRealisation(getUri(), id);
switch (cacheOutcome) {
case NarInfoDiskCache::oValid:
debug("Returning a cached realisation for %s", id.to_string());
callback(maybeCachedRealisation);
return;
return maybeCachedRealisation;
case NarInfoDiskCache::oInvalid:
debug(
"Returning a cached missing realisation for %s",
id.to_string());
callback(nullptr);
return;
return nullptr;
case NarInfoDiskCache::oUnknown:
break;
}
}
} catch (...) {
return callback.rethrow();
}
try {
auto info = queryRealisationUncached(id);
if (diskCache) {
@ -753,28 +745,7 @@ void Store::queryRealisation(const DrvOutput & id,
diskCache->upsertAbsentRealisation(getUri(), id);
}
callback(std::shared_ptr<const Realisation>(info));
} catch (...) {
callback.rethrow();
}
}
std::shared_ptr<const Realisation> Store::queryRealisation(const DrvOutput & id)
{
using RealPtr = std::shared_ptr<const Realisation>;
std::promise<RealPtr> promise;
queryRealisation(id,
{[&](std::future<RealPtr> result) {
try {
promise.set_value(result.get());
} catch (...) {
promise.set_exception(std::current_exception());
}
}});
return promise.get_future().get();
return info;
}
void Store::substitutePaths(const StorePathSet & paths)

6
src/libstore/store-api.hh
View file

@ -371,12 +371,6 @@ public:
*/
std::shared_ptr<const Realisation> queryRealisation(const DrvOutput &);
/**
* Asynchronous version of queryRealisation().
*/
void queryRealisation(const DrvOutput &,
Callback<std::shared_ptr<const Realisation>> callback) noexcept;
/**
* Check whether the given valid path info is sufficiently attested, by