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

Show the pid of temporary roots

Browse source
This commit is contained in:
Eelco Dolstra 2017-09-14 15:02:52 +02:00
parent da1e4fdfb5
commit 308ecf6361
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
2 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/libstore/gc.cc
View file

@ -196,17 +196,17 @@ void LocalStore::addTempRoot(const Path & path)
} }
PathSet LocalStore::readTempRoots(FDs & fds) std::set<std::pair<pid_t, Path>> LocalStore::readTempRoots(FDs & fds)
{ {
PathSet tempRoots; std::set<std::pair<pid_t, Path>> tempRoots;
/* Read the `temproots' directory for per-process temporary root /* Read the `temproots' directory for per-process temporary root
files. */ files. */
DirEntries tempRootFiles = readDirectory(tempRootsDir); for (auto & i : readDirectory(tempRootsDir)) {
for (auto & i : tempRootFiles) {
Path path = tempRootsDir + "/" + i.name; Path path = tempRootsDir + "/" + i.name;
pid_t pid = std::stoi(i.name);
debug(format("reading temporary root file '%1%'") % path); debug(format("reading temporary root file '%1%'") % path);
FDPtr fd(new AutoCloseFD(open(path.c_str(), O_CLOEXEC | O_RDWR, 0666))); FDPtr fd(new AutoCloseFD(open(path.c_str(), O_CLOEXEC | O_RDWR, 0666)));
if (!*fd) { if (!*fd) {
@ -247,9 +247,9 @@ PathSet LocalStore::readTempRoots(FDs & fds)
while ((end = contents.find((char) 0, pos)) != string::npos) { while ((end = contents.find((char) 0, pos)) != string::npos) {
Path root(contents, pos, end - pos); Path root(contents, pos, end - pos);
debug(format("got temporary root '%1%'") % root); debug("got temporary root '%s'", root);
assertStorePath(root); assertStorePath(root);
tempRoots.insert(root); tempRoots.emplace(pid, root);
pos = end + 1; pos = end + 1;
} }
@ -347,9 +347,13 @@ Roots LocalStore::findRoots()
Roots roots = findRootsNoTemp(); Roots roots = findRootsNoTemp();
FDs fds; FDs fds;
pid_t prev = -1;
size_t n = 0; size_t n = 0;
for (auto & root : readTempRoots(fds)) for (auto & root : readTempRoots(fds)) {
roots[fmt("{temp:%d}", n++)] = root; if (prev != root.first) n = 0;
prev = root.first;
roots[fmt("{temp:%d:%d}", root.first, n++)] = root.second;
}
return roots; return roots;
} }
@ -756,7 +760,8 @@ void LocalStore::collectGarbage(const GCOptions & options, GCResults & results)
per-process temporary root files. So after this point no paths per-process temporary root files. So after this point no paths
can be added to the set of temporary roots. */ can be added to the set of temporary roots. */
FDs fds; FDs fds;
state.tempRoots = readTempRoots(fds); for (auto & root : readTempRoots(fds))
state.tempRoots.insert(root.second);
state.roots.insert(state.tempRoots.begin(), state.tempRoots.end()); state.roots.insert(state.tempRoots.begin(), state.tempRoots.end());
/* After this point the set of roots or temporary roots cannot /* After this point the set of roots or temporary roots cannot

2
src/libstore/local-store.hh
View file

@ -176,7 +176,7 @@ private:
typedef std::shared_ptr<AutoCloseFD> FDPtr; typedef std::shared_ptr<AutoCloseFD> FDPtr;
typedef list<FDPtr> FDs; typedef list<FDPtr> FDs;
PathSet readTempRoots(FDs & fds); std::set<std::pair<pid_t, Path>> readTempRoots(FDs & fds);
public: public: