diff options
| author | Dan Engelbrecht <[email protected]> | 2024-09-10 10:05:29 +0200 |
|---|---|---|
| committer | Dan Engelbrecht <[email protected]> | 2024-09-10 10:05:29 +0200 |
| commit | 2a8ef702bdb5b8b77baa2e001ee109b88aedc0c8 (patch) | |
| tree | a9fd6cab47c8c178ef67b3befbd2c8991d199ad8 /src | |
| parent | don't add batch overhead if we are only going to put one cache value (diff) | |
| download | zen-2a8ef702bdb5b8b77baa2e001ee109b88aedc0c8.tar.xz zen-2a8ef702bdb5b8b77baa2e001ee109b88aedc0c8.zip | |
trace scopes improvements
Diffstat (limited to 'src')
| -rw-r--r-- | src/zenstore/cache/cachedisklayer.cpp | 15 | ||||
| -rw-r--r-- | src/zenstore/cache/structuredcachestore.cpp | 4 | ||||
| -rw-r--r-- | src/zenstore/compactcas.cpp | 1 |
3 files changed, 11 insertions, 9 deletions
diff --git a/src/zenstore/cache/cachedisklayer.cpp b/src/zenstore/cache/cachedisklayer.cpp index d103c32b0..f2ec5ddda 100644 --- a/src/zenstore/cache/cachedisklayer.cpp +++ b/src/zenstore/cache/cachedisklayer.cpp @@ -1215,14 +1215,14 @@ struct ZenCacheDiskLayer::CacheBucket::PutBatchHandle ZenCacheDiskLayer::CacheBucket::PutBatchHandle* ZenCacheDiskLayer::CacheBucket::BeginPutBatch(std::vector<bool>& OutResults) { - ZEN_TRACE_CPU("Z$::Bucket::PutBatched"); + ZEN_TRACE_CPU("Z$::Bucket::BeginPutBatch"); return new PutBatchHandle(OutResults); } void ZenCacheDiskLayer::CacheBucket::EndPutBatch(PutBatchHandle* Batch) noexcept { - ZEN_TRACE_CPU("Z$::Bucket::PutBatched"); + ZEN_TRACE_CPU("Z$::Bucket::EndPutBatch"); try { @@ -1320,14 +1320,14 @@ struct ZenCacheDiskLayer::CacheBucket::GetBatchHandle ZenCacheDiskLayer::CacheBucket::GetBatchHandle* ZenCacheDiskLayer::CacheBucket::BeginGetBatch(std::vector<ZenCacheValue>& OutResult) { - ZEN_TRACE_CPU("Z$::Bucket::GetBatched"); + ZEN_TRACE_CPU("Z$::Bucket::BeginGetBatch"); return new GetBatchHandle(OutResult); } void ZenCacheDiskLayer::CacheBucket::EndGetBatch(GetBatchHandle* Batch) noexcept { - ZEN_TRACE_CPU("Z$::Bucket::GetBatched"); + ZEN_TRACE_CPU("Z$::Bucket::EndGetBatch"); try { @@ -1623,7 +1623,7 @@ ZenCacheDiskLayer::CacheBucket::EndGetBatch(GetBatchHandle* Batch) noexcept void ZenCacheDiskLayer::CacheBucket::Get(const IoHash& HashKey, GetBatchHandle& BatchHandle) { - ZEN_TRACE_CPU("Z$::Bucket::GetBatched"); + ZEN_TRACE_CPU("Z$::Bucket::Get(Batched)"); BatchHandle.Keys.push_back(HashKey); BatchHandle.ResultIndexes.push_back(BatchHandle.OutResults.size()); BatchHandle.OutResults.push_back({}); @@ -3105,6 +3105,7 @@ ZenCacheDiskLayer::CacheBucket::PutInlineCacheValue(const IoHash& HashKey, Value.Value.Size(), m_Configuration.PayloadAlignment, [&](const BlockStoreLocation& BlockStoreLocation) { + ZEN_TRACE_CPU("Z$::Bucket::UpdateLocation"); DiskLocation Location(BlockStoreLocation, m_Configuration.PayloadAlignment, EntryFlags); m_SlogFile.Append({.Key = HashKey, .Location = Location}); @@ -4172,7 +4173,7 @@ ZenCacheDiskLayer::BeginGetBatch(std::vector<ZenCacheValue>& OutResults) void ZenCacheDiskLayer::EndGetBatch(GetBatchHandle* Batch) noexcept { - ZEN_TRACE_CPU("Z$::GetBatched"); + ZEN_TRACE_CPU("Z$::EndGetBatch"); try { ZEN_ASSERT(Batch); @@ -4205,7 +4206,7 @@ ZenCacheDiskLayer::Get(std::string_view InBucket, const IoHash& HashKey, ZenCach void ZenCacheDiskLayer::Get(std::string_view InBucket, const IoHash& HashKey, GetBatchHandle& BatchHandle) { - ZEN_TRACE_CPU("Z$::GetBatched"); + ZEN_TRACE_CPU("Z$::Get(Batched)"); if (CacheBucket* Bucket = GetOrCreateBucket(InBucket); Bucket != nullptr) { diff --git a/src/zenstore/cache/structuredcachestore.cpp b/src/zenstore/cache/structuredcachestore.cpp index 25d20748e..c98561ebb 100644 --- a/src/zenstore/cache/structuredcachestore.cpp +++ b/src/zenstore/cache/structuredcachestore.cpp @@ -233,7 +233,7 @@ ZenCacheNamespace::Get(std::string_view InBucket, const IoHash& HashKey, ZenCach void ZenCacheNamespace::Get(std::string_view InBucket, const IoHash& HashKey, GetBatchHandle& BatchHandle) { - ZEN_TRACE_CPU("Z$::Namespace::GetBatched"); + ZEN_TRACE_CPU("Z$::Namespace::Get(Batched)"); metrics::RequestStats::Scope StatsScope(m_GetOps, 0); @@ -248,7 +248,7 @@ ZenCacheNamespace::Put(std::string_view InBucket, std::span<IoHash> References, PutBatchHandle* OptionalBatchHandle) { - ZEN_TRACE_CPU("Z$::Namespace::Put"); + ZEN_TRACE_CPU(OptionalBatchHandle ? "Z$::Namespace::Put(Batched)" : "Z$::Namespace::Put"); metrics::RequestStats::Scope $(m_PutOps, Value.Value.Size()); diff --git a/src/zenstore/compactcas.cpp b/src/zenstore/compactcas.cpp index 790a4078e..1e647b284 100644 --- a/src/zenstore/compactcas.cpp +++ b/src/zenstore/compactcas.cpp @@ -184,6 +184,7 @@ CasContainerStrategy::InsertChunk(const void* ChunkData, size_t ChunkSize, const // reads, insert and GC. m_BlockStore.WriteChunk(ChunkData, ChunkSize, m_PayloadAlignment, [&](const BlockStoreLocation& Location) { + ZEN_TRACE_CPU("CasContainer::UpdateLocation"); BlockStoreDiskLocation DiskLocation(Location, m_PayloadAlignment); const CasDiskIndexEntry IndexEntry{.Key = ChunkHash, .Location = DiskLocation}; m_CasLog.Append(IndexEntry); |