Merge pull request #11196 from NixOS/rename-lock-read

Rename SyncBase::read() -> readLock()
This commit is contained in:
Eelco Dolstra 2024-07-29 14:10:46 +02:00 committed by GitHub
commit 3c0963487e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 3 additions and 3 deletions

View file

@ -920,7 +920,7 @@ StorePathSet Store::exportReferences(const StorePathSet & storePaths, const Stor
const Store::Stats & Store::getStats() const Store::Stats & Store::getStats()
{ {
{ {
auto state_(state.read()); auto state_(state.readLock());
stats.pathInfoCacheSize = state_->pathInfoCache.size(); stats.pathInfoCacheSize = state_->pathInfoCache.size();
} }
return stats; return stats;

View file

@ -97,7 +97,7 @@ std::optional<struct stat> PosixSourceAccessor::cachedLstat(const CanonPath & pa
Path absPath = makeAbsPath(path).string(); Path absPath = makeAbsPath(path).string();
{ {
auto cache(_cache.read()); auto cache(_cache.readLock());
auto i = cache->find(absPath); auto i = cache->find(absPath);
if (i != cache->end()) return i->second; if (i != cache->end()) return i->second;
} }

View file

@ -106,7 +106,7 @@ public:
* Acquire read access to the inner value. When using * Acquire read access to the inner value. When using
* `std::shared_mutex`, this will use a shared lock. * `std::shared_mutex`, this will use a shared lock.
*/ */
ReadLock read() const { return ReadLock(const_cast<SyncBase *>(this)); } ReadLock readLock() const { return ReadLock(const_cast<SyncBase *>(this)); }
}; };
template<class T> template<class T>