eisfunke/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Prefer RepairFlag over bool when applicable

Browse source
This commit is contained in:
Guillaume Maudoux 2022-01-11 13:34:57 +01:00
parent e9a4abdb5d
commit 9f9f39a24b
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/build/local-derivation-goal.cc
View file

@ -2460,7 +2460,7 @@ void LocalDerivationGoal::registerOutputs()
} }
if (curRound == nrRounds) { if (curRound == nrRounds) {
localStore.optimisePath(actualPath, false); // FIXME: combine with scanForReferences() localStore.optimisePath(actualPath, NoRepair); // FIXME: combine with scanForReferences()
worker.markContentsGood(newInfo.path); worker.markContentsGood(newInfo.path);
} }

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

@ -174,7 +174,7 @@ public:
/* Optimise a single store path. Optionally, test the encountered /* Optimise a single store path. Optionally, test the encountered
symlinks for corruption. */ symlinks for corruption. */
void optimisePath(const Path & path, bool repair); void optimisePath(const Path & path, RepairFlag repair);
bool verifyStore(bool checkContents, RepairFlag repair) override; bool verifyStore(bool checkContents, RepairFlag repair) override;
@ -254,7 +254,7 @@ private:
InodeHash loadInodeHash(); InodeHash loadInodeHash();
Strings readDirectoryIgnoringInodes(const Path & path, const InodeHash & inodeHash); Strings readDirectoryIgnoringInodes(const Path & path, const InodeHash & inodeHash);
void optimisePath_(Activity * act, OptimiseStats & stats, const Path & path, InodeHash & inodeHash, bool repair); void optimisePath_(Activity * act, OptimiseStats & stats, const Path & path, InodeHash & inodeHash, RepairFlag repair);
// Internal versions that are not wrapped in retry_sqlite. // Internal versions that are not wrapped in retry_sqlite.
bool isValidPath_(State & state, const StorePath & path); bool isValidPath_(State & state, const StorePath & path);

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

@ -88,7 +88,7 @@ Strings LocalStore::readDirectoryIgnoringInodes(const Path & path, const InodeHa
void LocalStore::optimisePath_(Activity * act, OptimiseStats & stats, void LocalStore::optimisePath_(Activity * act, OptimiseStats & stats,
const Path & path, InodeHash & inodeHash, bool repair) const Path & path, InodeHash & inodeHash, RepairFlag repair)
{ {
checkInterrupt(); checkInterrupt();
@ -267,7 +267,7 @@ void LocalStore::optimiseStore(OptimiseStats & stats)
if (!isValidPath(i)) continue; /* path was GC'ed, probably */ if (!isValidPath(i)) continue; /* path was GC'ed, probably */
{ {
Activity act(*logger, lvlTalkative, actUnknown, fmt("optimising path '%s'", printStorePath(i))); Activity act(*logger, lvlTalkative, actUnknown, fmt("optimising path '%s'", printStorePath(i)));
optimisePath_(&act, stats, realStoreDir + "/" + std::string(i.to_string()), inodeHash, false); optimisePath_(&act, stats, realStoreDir + "/" + std::string(i.to_string()), inodeHash, NoRepair);
} }
done++; done++;
act.progress(done, paths.size()); act.progress(done, paths.size());
@ -285,7 +285,7 @@ void LocalStore::optimiseStore()
stats.filesLinked); stats.filesLinked);
} }
void LocalStore::optimisePath(const Path & path, bool repair) void LocalStore::optimisePath(const Path & path, RepairFlag repair)
{ {
OptimiseStats stats; OptimiseStats stats;
InodeHash inodeHash; InodeHash inodeHash;