From 1e52c3e1f479a802d151a4d162bb0b9174d22cf7 Mon Sep 17 00:00:00 2001
From: Dan Engelbrecht <dan.engelbrecht@epicgames.com>
Date: Wed, 4 Sep 2024 09:27:32 +0200
Subject: move gc logs to gc logger (#142)

- Improvement: Move GC logging in callback functions into "gc" context
---
 src/zenstore/cache/cachedisklayer.cpp | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'src/zenstore/cache/cachedisklayer.cpp')

diff --git a/src/zenstore/cache/cachedisklayer.cpp b/src/zenstore/cache/cachedisklayer.cpp
index 940f78c30..9c350b11d 100644
--- a/src/zenstore/cache/cachedisklayer.cpp
+++ b/src/zenstore/cache/cachedisklayer.cpp
@@ -3063,6 +3063,8 @@ public:
 	{
 		ZEN_TRACE_CPU("Z$::Bucket::CompactStore");
 
+		auto Log = [&Ctx]() { return Ctx.Logger; };
+
 		Stopwatch  Timer;
 		const auto _ = MakeGuard([&] {
 			Reset(m_ExpiredStandaloneKeys);
@@ -3290,6 +3292,8 @@ ZenCacheDiskLayer::CacheBucket::RemoveExpiredData(GcCtx& Ctx, GcStats& Stats)
 {
 	ZEN_TRACE_CPU("Z$::Bucket::RemoveExpiredData");
 
+	auto Log = [&Ctx]() { return Ctx.Logger; };
+
 	size_t TotalEntries = 0;
 
 	Stopwatch  Timer;
@@ -3457,6 +3461,8 @@ ZenCacheDiskLayer::CacheBucket::GetReferencesLocked(GcCtx& Ctx, std::vector<IoHa
 {
 	ZEN_TRACE_CPU("Z$::Bucket::GetReferencesLocked");
 
+	auto Log = [&Ctx]() { return Ctx.Logger; };
+
 	auto GetAttachments = [&](MemoryView Data) -> bool {
 		if (ValidateCompactBinary(Data, CbValidateMode::Default) == CbValidateError::None)
 		{
@@ -3632,6 +3638,8 @@ public:
 	{
 		ZEN_TRACE_CPU("Z$::Bucket::PreCache");
 
+		auto Log = [&Ctx]() { return Ctx.Logger; };
+
 		Stopwatch  Timer;
 		const auto _ = MakeGuard([&] {
 			if (!Ctx.Settings.Verbose)
@@ -3659,6 +3667,8 @@ public:
 	{
 		ZEN_TRACE_CPU("Z$::Bucket::UpdateLockedState");
 
+		auto Log = [&Ctx]() { return Ctx.Logger; };
+
 		Stopwatch  Timer;
 		const auto _ = MakeGuard([&] {
 			if (!Ctx.Settings.Verbose)
@@ -3689,6 +3699,9 @@ public:
 	virtual void RemoveUsedReferencesFromSet(GcCtx& Ctx, HashSet& IoCids) override
 	{
 		ZEN_TRACE_CPU("Z$::Bucket::RemoveUsedReferencesFromSet");
+
+		auto Log = [&Ctx]() { return Ctx.Logger; };
+
 		size_t	   InitialCount = IoCids.size();
 		Stopwatch  Timer;
 		const auto _ = MakeGuard([&] {
@@ -3723,6 +3736,8 @@ ZenCacheDiskLayer::CacheBucket::CreateReferenceCheckers(GcCtx& Ctx)
 {
 	ZEN_TRACE_CPU("Z$::Bucket::CreateReferenceCheckers");
 
+	auto Log = [&Ctx]() { return Ctx.Logger; };
+
 	Stopwatch  Timer;
 	const auto _ = MakeGuard([&] {
 		if (!Ctx.Settings.Verbose)
-- 
cgit v1.2.3