wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-07 10:11:47 +02:00
Code Activity

* Refactoring. There is now an abstract interface class StoreAPI

Browse source 
containing functions that operate on the Nix store.  One
  implementation is LocalStore, which operates on the Nix store
  directly.  The next step, to enable secure multi-user Nix, is to
  create a different implementation RemoteStore that talks to a
  privileged daemon process that uses LocalStore to perform the actual
  operations.
This commit is contained in:
Eelco Dolstra 2006-11-30 17:43:04 +00:00
parent 5f0b9de6d8
commit e2ef5e07fd
17 changed files with 458 additions and 338 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/libstore/gc.cc
View file

@ -2,7 +2,7 @@
#include "globals.hh"
#include "misc.hh"
#include "pathlocks.hh"
#include "store.hh"
#include "local-store.hh"
#include "db.hh"
#include "util.hh"
@ -305,7 +305,7 @@ static void findRoots(const Path & path, bool recurseSymlinks,
debug(format("found root `%1%' in `%2%'")
% target2 % path);
Path target3 = toStorePath(target2);
if (isValidPath(target3))
if (store->isValidPath(target3))
roots.insert(target3);
else
printMsg(lvlInfo, format("skipping invalid root from `%1%' to `%2%'")
@ -343,7 +343,7 @@ static void addAdditionalRoots(PathSet & roots)
for (Strings::iterator i = paths.begin(); i != paths.end(); ++i) {
if (isInStore(*i)) {
Path path = toStorePath(*i);
if (roots.find(path) == roots.end() && isValidPath(path)) {
if (roots.find(path) == roots.end() && store->isValidPath(path)) {
debug(format("found additional root `%1%'") % path);
roots.insert(path);
}
@ -359,8 +359,8 @@ static void dfsVisit(const PathSet & paths, const Path & path,
visited.insert(path);
PathSet references;
if (isValidPath(path))
queryReferences(noTxn, path, references);
if (store->isValidPath(path))
store->queryReferences(path, references);
for (PathSet::iterator i = references.begin();
i != references.end(); ++i)
@ -431,7 +431,7 @@ void collectGarbage(GCAction action, const PathSet & pathsToDelete,
previously ran the collector with `gcKeepDerivations'
turned off). */
Path deriver = queryDeriver(noTxn, *i);
if (deriver != "" && isValidPath(deriver))
if (deriver != "" && store->isValidPath(deriver))
computeFSClosure(deriver, livePaths);
}
}
@ -444,7 +444,7 @@ void collectGarbage(GCAction action, const PathSet & pathsToDelete,
Derivation drv = derivationFromPath(*i);
for (DerivationOutputs::iterator j = drv.outputs.begin();
j != drv.outputs.end(); ++j)
if (isValidPath(j->second.path))
if (store->isValidPath(j->second.path))
computeFSClosure(j->second.path, livePaths);
}
}
@ -469,7 +469,7 @@ void collectGarbage(GCAction action, const PathSet & pathsToDelete,
means that it has already been closed). */
PathSet tempRootsClosed;
for (PathSet::iterator i = tempRoots.begin(); i != tempRoots.end(); ++i)
if (isValidPath(*i))
if (store->isValidPath(*i))
computeFSClosure(*i, tempRootsClosed);
else
tempRootsClosed.insert(*i);