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

src/nix-eval-jobs.cc: Reformat with clang-format

Browse source
This commit is contained in:
adisbladis 2022-04-26 21:15:56 +12:00
parent 8b8f456765
commit fec10f2cfc
1 changed files with 116 additions and 124 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -35,8 +35,7 @@ typedef enum { evalAuto, evalImpure, evalPure } pureEval;
// Safe to ignore - the args will be static. // Safe to ignore - the args will be static.
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
#pragma clang diagnostic ignored "-Wnon-virtual-dtor" #pragma clang diagnostic ignored "-Wnon-virtual-dtor"
struct MyArgs : MixEvalArgs, MixCommonArgs struct MyArgs : MixEvalArgs, MixCommonArgs {
{
Path releaseExpr; Path releaseExpr;
Path gcRootsDir; Path gcRootsDir;
bool flake = false; bool flake = false;
@ -46,18 +45,18 @@ struct MyArgs : MixEvalArgs, MixCommonArgs
size_t maxMemorySize = 4096; size_t maxMemorySize = 4096;
pureEval evalMode = evalAuto; pureEval evalMode = evalAuto;
MyArgs() : MixCommonArgs("nix-eval-jobs") MyArgs() : MixCommonArgs("nix-eval-jobs") {
{
addFlag({ addFlag({
.longName = "help", .longName = "help",
.description = "show usage information", .description = "show usage information",
.handler = {[&]() { .handler = {[&]() {
printf("USAGE: nix-eval-jobs [options] expr\n\n"); printf("USAGE: nix-eval-jobs [options] expr\n\n");
for (const auto & [name, flag] : longFlags) { for (const auto &[name, flag] : longFlags) {
if (hiddenCategories.count(flag->category)) { if (hiddenCategories.count(flag->category)) {
continue; continue;
} }
printf(" --%-20s %s\n", name.c_str(), flag->description.c_str()); printf(" --%-20s %s\n", name.c_str(),
flag->description.c_str());
} }
::exit(0); ::exit(0);
}}, }},
@ -66,53 +65,38 @@ struct MyArgs : MixEvalArgs, MixCommonArgs
addFlag({ addFlag({
.longName = "impure", .longName = "impure",
.description = "set evaluation mode", .description = "set evaluation mode",
.handler = {[&]() { .handler = {[&]() { evalMode = evalImpure; }},
evalMode = evalImpure;
}},
}); });
addFlag({ addFlag({.longName = "gc-roots-dir",
.longName = "gc-roots-dir", .description = "garbage collector roots directory",
.description = "garbage collector roots directory", .labels = {"path"},
.labels = {"path"}, .handler = {&gcRootsDir}});
.handler = {&gcRootsDir}
});
addFlag({ addFlag(
.longName = "workers", {.longName = "workers",
.description = "number of evaluate workers", .description = "number of evaluate workers",
.labels = {"workers"}, .labels = {"workers"},
.handler = {[=](std::string s) { .handler = {[=](std::string s) { nrWorkers = std::stoi(s); }}});
nrWorkers = std::stoi(s);
}}
});
addFlag({ addFlag({.longName = "max-memory-size",
.longName = "max-memory-size", .description = "maximum evaluation memory size",
.description = "maximum evaluation memory size", .labels = {"size"},
.labels = {"size"}, .handler = {
.handler = {[=](std::string s) { [=](std::string s) { maxMemorySize = std::stoi(s); }}});
maxMemorySize = std::stoi(s);
}}
});
addFlag({ addFlag({.longName = "flake",
.longName = "flake", .description = "build a flake",
.description = "build a flake", .handler = {&flake, true}});
.handler = {&flake, true}
});
addFlag({ addFlag({.longName = "meta",
.longName = "meta", .description = "include derivation meta field in output",
.description = "include derivation meta field in output", .handler = {&meta, true}});
.handler = {&meta, true}
});
addFlag({ addFlag({.longName = "show-trace",
.longName = "show-trace", .description =
.description = "print out a stack trace in case of evaluation errors", "print out a stack trace in case of evaluation errors",
.handler = {&showTrace, true} .handler = {&showTrace, true}});
});
expectArg("expr", &releaseExpr); expectArg("expr", &releaseExpr);
} }
@ -122,7 +106,7 @@ struct MyArgs : MixEvalArgs, MixCommonArgs
static MyArgs myArgs; static MyArgs myArgs;
static Value* releaseExprTopLevelValue(EvalState & state, Bindings & autoArgs) { static Value *releaseExprTopLevelValue(EvalState &state, Bindings &autoArgs) {
Value vTop; Value vTop;
state.evalFile(lookupFileArg(state, myArgs.releaseExpr), vTop); state.evalFile(lookupFileArg(state, myArgs.releaseExpr), vTop);
@ -134,19 +118,20 @@ static Value* releaseExprTopLevelValue(EvalState & state, Bindings & autoArgs) {
return vRoot; return vRoot;
} }
static Value* flakeTopLevelValue(EvalState & state, Bindings & autoArgs) { 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("."));
auto vFlake = state.allocValue(); auto vFlake = state.allocValue();
auto lockedFlake = lockFlake(state, flakeRef, auto lockedFlake = lockFlake(state, flakeRef,
LockFlags { LockFlags{
.updateLockFile = false, .updateLockFile = false,
.useRegistries = false, .useRegistries = false,
.allowMutable = false, .allowMutable = false,
}); });
callFlake(state, lockedFlake, *vFlake); callFlake(state, lockedFlake, *vFlake);
@ -155,7 +140,7 @@ static Value* flakeTopLevelValue(EvalState & state, Bindings & autoArgs) {
auto vTop = *vOutputs; auto vTop = *vOutputs;
if (fragment.length() > 0) { if (fragment.length() > 0) {
Bindings & bindings(*state.allocBindings(0)); Bindings &bindings(*state.allocBindings(0));
auto [nTop, pos] = findAlongAttrPath(state, fragment, bindings, vTop); auto [nTop, pos] = findAlongAttrPath(state, fragment, bindings, vTop);
if (!nTop) if (!nTop)
throw Error("error: attribute '%s' missing", nTop); throw Error("error: attribute '%s' missing", nTop);
@ -168,10 +153,9 @@ static Value* flakeTopLevelValue(EvalState & state, Bindings & autoArgs) {
return vRoot; return vRoot;
} }
Value * topLevelValue(EvalState & state, Bindings & autoArgs) { Value *topLevelValue(EvalState &state, Bindings &autoArgs) {
return myArgs.flake return myArgs.flake ? flakeTopLevelValue(state, autoArgs)
? flakeTopLevelValue(state, autoArgs) : releaseExprTopLevelValue(state, autoArgs);
: releaseExprTopLevelValue(state, autoArgs);
} }
/* The fields of a derivation that are printed in json form */ /* The fields of a derivation that are printed in json form */
@ -182,7 +166,7 @@ struct Drv {
std::map<std::string, std::string> outputs; std::map<std::string, std::string> outputs;
std::optional<nlohmann::json> meta; std::optional<nlohmann::json> meta;
Drv (EvalState & state, DrvInfo & drvInfo) { Drv(EvalState &state, DrvInfo &drvInfo) {
if (drvInfo.querySystem() == "unknown") if (drvInfo.querySystem() == "unknown")
throw EvalError("derivation must have a 'system' attribute"); throw EvalError("derivation must have a 'system' attribute");
@ -191,12 +175,11 @@ struct Drv {
for (auto out : drvInfo.queryOutputs(true)) { for (auto out : drvInfo.queryOutputs(true)) {
if (out.second) if (out.second)
outputs[out.first] = localStore->printStorePath(*out.second); outputs[out.first] = localStore->printStorePath(*out.second);
} }
if (myArgs.meta) { if (myArgs.meta) {
nlohmann::json meta_; nlohmann::json meta_;
for (auto & name : drvInfo.queryMetaNames()) { for (auto &name : drvInfo.queryMetaNames()) {
PathSet context; PathSet context;
std::stringstream ss; std::stringstream ss;
@ -220,17 +203,16 @@ struct Drv {
} }
}; };
static void to_json(nlohmann::json & json, const Drv & drv) { static void to_json(nlohmann::json &json, const Drv &drv) {
json = nlohmann::json{ json = nlohmann::json{
{ "name", drv.name }, {"name", drv.name},
{ "system", drv.system }, {"system", drv.system},
{ "drvPath", drv.drvPath }, {"drvPath", drv.drvPath},
{ "outputs", drv.outputs }, {"outputs", drv.outputs},
}; };
if (drv.meta.has_value()) if (drv.meta.has_value())
json["meta"] = drv.meta.value(); json["meta"] = drv.meta.value();
} }
std::string attrPathJoin(json input) { std::string attrPathJoin(json input) {
@ -244,12 +226,8 @@ std::string attrPathJoin(json input) {
}); });
} }
static void worker( static void worker(EvalState &state, Bindings &autoArgs, AutoCloseFD &to,
EvalState & state, AutoCloseFD &from) {
Bindings & autoArgs,
AutoCloseFD & to,
AutoCloseFD & from)
{
auto vRoot = topLevelValue(state, autoArgs); auto vRoot = topLevelValue(state, autoArgs);
while (true) { while (true) {
@ -257,17 +235,20 @@ static void worker(
writeLine(to.get(), "next"); writeLine(to.get(), "next");
auto s = readLine(from.get()); auto s = readLine(from.get());
if (s == "exit") break; if (s == "exit")
if (!hasPrefix(s, "do ")) abort(); break;
if (!hasPrefix(s, "do "))
abort();
auto path = json::parse(s.substr(3)); auto path = json::parse(s.substr(3));
auto attrPathS = attrPathJoin(path); auto attrPathS = attrPathJoin(path);
debug("worker process %d at '%s'", getpid(), path); debug("worker process %d at '%s'", getpid(), path);
/* Evaluate it and send info back to the collector. */ /* Evaluate it and send info back to the collector. */
json reply = json{ {"attr", attrPathS }, {"attrPath", path} }; json reply = json{{"attr", attrPathS}, {"attrPath", path}};
try { try {
auto vTmp = findAlongAttrPath(state, attrPathS, autoArgs, *vRoot).first; auto vTmp =
findAlongAttrPath(state, attrPathS, autoArgs, *vRoot).first;
auto v = state.allocValue(); auto v = state.allocValue();
state.autoCallFunction(autoArgs, *vTmp, *v); state.autoCallFunction(autoArgs, *vTmp, *v);
@ -281,42 +262,49 @@ static void worker(
registers roots for jobs that we may have already registers roots for jobs that we may have already
done. */ done. */
if (myArgs.gcRootsDir != "") { if (myArgs.gcRootsDir != "") {
Path root = myArgs.gcRootsDir + "/" + std::string(baseNameOf(drv.drvPath)); Path root = myArgs.gcRootsDir + "/" +
std::string(baseNameOf(drv.drvPath));
if (!pathExists(root)) { if (!pathExists(root)) {
auto localStore = state.store.dynamic_pointer_cast<LocalFSStore>(); auto localStore =
auto storePath = localStore->parseStorePath(drv.drvPath); state.store.dynamic_pointer_cast<LocalFSStore>();
auto storePath =
localStore->parseStorePath(drv.drvPath);
localStore->addPermRoot(storePath, root); localStore->addPermRoot(storePath, root);
} }
} }
} }
else if (v->type() == nAttrs) else if (v->type() == nAttrs) {
{
auto attrs = nlohmann::json::array(); auto attrs = nlohmann::json::array();
bool recurse = path.size() == 0; // Dont require `recurseForDerivations = true;` for top-level attrset bool recurse =
path.size() == 0; // Dont require `recurseForDerivations =
// true;` for top-level attrset
for (auto & i : v->attrs->lexicographicOrder()) { for (auto &i : v->attrs->lexicographicOrder()) {
std::string name(i->name); std::string name(i->name);
attrs.push_back(name); attrs.push_back(name);
if (name == "recurseForDerivations") { if (name == "recurseForDerivations") {
auto attrv = v->attrs->get(state.sRecurseForDerivations); auto attrv =
recurse = state.forceBool(*attrv->value, *attrv->pos); v->attrs->get(state.sRecurseForDerivations);
recurse = state.forceBool(*attrv->value, *attrv->pos);
} }
} }
if (recurse) if (recurse)
reply["attrs"] = std::move(attrs); reply["attrs"] = std::move(attrs);
else else
reply["attrs"] = nlohmann::json::array(); reply["attrs"] = nlohmann::json::array();
} }
else if (v->type() == nNull) else if (v->type() == nNull)
; ;
else throw TypeError("attribute '%s' is %s, which is not supported", path, showType(*v)); else
throw TypeError("attribute '%s' is %s, which is not supported",
path, showType(*v));
} catch (EvalError & e) { } catch (EvalError &e) {
auto err = e.info(); auto err = e.info();
std::ostringstream oss; std::ostringstream oss;
@ -337,13 +325,15 @@ static void worker(
start a new process. */ start a new process. */
struct rusage r; struct rusage r;
getrusage(RUSAGE_SELF, &r); getrusage(RUSAGE_SELF, &r);
if ((size_t) r.ru_maxrss > myArgs.maxMemorySize * 1024) break; if ((size_t)r.ru_maxrss > myArgs.maxMemorySize * 1024)
break;
} }
writeLine(to.get(), "restart"); writeLine(to.get(), "restart");
} }
typedef std::function<void(EvalState & state, Bindings & autoArgs, AutoCloseFD & to, AutoCloseFD & from)> typedef std::function<void(EvalState &state, Bindings &autoArgs,
AutoCloseFD &to, AutoCloseFD &from)>
Processor; Processor;
/* Auto-cleanup of fork's process and fds. */ /* Auto-cleanup of fork's process and fds. */
@ -351,22 +341,21 @@ struct Proc {
AutoCloseFD to, from; AutoCloseFD to, from;
Pid pid; Pid pid;
Proc(const Processor & proc) { Proc(const Processor &proc) {
Pipe toPipe, fromPipe; Pipe toPipe, fromPipe;
toPipe.create(); toPipe.create();
fromPipe.create(); fromPipe.create();
auto p = startProcess( auto p = startProcess(
[&, [&,
to{std::make_shared<AutoCloseFD>(std::move(fromPipe.writeSide))}, to{std::make_shared<AutoCloseFD>(std::move(fromPipe.writeSide))},
from{std::make_shared<AutoCloseFD>(std::move(toPipe.readSide))} from{
]() std::make_shared<AutoCloseFD>(std::move(toPipe.readSide))}]() {
{
debug("created worker process %d", getpid()); debug("created worker process %d", getpid());
try { try {
EvalState state(myArgs.searchPath, openStore()); EvalState state(myArgs.searchPath, openStore());
Bindings & autoArgs = *myArgs.getAutoArgs(state); Bindings &autoArgs = *myArgs.getAutoArgs(state);
proc(state, autoArgs, *to, *from); proc(state, autoArgs, *to, *from);
} catch (Error & e) { } catch (Error &e) {
nlohmann::json err; nlohmann::json err;
auto msg = e.msg(); auto msg = e.msg();
err["error"] = filterANSIEscapes(msg, true); err["error"] = filterANSIEscapes(msg, true);
@ -377,33 +366,32 @@ struct Proc {
writeLine(to->get(), "restart"); writeLine(to->get(), "restart");
} }
}, },
ProcessOptions { .allowVfork = false }); ProcessOptions{.allowVfork = false});
to = std::move(toPipe.writeSide); to = std::move(toPipe.writeSide);
from = std::move(fromPipe.readSide); from = std::move(fromPipe.readSide);
pid = p; pid = p;
} }
~Proc() { } ~Proc() {}
}; };
struct State struct State {
{ std::set<json> todo = json::array({json::array()});
std::set<json> todo = json::array({ json::array() }); std::set<json> active;
std::set<json> active; std::exception_ptr exc;
std::exception_ptr exc;
}; };
std::function<void()> collector(Sync<State> & state_, std::condition_variable & wakeup) { std::function<void()> collector(Sync<State> &state_,
std::condition_variable &wakeup) {
return [&]() { return [&]() {
try { try {
std::optional<std::unique_ptr<Proc>> proc_; std::optional<std::unique_ptr<Proc>> proc_;
while (true) { while (true) {
auto proc = proc_.has_value() auto proc = proc_.has_value() ? std::move(proc_.value())
? std::move(proc_.value()) : std::make_unique<Proc>(worker);
: std::make_unique<Proc>(worker);
/* Check whether the existing worker process is still there. */ /* Check whether the existing worker process is still there. */
auto s = readLine(proc->from.get()); auto s = readLine(proc->from.get());
@ -412,7 +400,7 @@ std::function<void()> collector(Sync<State> & state_, std::condition_variable &
continue; continue;
} else if (s != "next") { } else if (s != "next") {
auto json = json::parse(s); auto json = json::parse(s);
throw Error("worker error: %s", (std::string) json["error"]); throw Error("worker error: %s", (std::string)json["error"]);
} }
/* Wait for a job name to become available. */ /* Wait for a job name to become available. */
@ -421,7 +409,8 @@ std::function<void()> collector(Sync<State> & state_, std::condition_variable &
while (true) { while (true) {
checkInterrupt(); checkInterrupt();
auto state(state_.lock()); auto state(state_.lock());
if ((state->todo.empty() && state->active.empty()) || state->exc) { if ((state->todo.empty() && state->active.empty()) ||
state->exc) {
writeLine(proc->to.get(), "exit"); writeLine(proc->to.get(), "exit");
return; return;
} }
@ -444,10 +433,10 @@ std::function<void()> collector(Sync<State> & state_, std::condition_variable &
/* Handle the response. */ /* Handle the response. */
std::vector<json> newAttrs; std::vector<json> newAttrs;
if (response.find("attrs") != response.end()) { if (response.find("attrs") != response.end()) {
for (auto & i : response["attrs"]) { for (auto &i : response["attrs"]) {
json newAttr = json(response["attrPath"]); json newAttr = json(response["attrPath"]);
newAttr.emplace_back(i); newAttr.emplace_back(i);
newAttrs.push_back(newAttr); newAttrs.push_back(newAttr);
} }
} else { } else {
auto state(state_.lock()); auto state(state_.lock());
@ -474,8 +463,7 @@ std::function<void()> collector(Sync<State> & state_, std::condition_variable &
}; };
} }
int main(int argc, char * * argv) int main(int argc, char **argv) {
{
/* Prevent undeclared dependencies in the evaluation via /* Prevent undeclared dependencies in the evaluation via
$NIX_PATH. */ $NIX_PATH. */
unsetenv("NIX_PATH"); unsetenv("NIX_PATH");
@ -489,7 +477,8 @@ int main(int argc, char * * argv)
myArgs.parseCmdline(argvToStrings(argc, argv)); myArgs.parseCmdline(argvToStrings(argc, argv));
/* FIXME: The build hook in conjunction with import-from-derivation is causing "unexpected EOF" during eval */ /* FIXME: The build hook in conjunction with import-from-derivation is
* causing "unexpected EOF" during eval */
settings.builders = ""; settings.builders = "";
/* Prevent access to paths outside of the Nix search path and /* Prevent access to paths outside of the Nix search path and
@ -498,11 +487,15 @@ int main(int argc, char * * argv)
/* When building a flake, use pure evaluation (no access to /* When building a flake, use pure evaluation (no access to
'getEnv', 'currentSystem' etc. */ 'getEnv', 'currentSystem' etc. */
evalSettings.pureEval = myArgs.evalMode == evalAuto ? myArgs.flake : myArgs.evalMode == evalPure; evalSettings.pureEval = myArgs.evalMode == evalAuto
? myArgs.flake
: myArgs.evalMode == evalPure;
if (myArgs.releaseExpr == "") throw UsageError("no expression specified"); if (myArgs.releaseExpr == "")
throw UsageError("no expression specified");
if (myArgs.gcRootsDir == "") printMsg(lvlError, "warning: `--gc-roots-dir' not specified"); if (myArgs.gcRootsDir == "")
printMsg(lvlError, "warning: `--gc-roots-dir' not specified");
if (myArgs.showTrace) { if (myArgs.showTrace) {
loggerSettings.showTrace.assign(true); loggerSettings.showTrace.assign(true);
@ -516,13 +509,12 @@ int main(int argc, char * * argv)
for (size_t i = 0; i < myArgs.nrWorkers; i++) for (size_t i = 0; i < myArgs.nrWorkers; i++)
threads.emplace_back(std::thread(collector(state_, wakeup))); threads.emplace_back(std::thread(collector(state_, wakeup)));
for (auto & thread : threads) for (auto &thread : threads)
thread.join(); thread.join();
auto state(state_.lock()); auto state(state_.lock());
if (state->exc) if (state->exc)
std::rethrow_exception(state->exc); std::rethrow_exception(state->exc);
}); });
} }