Added size to GcStorage.

1 files changed, 12 insertions, 12 deletions

diff --git a/zenserver/cache/structuredcachestore.cpp b/zenserver/cache/structuredcachestore.cpp
index 64e597d53..f74bb05c1 100644
--- a/zenserver/cache/structuredcachestore.cpp
+++ b/zenserver/cache/structuredcachestore.cpp
@@ -200,10 +200,10 @@ ZenCacheStore::CollectGarbage(GcContext& GcCtx)
 	m_DiskLayer.CollectGarbage(GcCtx);
 }
 
-ZenCacheSize
-ZenCacheStore::TotalSize() const
+GcStorageSize
+ZenCacheStore::StorageSize() const
 {
-	return {.MemorySize = m_MemLayer.TotalSize(), .DiskSize = m_DiskLayer.TotalSize()};
+	return {.DiskSize = m_DiskLayer.TotalSize(), .MemorySize = m_MemLayer.TotalSize()};
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -472,7 +472,7 @@ struct ZenCacheDiskLayer::CacheBucket
 	void		CollectGarbage(GcContext& GcCtx);
 
 	inline bool		IsOk() const { return m_IsOk; }
-	inline uint64_t TotalSize() const { return m_TotalSize; }
+	inline uint64_t TotalSize() const { return m_TotalSize.load(std::memory_order::relaxed); }
 
 private:
 	std::filesystem::path m_BucketDir;
@@ -1544,7 +1544,7 @@ TEST_CASE("zcache.size")
 		const size_t			 Count = 16;
 		ScopedTemporaryDirectory TempDir;
 
-		ZenCacheSize CacheSize;
+		GcStorageSize CacheSize;
 
 		{
 			CasGc		  Gc;
@@ -1561,7 +1561,7 @@ TEST_CASE("zcache.size")
 				Zcs.Put("test_bucket-{}"_format(Bucket), IoHash::HashBuffer(&Key, sizeof(uint32_t)), {.Value = Buffer});
 			}
 
-			CacheSize = Zcs.TotalSize();
+			CacheSize = Zcs.StorageSize();
 			CHECK_EQ(CacheValue.GetSize() * Count, CacheSize.DiskSize);
 			CHECK_EQ(CacheValue.GetSize() * Count, CacheSize.MemorySize);
 		}
@@ -1570,7 +1570,7 @@ TEST_CASE("zcache.size")
 			CasGc		  Gc;
 			ZenCacheStore Zcs(Gc, TempDir.Path() / "cache");
 
-			const ZenCacheSize SerializedSize = Zcs.TotalSize();
+			const GcStorageSize SerializedSize = Zcs.StorageSize();
 			CHECK_EQ(SerializedSize.MemorySize, 0);
 			CHECK_EQ(SerializedSize.DiskSize, CacheSize.DiskSize);
 
@@ -1578,7 +1578,7 @@ TEST_CASE("zcache.size")
 			{
 				Zcs.DropBucket("test_bucket-{}"_format(Bucket));
 			}
-			CHECK_EQ(0, Zcs.TotalSize().DiskSize);
+			CHECK_EQ(0, Zcs.StorageSize().DiskSize);
 		}
 	}
 
@@ -1587,7 +1587,7 @@ TEST_CASE("zcache.size")
 		const size_t			 Count = 16;
 		ScopedTemporaryDirectory TempDir;
 
-		ZenCacheSize CacheSize;
+		GcStorageSize CacheSize;
 
 		{
 			CasGc		  Gc;
@@ -1604,7 +1604,7 @@ TEST_CASE("zcache.size")
 				Zcs.Put("test_bucket-{}"_format(Bucket), IoHash::HashBuffer(&Key, sizeof(uint32_t)), {.Value = Buffer});
 			}
 
-			CacheSize = Zcs.TotalSize();
+			CacheSize = Zcs.StorageSize();
 			CHECK_EQ(CacheValue.GetSize() * Count, CacheSize.DiskSize);
 			CHECK_EQ(0, CacheSize.MemorySize);
 		}
@@ -1613,7 +1613,7 @@ TEST_CASE("zcache.size")
 			CasGc		  Gc;
 			ZenCacheStore Zcs(Gc, TempDir.Path() / "cache");
 
-			const ZenCacheSize SerializedSize = Zcs.TotalSize();
+			const GcStorageSize SerializedSize = Zcs.StorageSize();
 			CHECK_EQ(SerializedSize.MemorySize, 0);
 			CHECK_EQ(SerializedSize.DiskSize, CacheSize.DiskSize);
 
@@ -1621,7 +1621,7 @@ TEST_CASE("zcache.size")
 			{
 				Zcs.DropBucket("test_bucket-{}"_format(Bucket));
 			}
-			CHECK_EQ(0, Zcs.TotalSize().DiskSize);
+			CHECK_EQ(0, Zcs.StorageSize().DiskSize);
 		}
 	}
 }