lix-project/lix
20
55
Fork 31
Code Issues 344 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Merge pull request #2223 from symphorien/esrch

Browse source 
libstore/gc.cc: ignore ESRCH when reading /proc
This commit is contained in:
Eelco Dolstra 2018-06-11 18:08:53 +02:00 committed by GitHub
parent de71335e4d 8c567afe35
commit 27d1c052ae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/libstore/gc.cc
View file

@ -425,10 +425,14 @@ PathSet LocalStore::findRuntimeRoots()
readProcLink((format("%1%/%2%") % fdStr % fd_ent->d_name).str(), paths); readProcLink((format("%1%/%2%") % fdStr % fd_ent->d_name).str(), paths);
} }
} }
if (errno) if (errno) {
if (errno == ESRCH)
continue;
throw SysError(format("iterating /proc/%1%/fd") % ent->d_name); throw SysError(format("iterating /proc/%1%/fd") % ent->d_name);
}
fdDir.reset(); fdDir.reset();
try {
auto mapLines = auto mapLines =
tokenizeString<std::vector<string>>(readFile((format("/proc/%1%/maps") % ent->d_name).str(), true), "\n"); tokenizeString<std::vector<string>>(readFile((format("/proc/%1%/maps") % ent->d_name).str(), true), "\n");
for (const auto& line : mapLines) { for (const auto& line : mapLines) {
@ -437,13 +441,12 @@ PathSet LocalStore::findRuntimeRoots()
paths.emplace(match[1]); paths.emplace(match[1]);
} }
try {
auto envString = readFile((format("/proc/%1%/environ") % ent->d_name).str(), true); auto envString = readFile((format("/proc/%1%/environ") % ent->d_name).str(), true);
auto env_end = std::sregex_iterator{}; auto env_end = std::sregex_iterator{};
for (auto i = std::sregex_iterator{envString.begin(), envString.end(), storePathRegex}; i != env_end; ++i) for (auto i = std::sregex_iterator{envString.begin(), envString.end(), storePathRegex}; i != env_end; ++i)
paths.emplace(i->str()); paths.emplace(i->str());
} catch (SysError & e) { } catch (SysError & e) {
if (errno == ENOENT || errno == EACCES) if (errno == ENOENT || errno == EACCES || errno == ESRCH)
continue; continue;
throw; throw;
} }