max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-29 17:16:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

readDir: Allocate type strings only once

Browse source
This commit is contained in:
Robert Hensing 2024-03-20 22:56:42 +01:00
parent 7d2ead50e5
commit d71e74838a
3 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/libexpr/eval.cc
View file

@ -437,6 +437,10 @@ EvalState::EvalState(
vEmptyList.mkList(buildList(0)); vEmptyList.mkList(buildList(0));
vNull.mkNull(); vNull.mkNull();
vStringRegular.mkString("regular");
vStringDirectory.mkString("directory");
vStringSymlink.mkString("symlink");
vStringUnknown.mkString("unknown");
/* Initialise the Nix expression search path. */ /* Initialise the Nix expression search path. */
if (!evalSettings.pureEval) { if (!evalSettings.pureEval) {

9
src/libexpr/eval.hh
View file

@ -191,6 +191,15 @@ public:
*/ */
Value vNull; Value vNull;
/** `"regular"` */
Value vStringRegular;
/** `"directory"` */
Value vStringDirectory;
/** `"symlink"` */
Value vStringSymlink;
/** `"unknown"` */
Value vStringUnknown;
/** /**
* The accessor for the root filesystem. * The accessor for the root filesystem.
*/ */

21
src/libexpr/primops.cc
View file

@ -1775,20 +1775,20 @@ static RegisterPrimOp primop_hashFile({
.fun = prim_hashFile, .fun = prim_hashFile,
}); });
static std::string_view fileTypeToString(InputAccessor::Type type) static Value * fileTypeToString(EvalState & state, InputAccessor::Type type)
{ {
return return
type == InputAccessor::Type::tRegular ? "regular" : type == InputAccessor::Type::tRegular ? &state.vStringRegular :
type == InputAccessor::Type::tDirectory ? "directory" : type == InputAccessor::Type::tDirectory ? &state.vStringDirectory :
type == InputAccessor::Type::tSymlink ? "symlink" : type == InputAccessor::Type::tSymlink ? &state.vStringSymlink :
"unknown"; &state.vStringUnknown;
} }
static void prim_readFileType(EvalState & state, const PosIdx pos, Value * * args, Value & v) static void prim_readFileType(EvalState & state, const PosIdx pos, Value * * args, Value & v)
{ {
auto path = realisePath(state, pos, *args[0], std::nullopt); auto path = realisePath(state, pos, *args[0], std::nullopt);
/* Retrieve the directory entry type and stringize it. */ /* Retrieve the directory entry type and stringize it. */
v.mkString(fileTypeToString(path.lstat().type)); v = *fileTypeToString(state, path.lstat().type);
} }
static RegisterPrimOp primop_readFileType({ static RegisterPrimOp primop_readFileType({
@ -1819,8 +1819,8 @@ static void prim_readDir(EvalState & state, const PosIdx pos, Value * * args, Va
Value * readFileType = nullptr; Value * readFileType = nullptr;
for (auto & [name, type] : entries) { for (auto & [name, type] : entries) {
auto & attr = attrs.alloc(name);
if (!type) { if (!type) {
auto & attr = attrs.alloc(name);
// Some filesystems or operating systems may not be able to return // Some filesystems or operating systems may not be able to return
// detailed node info quickly in this case we produce a thunk to // detailed node info quickly in this case we produce a thunk to
// query the file type lazily. // query the file type lazily.
@ -1832,7 +1832,7 @@ static void prim_readDir(EvalState & state, const PosIdx pos, Value * * args, Va
} else { } else {
// This branch of the conditional is much more likely. // This branch of the conditional is much more likely.
// Here we just stringize the directory entry type. // Here we just stringize the directory entry type.
attr.mkString(fileTypeToString(*type)); attrs.insert(state.symbols.create(name), fileTypeToString(state, *type));
} }
} }
@ -2193,11 +2193,8 @@ bool EvalState::callPathFilter(
Value arg1; Value arg1;
arg1.mkString(pathArg); arg1.mkString(pathArg);
Value arg2;
// assert that type is not "unknown" // assert that type is not "unknown"
arg2.mkString(fileTypeToString(st.type)); Value * args []{&arg1, fileTypeToString(*this, st.type)};
Value * args []{&arg1, &arg2};
Value res; Value res;
callFunction(*filterFun, 2, args, res, pos); callFunction(*filterFun, 2, args, res, pos);