thunk values are shareable, and we can represent invalid/uninitialized values with a special bit pattern that makes no sense otherwise. there is no need to keep allocating values on the heap, instead we can treat values like reference-counted smart pointers to heap objects, which in turn lets us save a lot of allocations and, ultimately, gc heap space. compared to our baseline (main of 2025-09-27) we save 15%+ memory on a system rebuild and 17% on nix search. eval time regresses by ~3% for a system rebuild, while nix search is 7% faster. further optimization is probably possible (but for now this will just have to be good enough). Change-Id: Ib6c47acdbe2fac4f76a83c2269f16f30ef66b2e1
189 lines
5.9 KiB
C++
189 lines
5.9 KiB
C++
#include "lix/libexpr/value-to-xml.hh"
|
|
#include "lix/libutil/xml-writer.hh"
|
|
#include "lix/libutil/signals.hh"
|
|
|
|
|
|
namespace nix {
|
|
|
|
static XMLAttrs singletonAttrs(const std::string & name, const std::string_view value)
|
|
{
|
|
XMLAttrs attrs;
|
|
attrs[name] = value;
|
|
return attrs;
|
|
}
|
|
|
|
|
|
static void printValueAsXML(EvalState & state, bool strict, bool location,
|
|
Value & v, XMLWriter & doc, NixStringContext & context, PathSet & drvsSeen,
|
|
const PosIdx pos);
|
|
|
|
|
|
static void posToXML(EvalState & state, XMLAttrs & xmlAttrs, const Pos & pos)
|
|
{
|
|
if (auto path = std::get_if<CheckedSourcePath>(&pos.origin))
|
|
xmlAttrs["path"] = path->to_string();
|
|
xmlAttrs["line"] = fmt("%1%", pos.line);
|
|
xmlAttrs["column"] = fmt("%1%", pos.column);
|
|
}
|
|
|
|
|
|
static void showAttrs(EvalState & state, bool strict, bool location,
|
|
Bindings & attrs, XMLWriter & doc, NixStringContext & context, PathSet & drvsSeen)
|
|
{
|
|
StringSet names;
|
|
|
|
for (auto & i : attrs)
|
|
names.emplace(state.ctx.symbols[i.name]);
|
|
|
|
for (auto & i : names) {
|
|
const Attr & a(*attrs.get(state.ctx.symbols.create(i)));
|
|
|
|
XMLAttrs xmlAttrs;
|
|
xmlAttrs["name"] = i;
|
|
if (location && a.pos) posToXML(state, xmlAttrs, state.ctx.positions[a.pos]);
|
|
|
|
XMLOpenElement _(doc, "attr", xmlAttrs);
|
|
printValueAsXML(state, strict, location, a.value, doc, context, drvsSeen, a.pos);
|
|
}
|
|
}
|
|
|
|
|
|
static void printValueAsXML(EvalState & state, bool strict, bool location,
|
|
Value & v, XMLWriter & doc, NixStringContext & context, PathSet & drvsSeen,
|
|
const PosIdx pos)
|
|
{
|
|
checkInterrupt();
|
|
|
|
if (strict) state.forceValue(v, pos);
|
|
|
|
switch (v.type()) {
|
|
|
|
case nInt:
|
|
doc.writeEmptyElement("int", singletonAttrs("value", fmt("%1%", v.integer())));
|
|
break;
|
|
|
|
case nBool:
|
|
doc.writeEmptyElement("bool", singletonAttrs("value", v.boolean() ? "true" : "false"));
|
|
break;
|
|
|
|
case nString:
|
|
/* !!! show the context? */
|
|
copyContext(v, context);
|
|
doc.writeEmptyElement("string", singletonAttrs("value", v.str()));
|
|
break;
|
|
|
|
case nPath:
|
|
doc.writeEmptyElement("path", singletonAttrs("value", v.path().to_string()));
|
|
break;
|
|
|
|
case nNull:
|
|
doc.writeEmptyElement("null");
|
|
break;
|
|
|
|
case nAttrs:
|
|
if (state.isDerivation(v)) {
|
|
XMLAttrs xmlAttrs;
|
|
|
|
auto a = v.attrs()->get(state.ctx.symbols.create("derivation"));
|
|
|
|
Path drvPath;
|
|
a = v.attrs()->get(state.ctx.s.drvPath);
|
|
if (a) {
|
|
if (strict) {
|
|
state.forceValue(a->value, a->pos);
|
|
}
|
|
if (a->value.type() == nString) {
|
|
xmlAttrs["drvPath"] = drvPath = a->value.str();
|
|
}
|
|
}
|
|
|
|
a = v.attrs()->get(state.ctx.s.outPath);
|
|
if (a) {
|
|
if (strict) {
|
|
state.forceValue(a->value, a->pos);
|
|
}
|
|
if (a->value.type() == nString) {
|
|
xmlAttrs["outPath"] = a->value.str();
|
|
}
|
|
}
|
|
|
|
XMLOpenElement _(doc, "derivation", xmlAttrs);
|
|
|
|
if (drvPath != "" && drvsSeen.insert(drvPath).second)
|
|
showAttrs(state, strict, location, *v.attrs(), doc, context, drvsSeen);
|
|
else
|
|
doc.writeEmptyElement("repeated");
|
|
}
|
|
|
|
else {
|
|
XMLOpenElement _(doc, "attrs");
|
|
showAttrs(state, strict, location, *v.attrs(), doc, context, drvsSeen);
|
|
}
|
|
|
|
break;
|
|
|
|
case nList: {
|
|
XMLOpenElement _(doc, "list");
|
|
for (auto & v2 : v.listItems()) {
|
|
printValueAsXML(state, strict, location, v2, doc, context, drvsSeen, pos);
|
|
}
|
|
break;
|
|
}
|
|
|
|
case nFunction: {
|
|
if (!v.isLambda()) {
|
|
// FIXME: Serialize primops and primopapps
|
|
doc.writeEmptyElement("unevaluated");
|
|
break;
|
|
}
|
|
XMLAttrs xmlAttrs;
|
|
if (location) posToXML(state, xmlAttrs, state.ctx.positions[v.lambda().fun->pos]);
|
|
XMLOpenElement _(doc, "function", xmlAttrs);
|
|
|
|
if (auto formals = dynamic_cast<AttrsPattern *>(v.lambda().fun->pattern.get()); formals) {
|
|
XMLAttrs attrs;
|
|
if (formals->name) attrs["name"] = state.ctx.symbols[formals->name];
|
|
if (formals->ellipsis) attrs["ellipsis"] = "1";
|
|
XMLOpenElement _(doc, "attrspat", attrs);
|
|
for (const AttrsPattern::Formal & i : formals->lexicographicOrder(state.ctx.symbols))
|
|
doc.writeEmptyElement("attr", singletonAttrs("name", state.ctx.symbols[i.name]));
|
|
} else
|
|
doc.writeEmptyElement("varpat", singletonAttrs("name", state.ctx.symbols[v.lambda().fun->pattern->name]));
|
|
|
|
break;
|
|
}
|
|
|
|
case nExternal:
|
|
v.external()->printValueAsXML(state, strict, location, doc, context, drvsSeen, pos);
|
|
break;
|
|
|
|
case nFloat:
|
|
doc.writeEmptyElement("float", singletonAttrs("value", fmt("%1%", v.fpoint())));
|
|
break;
|
|
|
|
case nThunk:
|
|
doc.writeEmptyElement("unevaluated");
|
|
}
|
|
}
|
|
|
|
|
|
void ExternalValueBase::printValueAsXML(EvalState & state, bool strict,
|
|
bool location, XMLWriter & doc, NixStringContext & context, PathSet & drvsSeen,
|
|
const PosIdx pos) const
|
|
{
|
|
doc.writeEmptyElement("unevaluated");
|
|
}
|
|
|
|
|
|
void printValueAsXML(EvalState & state, bool strict, bool location,
|
|
Value & v, std::ostream & out, NixStringContext & context, const PosIdx pos)
|
|
{
|
|
XMLWriter doc(true, out);
|
|
XMLOpenElement root(doc, "expr");
|
|
PathSet drvsSeen;
|
|
printValueAsXML(state, strict, location, v, doc, context, drvsSeen, pos);
|
|
}
|
|
|
|
|
|
}
|