mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* Randomise the order in which we delete entries to make the collector

Browse source 
less biased towards deleting paths that come alphabetically first
  (e.g. /nix/store/000...).  This matters when using --max-freed etc.
This commit is contained in:
Eelco Dolstra 2009-11-24 09:53:18 +00:00
parent ca50c83fbb
commit f9e766db98
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/libstore/gc.cc
View file

@ -7,6 +7,7 @@
#include <functional> #include <functional>
#include <queue> #include <queue>
#include <algorithm>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
@ -590,7 +591,7 @@ bool LocalStore::tryToDelete(GCState & state, const Path & path)
state.results.paths.insert(path); state.results.paths.insert(path);
return false; return false;
} }
void LocalStore::collectGarbage(const GCOptions & options, GCResults & results) void LocalStore::collectGarbage(const GCOptions & options, GCResults & results)
{ {
@ -646,13 +647,20 @@ void LocalStore::collectGarbage(const GCOptions & options, GCResults & results)
printMsg(lvlError, format("reading the Nix store...")); printMsg(lvlError, format("reading the Nix store..."));
Paths entries = readDirectory(nixStore); Paths entries = readDirectory(nixStore);
/* Randomise the order in which we delete entries to make the
collector less biased towards deleting paths that come
alphabetically first (e.g. /nix/store/000...). This
matters when using --max-freed etc. */
vector<Path> entries_(entries.begin(), entries.end());
random_shuffle(entries_.begin(), entries_.end());
if (doDelete(state.options.action)) if (doDelete(state.options.action))
printMsg(lvlError, format("deleting garbage...")); printMsg(lvlError, format("deleting garbage..."));
else else
printMsg(lvlError, format("determining live/dead paths...")); printMsg(lvlError, format("determining live/dead paths..."));
try { try {
foreach (Paths::iterator, i, entries) foreach (vector<Path>::iterator, i, entries_)
tryToDelete(state, canonPath(nixStore + "/" + *i)); tryToDelete(state, canonPath(nixStore + "/" + *i));
} catch (GCLimitReached & e) { } catch (GCLimitReached & e) {
} }