alois31/nix-eval-jobs
0
0
Fork 0
forked from lix-project/nix-eval-jobs
Code Pull requests Activity

Merge pull request #57 from jsoo1/refactor-top-level-value-finding

Browse source 
Refactor top-level value finding.
This commit is contained in:
adisbladis 2022-04-22 13:29:26 +07:00 committed by GitHub
parent 2a491dd7fd dd8a2e89a0
commit 55d91140be
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 53 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/nix-eval-jobs.cc
View file

@ -116,16 +116,19 @@ struct MyArgs : MixEvalArgs, MixCommonArgs
static MyArgs myArgs; static MyArgs myArgs;
static void worker( static Value* releaseExprTopLevelValue(EvalState & state, Bindings & autoArgs) {
EvalState & state,
Bindings & autoArgs,
AutoCloseFD & to,
AutoCloseFD & from,
const Path &gcRootsDir)
{
Value vTop; Value vTop;
if (myArgs.flake) { state.evalFile(lookupFileArg(state, myArgs.releaseExpr), vTop);
auto vRoot = state.allocValue();
state.autoCallFunction(autoArgs, vTop, *vRoot);
return vRoot;
}
static Value* flakeTopLevelValue(EvalState & state, Bindings & autoArgs) {
using namespace flake; using namespace flake;
auto [flakeRef, fragment] = parseFlakeRefWithFragment(myArgs.releaseExpr, absPath(".")); auto [flakeRef, fragment] = parseFlakeRefWithFragment(myArgs.releaseExpr, absPath("."));
@ -143,7 +146,7 @@ static void worker(
auto vOutputs = vFlake->attrs->get(state.symbols.create("outputs"))->value; auto vOutputs = vFlake->attrs->get(state.symbols.create("outputs"))->value;
state.forceValue(*vOutputs, noPos); state.forceValue(*vOutputs, noPos);
vTop = *vOutputs; auto vTop = *vOutputs;
if (fragment.length() > 0) { if (fragment.length() > 0) {
Bindings & bindings(*state.allocBindings(0)); Bindings & bindings(*state.allocBindings(0));
@ -153,13 +156,27 @@ static void worker(
vTop = *nTop; vTop = *nTop;
} }
} else {
state.evalFile(lookupFileArg(state, myArgs.releaseExpr), vTop);
}
auto vRoot = state.allocValue(); auto vRoot = state.allocValue();
state.autoCallFunction(autoArgs, vTop, *vRoot); state.autoCallFunction(autoArgs, vTop, *vRoot);
return vRoot;
}
Value * topLevelValue(EvalState & state, Bindings & autoArgs) {
return myArgs.flake
? flakeTopLevelValue(state, autoArgs)
: releaseExprTopLevelValue(state, autoArgs);
}
static void worker(
EvalState & state,
Bindings & autoArgs,
AutoCloseFD & to,
AutoCloseFD & from,
const Path &gcRootsDir)
{
auto vRoot = topLevelValue(state, autoArgs);
while (true) { while (true) {
/* Wait for the master to send us a job name. */ /* Wait for the master to send us a job name. */
writeLine(to.get(), "next"); writeLine(to.get(), "next");