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

libstore: remove unnecessary lstats in optimisePath

Browse source 
We were calling `lstat()` twice on the link path, and a third time if it
existed. We only need to call it once.

Change-Id: Ifadc2f24681648d0ec7e4bad5c6d2dcb2e560e7b
This commit is contained in:
Lily Ballard 2024-10-20 16:21:04 -07:00
parent 5ce1d8463a
commit a042bbde56
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -151,22 +151,24 @@ void LocalStore::optimisePath_(Activity * act, OptimiseStats & stats,
/* Check if this is a known hash. */ /* Check if this is a known hash. */
Path linkPath = linksDir + "/" + hash.to_string(Base::Base32, false); Path linkPath = linksDir + "/" + hash.to_string(Base::Base32, false);
auto stLinkOpt = maybeLstat(linkPath);
/* Maybe delete the link, if it has been corrupted. */ /* Maybe delete the link, if it has been corrupted. */
if (pathExists(linkPath)) { if (stLinkOpt) {
auto stLink = lstat(linkPath); if (st.st_size != stLinkOpt->st_size
if (st.st_size != stLink.st_size
|| (repair && hash != hashPath(HashType::SHA256, linkPath).first)) || (repair && hash != hashPath(HashType::SHA256, linkPath).first))
{ {
// XXX: Consider overwriting linkPath with our valid version. // XXX: Consider overwriting linkPath with our valid version.
warn("removing corrupted link '%s'", linkPath); warn("removing corrupted link '%s'", linkPath);
warn("There may be more corrupted paths." warn("There may be more corrupted paths."
"\nYou should run `nix-store --verify --check-contents --repair` to fix them all"); "\nYou should run `nix-store --verify --check-contents --repair` to fix them all");
unlink(linkPath.c_str()); if (unlink(linkPath.c_str()) == -1 && errno != ENOENT)
throw SysError("cannot unlink '%1%'", linkPath);
stLinkOpt.reset();
} }
} }
if (!pathExists(linkPath)) { if (!stLinkOpt) {
/* Nope, create a hard link in the links directory. */ /* Nope, create a hard link in the links directory. */
if (link(path.c_str(), linkPath.c_str()) == 0) { if (link(path.c_str(), linkPath.c_str()) == 0) {
inodeHash.insert(st.st_ino); inodeHash.insert(st.st_ino);
@ -177,6 +179,7 @@ void LocalStore::optimisePath_(Activity * act, OptimiseStats & stats,
case EEXIST: case EEXIST:
/* Fall through if another process created ‘linkPath’ before /* Fall through if another process created ‘linkPath’ before
we did. */ we did. */
stLinkOpt = lstat(linkPath);
break; break;
case ENOSPC: case ENOSPC:
@ -194,9 +197,7 @@ void LocalStore::optimisePath_(Activity * act, OptimiseStats & stats,
/* Yes! We've seen a file with the same contents. Replace the /* Yes! We've seen a file with the same contents. Replace the
current file with a hard link to that file. */ current file with a hard link to that file. */
auto stLink = lstat(linkPath); if (st.st_ino == stLinkOpt->st_ino) {
if (st.st_ino == stLink.st_ino) {
debug("'%1%' is already linked to '%2%'", path, linkPath); debug("'%1%' is already linked to '%2%'", path, linkPath);
return; return;
} }