NixOS/nix
NixOS/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2024-09-19 10:50:24 -04:00
Code Activity

Clean up cache for all commands

Browse source
This commit is contained in:
Lexi Mattick 2024-07-12 11:54:12 -07:00
parent e764ed31f6
commit 6c4470ec2a
5 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/nix/develop.cc
View file

@ -701,7 +701,7 @@ struct CmdDevelop : Common, MixEnvironment
// we are about to exec out of this process without running C++ destructors.
getEvalState()->evalCaches.clear();
runProgramInStore(store, UseLookupPath::Use, shell, args, buildEnvironment.getSystem());
execProgramInStore(store, UseLookupPath::Use, shell, args, buildEnvironment.getSystem());
#endif
}
};

7
src/nix/env.cc
View file

@ -1,4 +1,5 @@
#include "command.hh"
#include "eval.hh"
#include "run.hh"
#include <queue>
@ -99,7 +100,11 @@ struct CmdShell : InstallablesCommand, MixEnvironment
for (auto & arg : command)
args.push_back(arg);
runProgramInStore(store, UseLookupPath::Use, *command.begin(), args);
// Release our references to eval caches to ensure they are persisted to disk, because
// we are about to exec out of this process without running C++ destructors.
getEvalState()->evalCaches.clear();
execProgramInStore(store, UseLookupPath::Use, *command.begin(), args);
}
};

7
src/nix/fmt.cc
View file

@ -1,5 +1,6 @@
#include "command.hh"
#include "installable-value.hh"
#include "eval.hh"
#include "run.hh"
using namespace nix;
@ -49,7 +50,11 @@ struct CmdFmt : SourceExprCommand {
}
}
runProgramInStore(store, UseLookupPath::DontUse, app.program, programArgs);
// Release our references to eval caches to ensure they are persisted to disk, because
// we are about to exec out of this process without running C++ destructors.
evalState->evalCaches.clear();
execProgramInStore(store, UseLookupPath::DontUse, app.program, programArgs);
};
};

8
src/nix/run.cc
View file

@ -25,7 +25,7 @@ std::string chrootHelperName = "__run_in_chroot";
namespace nix {
void runProgramInStore(ref<Store> store,
void execProgramInStore(ref<Store> store,
UseLookupPath useLookupPath,
const std::string & program,
const Strings & args,
@ -128,7 +128,11 @@ struct CmdRun : InstallableValueCommand
Strings allArgs{app.program};
for (auto & i : args) allArgs.push_back(i);
runProgramInStore(store, UseLookupPath::DontUse, app.program, allArgs);
// Release our references to eval caches to ensure they are persisted to disk, because
// we are about to exec out of this process without running C++ destructors.
state->evalCaches.clear();
execProgramInStore(store, UseLookupPath::DontUse, app.program, allArgs);
}
};

2
src/nix/run.hh
View file

@ -10,7 +10,7 @@ enum struct UseLookupPath {
DontUse
};
void runProgramInStore(ref<Store> store,
void execProgramInStore(ref<Store> store,
UseLookupPath useLookupPath,
const std::string & program,
const Strings & args,