qyriad/lix
1
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Merge pull request #10570 from layus/shared_caches

Browse source 
Share evaluation caches across installables

(cherry picked from commit de51e5c335865e3e0a8cccd283fec1a52cce243f)
Change-Id: I9350bebd462b6af12c51db5bf432321abfe84a16
This commit is contained in:
Eelco Dolstra 2024-04-26 15:48:46 +02:00 committed by Qyriad
parent 4b35e6a75e
commit cf06cbff8f
2 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/libcmd/installables.cc
View file

@ -398,13 +398,10 @@ ref<eval_cache::EvalCache> openEvalCache(
EvalState & state, EvalState & state,
std::shared_ptr<flake::LockedFlake> lockedFlake) std::shared_ptr<flake::LockedFlake> lockedFlake)
{ {
auto fingerprint = lockedFlake->getFingerprint(); auto fingerprint = evalSettings.useEvalCache && evalSettings.pureEval
return make_ref<nix::eval_cache::EvalCache>( ? std::make_optional(lockedFlake->getFingerprint())
evalSettings.useEvalCache && evalSettings.pureEval : std::nullopt;
? std::optional { std::cref(fingerprint) } auto rootLoader = [&state, lockedFlake]()
: std::nullopt,
state,
[&state, lockedFlake]()
{ {
/* For testing whether the evaluation cache is /* For testing whether the evaluation cache is
complete. */ complete. */
@ -420,7 +417,17 @@ ref<eval_cache::EvalCache> openEvalCache(
assert(aOutputs); assert(aOutputs);
return aOutputs->value; return aOutputs->value;
}); };
if (fingerprint) {
auto search = state.evalCaches.find(fingerprint.value());
if (search == state.evalCaches.end()) {
search = state.evalCaches.emplace(fingerprint.value(), make_ref<nix::eval_cache::EvalCache>(fingerprint, state, rootLoader)).first;
}
return search->second;
} else {
return make_ref<nix::eval_cache::EvalCache>(std::nullopt, state, rootLoader);
}
} }
Installables SourceExprCommand::parseInstallables( Installables SourceExprCommand::parseInstallables(

9
src/libexpr/eval.hh
View file

@ -32,6 +32,10 @@ class EvalState;
class StorePath; class StorePath;
struct SingleDerivedPath; struct SingleDerivedPath;
enum RepairFlag : bool; enum RepairFlag : bool;
struct MemoryInputAccessor;
namespace eval_cache {
class EvalCache;
}
/** /**
@ -233,6 +237,11 @@ public:
return *new EvalErrorBuilder<T>(*this, args...); return *new EvalErrorBuilder<T>(*this, args...);
} }
/**
* A cache for evaluation caches, so as to reuse the same root value if possible
*/
std::map<const Hash, ref<eval_cache::EvalCache>> evalCaches;
private: private:
/* Cache for calls to addToStore(); maps source paths to the store /* Cache for calls to addToStore(); maps source paths to the store