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

146
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.
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
struct MyArgs : MixEvalArgs, MixCommonArgs
{
struct MyArgs : MixEvalArgs, MixCommonArgs {
Path releaseExpr;
Path gcRootsDir;
bool flake = false;
@ -46,8 +45,7 @@ struct MyArgs : MixEvalArgs, MixCommonArgs
size_t maxMemorySize = 4096;
pureEval evalMode = evalAuto;
MyArgs() : MixCommonArgs("nix-eval-jobs")
{
MyArgs() : MixCommonArgs("nix-eval-jobs") {
addFlag({
.longName = "help",
.description = "show usage information",
@ -57,7 +55,8 @@ struct MyArgs : MixEvalArgs, MixCommonArgs
if (hiddenCategories.count(flag->category)) {
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);
}},
@ -66,53 +65,38 @@ struct MyArgs : MixEvalArgs, MixCommonArgs
addFlag({
.longName = "impure",
.description = "set evaluation mode",
.handler = {[&]() {
evalMode = evalImpure;
}},
.handler = {[&]() { evalMode = evalImpure; }},
});
addFlag({
.longName = "gc-roots-dir",
addFlag({.longName = "gc-roots-dir",
.description = "garbage collector roots directory",
.labels = {"path"},
.handler = {&gcRootsDir}
});
.handler = {&gcRootsDir}});
addFlag({
.longName = "workers",
addFlag(
{.longName = "workers",
.description = "number of evaluate workers",
.labels = {"workers"},
.handler = {[=](std::string s) {
nrWorkers = std::stoi(s);
}}
});
.handler = {[=](std::string s) { nrWorkers = std::stoi(s); }}});
addFlag({
.longName = "max-memory-size",
addFlag({.longName = "max-memory-size",
.description = "maximum evaluation memory size",
.labels = {"size"},
.handler = {[=](std::string s) {
maxMemorySize = std::stoi(s);
}}
});
.handler = {
[=](std::string s) { maxMemorySize = std::stoi(s); }}});
addFlag({
.longName = "flake",
addFlag({.longName = "flake",
.description = "build a flake",
.handler = {&flake, true}
});
.handler = {&flake, true}});
addFlag({
.longName = "meta",
addFlag({.longName = "meta",
.description = "include derivation meta field in output",
.handler = {&meta, true}
});
.handler = {&meta, true}});
addFlag({
.longName = "show-trace",
.description = "print out a stack trace in case of evaluation errors",
.handler = {&showTrace, true}
});
addFlag({.longName = "show-trace",
.description =
"print out a stack trace in case of evaluation errors",
.handler = {&showTrace, true}});
expectArg("expr", &releaseExpr);
}
@ -137,7 +121,8 @@ static Value* releaseExprTopLevelValue(EvalState & state, Bindings & autoArgs) {
static Value *flakeTopLevelValue(EvalState &state, Bindings &autoArgs) {
using namespace flake;
auto [flakeRef, fragment] = parseFlakeRefWithFragment(myArgs.releaseExpr, absPath("."));
auto [flakeRef, fragment] =
parseFlakeRefWithFragment(myArgs.releaseExpr, absPath("."));
auto vFlake = state.allocValue();
@ -169,8 +154,7 @@ static Value* flakeTopLevelValue(EvalState & state, Bindings & autoArgs) {
}
Value *topLevelValue(EvalState &state, Bindings &autoArgs) {
return myArgs.flake
? flakeTopLevelValue(state, autoArgs)
return myArgs.flake ? flakeTopLevelValue(state, autoArgs)
: releaseExprTopLevelValue(state, autoArgs);
}
@ -191,7 +175,6 @@ struct Drv {
for (auto out : drvInfo.queryOutputs(true)) {
if (out.second)
outputs[out.first] = localStore->printStorePath(*out.second);
}
if (myArgs.meta) {
@ -230,7 +213,6 @@ static void to_json(nlohmann::json & json, const Drv & drv) {
if (drv.meta.has_value())
json["meta"] = drv.meta.value();
}
std::string attrPathJoin(json input) {
@ -244,12 +226,8 @@ std::string attrPathJoin(json input) {
});
}
static void worker(
EvalState & state,
Bindings & autoArgs,
AutoCloseFD & to,
AutoCloseFD & from)
{
static void worker(EvalState &state, Bindings &autoArgs, AutoCloseFD &to,
AutoCloseFD &from) {
auto vRoot = topLevelValue(state, autoArgs);
while (true) {
@ -257,8 +235,10 @@ static void worker(
writeLine(to.get(), "next");
auto s = readLine(from.get());
if (s == "exit") break;
if (!hasPrefix(s, "do ")) abort();
if (s == "exit")
break;
if (!hasPrefix(s, "do "))
abort();
auto path = json::parse(s.substr(3));
auto attrPathS = attrPathJoin(path);
@ -267,7 +247,8 @@ static void worker(
/* Evaluate it and send info back to the collector. */
json reply = json{{"attr", attrPathS}, {"attrPath", path}};
try {
auto vTmp = findAlongAttrPath(state, attrPathS, autoArgs, *vRoot).first;
auto vTmp =
findAlongAttrPath(state, attrPathS, autoArgs, *vRoot).first;
auto v = state.allocValue();
state.autoCallFunction(autoArgs, *vTmp, *v);
@ -281,27 +262,32 @@ static void worker(
registers roots for jobs that we may have already
done. */
if (myArgs.gcRootsDir != "") {
Path root = myArgs.gcRootsDir + "/" + std::string(baseNameOf(drv.drvPath));
Path root = myArgs.gcRootsDir + "/" +
std::string(baseNameOf(drv.drvPath));
if (!pathExists(root)) {
auto localStore = state.store.dynamic_pointer_cast<LocalFSStore>();
auto storePath = localStore->parseStorePath(drv.drvPath);
auto localStore =
state.store.dynamic_pointer_cast<LocalFSStore>();
auto storePath =
localStore->parseStorePath(drv.drvPath);
localStore->addPermRoot(storePath, root);
}
}
}
else if (v->type() == nAttrs)
{
else if (v->type() == nAttrs) {
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()) {
std::string name(i->name);
attrs.push_back(name);
if (name == "recurseForDerivations") {
auto attrv = v->attrs->get(state.sRecurseForDerivations);
auto attrv =
v->attrs->get(state.sRecurseForDerivations);
recurse = state.forceBool(*attrv->value, *attrv->pos);
}
}
@ -314,7 +300,9 @@ static void worker(
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) {
auto err = e.info();
@ -337,13 +325,15 @@ static void worker(
start a new process. */
struct rusage 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");
}
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;
/* Auto-cleanup of fork's process and fds. */
@ -358,9 +348,8 @@ struct Proc {
auto p = startProcess(
[&,
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());
try {
EvalState state(myArgs.searchPath, openStore());
@ -387,22 +376,21 @@ struct Proc {
~Proc() {}
};
struct State
{
struct State {
std::set<json> todo = json::array({json::array()});
std::set<json> active;
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 [&]() {
try {
std::optional<std::unique_ptr<Proc>> proc_;
while (true) {
auto proc = proc_.has_value()
? std::move(proc_.value())
auto proc = proc_.has_value() ? std::move(proc_.value())
: std::make_unique<Proc>(worker);
/* Check whether the existing worker process is still there. */
@ -421,7 +409,8 @@ std::function<void()> collector(Sync<State> & state_, std::condition_variable &
while (true) {
checkInterrupt();
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");
return;
}
@ -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
$NIX_PATH. */
unsetenv("NIX_PATH");
@ -489,7 +477,8 @@ int main(int argc, char * * 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 = "";
/* 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
'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) {
loggerSettings.showTrace.assign(true);
@ -523,6 +516,5 @@ int main(int argc, char * * argv)
if (state->exc)
std::rethrow_exception(state->exc);
});
}