aboutsummaryrefslogtreecommitdiff
path: root/src/zenserver
diff options
context:
space:
mode:
authorDan Engelbrecht <[email protected]>2023-11-28 07:54:05 -0500
committerGitHub <[email protected]>2023-11-28 13:54:05 +0100
commitdcaeaac4ebc6255cb210ce54a18b1cd01b9eeaf8 (patch)
tree766d03bad3262643653dcd08a20e0dbad57e2f01 /src/zenserver
parentDon't call spdlog::drop_all, spdlog::shutdown will do that for us in a contro... (diff)
downloadzen-dcaeaac4ebc6255cb210ce54a18b1cd01b9eeaf8.tar.xz
zen-dcaeaac4ebc6255cb210ce54a18b1cd01b9eeaf8.zip
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`
Diffstat (limited to 'src/zenserver')
-rw-r--r--src/zenserver/cache/cachedisklayer.cpp14
-rw-r--r--src/zenserver/projectstore/projectstore.cpp12
2 files changed, 26 insertions, 0 deletions
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);
diff --git a/src/zenserver/projectstore/projectstore.cpp b/src/zenserver/projectstore/projectstore.cpp
index 882d78c7e..dde824b6f 100644
--- a/src/zenserver/projectstore/projectstore.cpp
+++ b/src/zenserver/projectstore/projectstore.cpp
@@ -3099,6 +3099,8 @@ public:
virtual void CompactStore(GcCtx& Ctx, GcCompactStoreStats& Stats, const std::function<uint64_t()>&)
{
+ ZEN_TRACE_CPU("Store::CompactStore");
+
Stopwatch Timer;
const auto _ = MakeGuard([&] {
if (!Ctx.Settings.Verbose)
@@ -3168,6 +3170,8 @@ private:
GcStoreCompactor*
ProjectStore::RemoveExpiredData(GcCtx& Ctx, GcStats& Stats)
{
+ ZEN_TRACE_CPU("Store::RemoveExpiredData");
+
Stopwatch Timer;
const auto _ = MakeGuard([&] {
if (!Ctx.Settings.Verbose)
@@ -3311,6 +3315,8 @@ public:
{
if (PreCache)
{
+ ZEN_TRACE_CPU("Store::ReferencesPreCache");
+
Stopwatch Timer;
const auto _ = MakeGuard([&] {
if (!Ctx.Settings.Verbose)
@@ -3336,6 +3342,8 @@ public:
virtual void LockState(GcCtx& Ctx) override
{
+ ZEN_TRACE_CPU("Store::LockState");
+
Stopwatch Timer;
const auto _ = MakeGuard([&] {
if (!Ctx.Settings.Verbose)
@@ -3363,6 +3371,8 @@ public:
virtual void RemoveUsedReferencesFromSet(GcCtx& Ctx, HashSet& IoCids) override
{
+ ZEN_TRACE_CPU("Store::RemoveUsedReferencesFromSet");
+
ZEN_ASSERT(m_OplogLock);
size_t InitialCount = IoCids.size();
@@ -3393,6 +3403,8 @@ public:
std::vector<GcReferenceChecker*>
ProjectStore::CreateReferenceCheckers(GcCtx& Ctx)
{
+ ZEN_TRACE_CPU("Store::CreateReferenceCheckers");
+
size_t ProjectCount = 0;
size_t OplogCount = 0;