aboutsummaryrefslogtreecommitdiff
path: root/src/nix/eval.cc
diff options
context:
space:
mode:
authorpennae <github@quasiparticle.net>2022-03-05 14:40:24 +0100
committerpennae <github@quasiparticle.net>2022-04-21 21:56:31 +0200
commit8775be33931ec3b1cad97035ff3d5370a97178a1 (patch)
tree0855d6b35e24153092738315176ea19aa72b9530 /src/nix/eval.cc
parent00a32802328b58daa7af48ccac60f6154ef05639 (diff)
store Symbols in a table as well, like positions
this slightly increases the amount of memory used for any given symbol, but this increase is more than made up for if the symbol is referenced more than once in the EvalState that holds it. on average every symbol should be referenced at least twice (once to introduce a binding, once to use it), so we expect no increase in memory on average. symbol tables are limited to 2³² entries like position tables, and similar arguments apply to why overflow is not likely: 2³² symbols would require as many string instances (at 24 bytes each) and map entries (at 24 bytes or more each, assuming that the map holds on average at most one item per bucket as the docs say). a full symbol table would require at least 192GB of memory just for symbols, which is well out of reach. (an ofborg eval of nixpks today creates less than a million symbols!)
Diffstat (limited to 'src/nix/eval.cc')
-rw-r--r--src/nix/eval.cc14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/nix/eval.cc b/src/nix/eval.cc
index 81474c2d3..967dc8519 100644
--- a/src/nix/eval.cc
+++ b/src/nix/eval.cc
@@ -88,17 +88,19 @@ struct CmdEval : MixJSON, InstallableCommand
else if (v.type() == nAttrs) {
if (mkdir(path.c_str(), 0777) == -1)
throw SysError("creating directory '%s'", path);
- for (auto & attr : *v.attrs)
+ for (auto & attr : *v.attrs) {
+ std::string_view name = state->symbols[attr.name];
try {
- if (attr.name == "." || attr.name == "..")
- throw Error("invalid file name '%s'", attr.name);
- recurse(*attr.value, attr.pos, path + "/" + std::string(attr.name));
+ if (name == "." || name == "..")
+ throw Error("invalid file name '%s'", name);
+ recurse(*attr.value, attr.pos, concatStrings(path, "/", name));
} catch (Error & e) {
e.addTrace(
state->positions[attr.pos],
- hintfmt("while evaluating the attribute '%s'", attr.name));
+ hintfmt("while evaluating the attribute '%s'", name));
throw;
}
+ }
}
else
throw TypeError("value at '%s' is not a string or an attribute set", state->positions[pos]);
@@ -119,7 +121,7 @@ struct CmdEval : MixJSON, InstallableCommand
else {
state->forceValueDeep(*v);
- logger->cout("%s", *v);
+ logger->cout("%s", printValue(*state, *v));
}
}
};