From ce663d75e36f1bb41c11a9d666d5b649328bee92 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 4 Jan 2024 15:05:20 +0100
Subject: [PATCH 1/2] LRUCache: Mark size() as const

---
 src/libutil/lru-cache.hh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libutil/lru-cache.hh b/src/libutil/lru-cache.hh
index 0e19517ed..6e14cac35 100644
--- a/src/libutil/lru-cache.hh
+++ b/src/libutil/lru-cache.hh
@@ -89,7 +89,7 @@ public:
         return i->second.second;
     }
 
-    size_t size()
+    size_t size() const
     {
         return data.size();
     }

From ea46264bd35d479ca60b3f725d31f0735863281d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 26 Jul 2024 16:14:03 +0200
Subject: [PATCH 2/2] Store: Use SharedSync for state

---
 src/libstore/store-api.cc | 2 +-
 src/libstore/store-api.hh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libstore/store-api.cc b/src/libstore/store-api.cc
index 2c4dee518..21fa2939d 100644
--- a/src/libstore/store-api.cc
+++ b/src/libstore/store-api.cc
@@ -920,7 +920,7 @@ StorePathSet Store::exportReferences(const StorePathSet & storePaths, const Stor
 const Store::Stats & Store::getStats()
 {
     {
-        auto state_(state.lock());
+        auto state_(state.read());
         stats.pathInfoCacheSize = state_->pathInfoCache.size();
     }
     return stats;
diff --git a/src/libstore/store-api.hh b/src/libstore/store-api.hh
index 7d5f533c5..8288cfdf0 100644
--- a/src/libstore/store-api.hh
+++ b/src/libstore/store-api.hh
@@ -201,7 +201,7 @@ protected:
         LRUCache<std::string, PathInfoCacheValue> pathInfoCache;
     };
 
-    Sync<State> state;
+    SharedSync<State> state;
 
     std::shared_ptr<NarInfoDiskCache> diskCache;