maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use the inodes given by readdir directly

Browse source
This commit is contained in:
Wout Mertens 2014-05-14 22:52:10 +02:00
parent e974f20c98
commit d73ffc552f
2 changed files with 25 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -309,13 +309,13 @@ private:
void checkDerivationOutputs(const Path & drvPath, const Derivation & drv); void checkDerivationOutputs(const Path & drvPath, const Derivation & drv);
#if HAVE_TR1_UNORDERED_SET #if HAVE_TR1_UNORDERED_SET
typedef std::tr1::unordered_set<ino_t> Hashes; typedef std::tr1::unordered_set<ino_t> InodeHash;
#else #else
typedef std::set<ino_t> Hashes; typedef std::set<ino_t> InodeHash;
#endif #endif
void loadHashes(Hashes & hashes); InodeHash loadInodeHash();
void optimisePath_(OptimiseStats & stats, const Path & path, Hashes & hashes); void optimisePath_(OptimiseStats & stats, const Path & path, InodeHash & inodeHash);
// Internal versions that are not wrapped in retry_sqlite. // Internal versions that are not wrapped in retry_sqlite.
bool isValidPath_(const Path & path); bool isValidPath_(const Path & path);

38
src/libstore/optimise-store.cc
View file

@ -39,22 +39,28 @@ struct MakeReadOnly
} }
}; };
// TODO Make this a map and keep count and size stats, for giggles LocalStore::InodeHash LocalStore::loadInodeHash()
void LocalStore::loadHashes(Hashes & hashes)
{ {
printMsg(lvlDebug, "loading hash inodes in memory"); printMsg(lvlDebug, "loading hash inodes in memory");
Strings names = readDirectory(linksDir); InodeHash hashes;
foreach (Strings::iterator, i, names) {
struct stat st; AutoCloseDir dir = opendir(linksDir.c_str());
string path = linksDir + "/" + *i; if (!dir) throw SysError(format("opening directory `%1%'") % linksDir);
if (lstat(path.c_str(), &st))
throw SysError(format("getting attributes of path `%1%'") % path); struct dirent * dirent;
hashes.insert(st.st_ino); while (errno = 0, dirent = readdir(dir)) { /* sic */
checkInterrupt();
// We don't care if we hit non-hash files, anything goes
hashes.insert(dirent->d_ino);
} }
printMsg(lvlDebug, format("loaded %1% hashes") % hashes.size()); if (errno) throw SysError(format("reading directory `%1%'") % linksDir);
printMsg(lvlInfo, format("loaded %1% hash inodes") % hashes.size());
return hashes;
} }
void LocalStore::optimisePath_(OptimiseStats & stats, const Path & path, Hashes & hashes) void LocalStore::optimisePath_(OptimiseStats & stats, const Path & path, InodeHash & hashes)
{ {
checkInterrupt(); checkInterrupt();
@ -183,15 +189,13 @@ void LocalStore::optimisePath_(OptimiseStats & stats, const Path & path, Hashes
void LocalStore::optimiseStore(OptimiseStats & stats) void LocalStore::optimiseStore(OptimiseStats & stats)
{ {
PathSet paths = queryAllValidPaths(); PathSet paths = queryAllValidPaths();
Hashes hashes; InodeHash inodeHash = loadInodeHash();
loadHashes(hashes);
foreach (PathSet::iterator, i, paths) { foreach (PathSet::iterator, i, paths) {
addTempRoot(*i); addTempRoot(*i);
if (!isValidPath(*i)) continue; /* path was GC'ed, probably */ if (!isValidPath(*i)) continue; /* path was GC'ed, probably */
startNest(nest, lvlChatty, format("hashing files in `%1%'") % *i); startNest(nest, lvlChatty, format("hashing files in `%1%'") % *i);
optimisePath_(stats, *i, hashes); optimisePath_(stats, *i, inodeHash);
} }
} }
@ -199,9 +203,9 @@ void LocalStore::optimiseStore(OptimiseStats & stats)
void LocalStore::optimisePath(const Path & path) void LocalStore::optimisePath(const Path & path)
{ {
OptimiseStats stats; OptimiseStats stats;
Hashes hashes; InodeHash inodeHash;
if (settings.autoOptimiseStore) optimisePath_(stats, path, hashes); if (settings.autoOptimiseStore) optimisePath_(stats, path, inodeHash);
} }