wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-03 06:11:46 +02:00
Code Activity

Merge pull request #10151 from edolstra/fix-lstat-cache

Browse source 
PosixSourceAccessor::cachedLstat(): Use absolute path
This commit is contained in:
Théophane Hufschmitt 2024-03-05 08:59:30 +01:00 • committed by GitHub
commit 0d26358bda
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/libutil/posix-source-accessor.cc
View file

@ -85,16 +85,20 @@ bool PosixSourceAccessor::pathExists(const CanonPath & path)
std::optional<struct stat> PosixSourceAccessor::cachedLstat(const CanonPath & path) std::optional<struct stat> PosixSourceAccessor::cachedLstat(const CanonPath & path)
{ {
static Sync<std::unordered_map<CanonPath, std::optional<struct stat>>> _cache; static Sync<std::unordered_map<Path, std::optional<struct stat>>> _cache;
// Note: we convert std::filesystem::path to Path because the
// former is not hashable on libc++.
Path absPath = makeAbsPath(path);
{ {
auto cache(_cache.lock()); auto cache(_cache.lock());
auto i = cache->find(path); auto i = cache->find(absPath);
if (i != cache->end()) return i->second; if (i != cache->end()) return i->second;
} }
std::optional<struct stat> st{std::in_place}; std::optional<struct stat> st{std::in_place};
if (::lstat(makeAbsPath(path).c_str(), &*st)) { if (::lstat(absPath.c_str(), &*st)) {
if (errno == ENOENT || errno == ENOTDIR) if (errno == ENOENT || errno == ENOTDIR)
st.reset(); st.reset();
else else
@ -103,7 +107,7 @@ std::optional<struct stat> PosixSourceAccessor::cachedLstat(const CanonPath & pa
auto cache(_cache.lock()); auto cache(_cache.lock());
if (cache->size() >= 16384) cache->clear(); if (cache->size() >= 16384) cache->clear();
cache->emplace(path, st); cache->emplace(absPath, st);
return st; return st;
} }