gc: Added GcStorage base class and hooked it up to CasGc

2 files changed, 13 insertions, 13 deletions

diff --git a/zenserver/cache/structuredcachestore.cpp b/zenserver/cache/structuredcachestore.cpp
index e28b2b2d8..f964c3102 100644
--- a/zenserver/cache/structuredcachestore.cpp
+++ b/zenserver/cache/structuredcachestore.cpp
@@ -145,10 +145,10 @@ ZenCacheStore::Scrub(ScrubContext& Ctx)
 }
 
 void
-ZenCacheStore::GarbageCollect(GcContext& GcCtx)
+ZenCacheStore::GatherReferences(GcContext& GcCtx)
 {
-	m_MemLayer.GarbageCollect(GcCtx);
-	m_DiskLayer.GarbageCollect(GcCtx);
+	m_MemLayer.GatherReferences(GcCtx);
+	m_DiskLayer.GatherReferences(GcCtx);
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -234,7 +234,7 @@ ZenCacheMemoryLayer::Scrub(ScrubContext& Ctx)
 }
 
 void
-ZenCacheMemoryLayer::GarbageCollect(GcContext& GcCtx)
+ZenCacheMemoryLayer::GatherReferences(GcContext& GcCtx)
 {
 	ZEN_UNUSED(GcCtx);
 }
@@ -261,7 +261,7 @@ ZenCacheMemoryLayer::CacheBucket::Scrub(ScrubContext& Ctx)
 }
 
 void
-ZenCacheMemoryLayer::CacheBucket::GarbageCollect(GcContext& GcCtx)
+ZenCacheMemoryLayer::CacheBucket::GatherReferences(GcContext& GcCtx)
 {
 	// Is it even meaningful to do this? The memory layer shouldn't
 	// contain anything which is not already in the disk layer
@@ -391,7 +391,7 @@ struct ZenCacheDiskLayer::CacheBucket
 	void		Drop();
 	void		Flush();
 	void		Scrub(ScrubContext& Ctx);
-	void		GarbageCollect(GcContext& GcCtx);
+	void		GatherReferences(GcContext& GcCtx);
 
 	inline bool IsOk() const { return m_IsOk; }
 
@@ -723,7 +723,7 @@ ZenCacheDiskLayer::CacheBucket::Scrub(ScrubContext& Ctx)
 }
 
 void
-ZenCacheDiskLayer::CacheBucket::GarbageCollect(GcContext& GcCtx)
+ZenCacheDiskLayer::CacheBucket::GatherReferences(GcContext& GcCtx)
 {
 	RwLock::SharedLockScope _(m_IndexLock);
 
@@ -1069,13 +1069,13 @@ ZenCacheDiskLayer::Scrub(ScrubContext& Ctx)
 }
 
 void
-ZenCacheDiskLayer::GarbageCollect(GcContext& GcCtx)
+ZenCacheDiskLayer::GatherReferences(GcContext& GcCtx)
 {
 	RwLock::SharedLockScope _(m_Lock);
 
 	for (auto& Kv : m_Buckets)
 	{
-		Kv.second.GarbageCollect(GcCtx);
+		Kv.second.GatherReferences(GcCtx);
 	}
 }
 
diff --git a/zenserver/cache/structuredcachestore.h b/zenserver/cache/structuredcachestore.h
index 042d2ab3d..cf22b8be2 100644
--- a/zenserver/cache/structuredcachestore.h
+++ b/zenserver/cache/structuredcachestore.h
@@ -66,7 +66,7 @@ public:
 	void Put(std::string_view Bucket, const IoHash& HashKey, const ZenCacheValue& Value);
 	bool DropBucket(std::string_view Bucket);
 	void Scrub(ScrubContext& Ctx);
-	void GarbageCollect(GcContext& GcCtx);
+	void GatherReferences(GcContext& GcCtx);
 
 	struct Configuration
 	{
@@ -92,7 +92,7 @@ private:
 		bool Get(const IoHash& HashKey, ZenCacheValue& OutValue);
 		void Put(const IoHash& HashKey, const ZenCacheValue& Value);
 		void Scrub(ScrubContext& Ctx);
-		void GarbageCollect(GcContext& GcCtx);
+		void GatherReferences(GcContext& GcCtx);
 
 	private:
 		uint64_t GetCurrentTimeStamp();
@@ -114,7 +114,7 @@ public:
 	bool DropBucket(std::string_view Bucket);
 	void Flush();
 	void Scrub(ScrubContext& Ctx);
-	void GarbageCollect(GcContext& GcCtx);
+	void GatherReferences(GcContext& GcCtx);
 
 	void DiscoverBuckets();
 
@@ -140,7 +140,7 @@ public:
 	bool		 DropBucket(std::string_view Bucket);
 	void		 Flush();
 	void		 Scrub(ScrubContext& Ctx);
-	virtual void GarbageCollect(GcContext& GcCtx) override;
+	virtual void GatherReferences(GcContext& GcCtx) override;
 
 private:
 	std::filesystem::path m_RootDir;