From dcaeaac4ebc6255cb210ce54a18b1cd01b9eeaf8 Mon Sep 17 00:00:00 2001
From: Dan Engelbrecht <dan@engelbrecht.com>
Date: Tue, 28 Nov 2023 07:54:05 -0500
Subject: tracing for gcv2 (#574)

- Improvement: Added more trace scopes for GCv2
- Bugfix: Make sure we can override flags to "false" when running `zen gc` commmand
  - `smallobjects`, `skipcid`, `skipdelete`, `verbose`
---
 src/zenserver/cache/cachedisklayer.cpp | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

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

diff --git a/src/zenserver/cache/cachedisklayer.cpp b/src/zenserver/cache/cachedisklayer.cpp
index 0767086ce..c8bc3871a 100644
--- a/src/zenserver/cache/cachedisklayer.cpp
+++ b/src/zenserver/cache/cachedisklayer.cpp
@@ -2703,6 +2703,8 @@ public:
 
 	virtual void CompactStore(GcCtx& Ctx, GcCompactStoreStats& Stats, const std::function<uint64_t()>& ClaimDiskReserveCallback) override
 	{
+		ZEN_TRACE_CPU("Z$::Disk::Bucket::CompactStore");
+
 		Stopwatch  Timer;
 		const auto _ = MakeGuard([&] {
 			Reset(m_ExpiredStandaloneKeys);
@@ -2916,6 +2918,8 @@ private:
 GcStoreCompactor*
 ZenCacheDiskLayer::CacheBucket::RemoveExpiredData(GcCtx& Ctx, GcStats& Stats)
 {
+	ZEN_TRACE_CPU("Z$::Disk::Bucket::RemoveExpiredData");
+
 	size_t TotalEntries = 0;
 
 	Stopwatch  Timer;
@@ -3038,6 +3042,8 @@ public:
 
 	virtual void LockState(GcCtx& Ctx) override
 	{
+		ZEN_TRACE_CPU("Z$::Disk::Bucket::RemoveExpiredData");
+
 		Stopwatch  Timer;
 		const auto _ = MakeGuard([&] {
 			if (!Ctx.Settings.Verbose)
@@ -3102,6 +3108,8 @@ public:
 
 	virtual void RemoveUsedReferencesFromSet(GcCtx& Ctx, HashSet& IoCids) override
 	{
+		ZEN_TRACE_CPU("Z$::Disk::Bucket::RemoveUsedReferencesFromSet");
+
 		ZEN_ASSERT(m_IndexLock);
 		size_t	   InitialCount = IoCids.size();
 		Stopwatch  Timer;
@@ -3135,6 +3143,8 @@ public:
 std::vector<GcReferenceChecker*>
 ZenCacheDiskLayer::CacheBucket::CreateReferenceCheckers(GcCtx& Ctx)
 {
+	ZEN_TRACE_CPU("Z$::Disk::Bucket::CreateReferenceCheckers");
+
 	Stopwatch  Timer;
 	const auto _ = MakeGuard([&] {
 		if (!Ctx.Settings.Verbose)
@@ -3267,6 +3277,8 @@ ZenCacheDiskLayer::CacheBucket::CreateReferenceCheckers(GcCtx& Ctx)
 void
 ZenCacheDiskLayer::CacheBucket::CompactReferences(RwLock::ExclusiveLockScope&)
 {
+	ZEN_TRACE_CPU("Z$::Disk::Bucket::CompactReferences");
+
 	std::vector<ReferenceIndex> FirstReferenceIndex;
 	std::vector<IoHash>			NewReferenceHashes;
 	std::vector<ReferenceIndex> NewNextReferenceHashesIndexes;
@@ -3447,6 +3459,8 @@ ZenCacheDiskLayer::CacheBucket::CompactState(std::vector<BucketPayload>&  Payloa
 											 IndexMap&					  Index,
 											 RwLock::ExclusiveLockScope&  IndexLock)
 {
+	ZEN_TRACE_CPU("Z$::Disk::Bucket::CompactState");
+
 	size_t EntryCount = m_Index.size();
 	Payloads.reserve(EntryCount);
 	AccessTimes.reserve(EntryCount);
-- 
cgit v1.2.3