diff options
Diffstat (limited to 'src/zenstore/cache/cachedisklayer.cpp')
| -rw-r--r-- | src/zenstore/cache/cachedisklayer.cpp | 34 |
1 files changed, 23 insertions, 11 deletions
diff --git a/src/zenstore/cache/cachedisklayer.cpp b/src/zenstore/cache/cachedisklayer.cpp index 4640309d9..22b9d0be5 100644 --- a/src/zenstore/cache/cachedisklayer.cpp +++ b/src/zenstore/cache/cachedisklayer.cpp @@ -140,25 +140,37 @@ namespace cache::impl { const char* LogExtension = ".slog"; const char* MetaExtension = ".meta"; + std::filesystem::path GetBucketFilePath(const std::filesystem::path& BucketDir, const std::string& BucketName, const char* Extension) + { + ExtendablePathBuilder<256> Path; + Path.Append(BucketDir); + Path /= BucketName.c_str(); + Path << Extension; + return Path.ToPath(); + } + std::filesystem::path GetIndexPath(const std::filesystem::path& BucketDir, const std::string& BucketName) { - return BucketDir / (BucketName + IndexExtension); + return GetBucketFilePath(BucketDir, BucketName, IndexExtension); } std::filesystem::path GetMetaPath(const std::filesystem::path& BucketDir, const std::string& BucketName) { - return BucketDir / (BucketName + MetaExtension); + return GetBucketFilePath(BucketDir, BucketName, MetaExtension); } std::filesystem::path GetLogPath(const std::filesystem::path& BucketDir, const std::string& BucketName) { - return BucketDir / (BucketName + LogExtension); + return GetBucketFilePath(BucketDir, BucketName, LogExtension); } std::filesystem::path GetManifestPath(const std::filesystem::path& BucketDir, const std::string& BucketName) { ZEN_UNUSED(BucketName); - return BucketDir / "zen_manifest"; + ExtendablePathBuilder<256> Path; + Path.Append(BucketDir); + Path /= "zen_manifest"; + return Path.ToPath(); } bool ValidateCacheBucketIndexEntry(const DiskIndexEntry& Entry, std::string& OutReason) @@ -3083,7 +3095,7 @@ public: { ZEN_TRACE_CPU("Z$::Bucket::CompactStore"); - auto Log = [&Ctx]() { return Ctx.Logger; }; + ZEN_SCOPED_LOG(Ctx.Logger); Stopwatch Timer; const auto _ = MakeGuard([&] { @@ -3338,7 +3350,7 @@ ZenCacheDiskLayer::CacheBucket::RemoveExpiredData(GcCtx& Ctx, GcStats& Stats) { ZEN_TRACE_CPU("Z$::Bucket::RemoveExpiredData"); - auto Log = [&Ctx]() { return Ctx.Logger; }; + ZEN_SCOPED_LOG(Ctx.Logger); size_t TotalEntries = 0; @@ -3502,7 +3514,7 @@ ZenCacheDiskLayer::CacheBucket::GetReferences(const LoggerRef& Logger, { ZEN_TRACE_CPU("Z$::Bucket::GetReferencesLocked"); - auto Log = [&Logger]() { return Logger; }; + ZEN_SCOPED_LOG(Logger); auto GetAttachments = [&](const IoHash& RawHash, MemoryView Data) -> bool { if (CbValidateError Error = ValidateCompactBinary(Data, CbValidateMode::Default); Error == CbValidateError::None) @@ -3718,7 +3730,7 @@ public: { ZEN_TRACE_CPU("Z$::Bucket::PreCache"); - auto Log = [&Ctx]() { return Ctx.Logger; }; + ZEN_SCOPED_LOG(Ctx.Logger); Stopwatch Timer; const auto _ = MakeGuard([&] { @@ -3753,7 +3765,7 @@ public: { ZEN_TRACE_CPU("Z$::Bucket::UpdateLockedState"); - auto Log = [&Ctx]() { return Ctx.Logger; }; + ZEN_SCOPED_LOG(Ctx.Logger); Stopwatch Timer; const auto _ = MakeGuard([&] { @@ -3784,7 +3796,7 @@ public: { ZEN_TRACE_CPU("Z$::Bucket::GetUnusedReferences"); - auto Log = [&Ctx]() { return Ctx.Logger; }; + ZEN_SCOPED_LOG(Ctx.Logger); const size_t InitialCount = IoCids.size(); size_t UsedCount = InitialCount; @@ -3818,7 +3830,7 @@ ZenCacheDiskLayer::CacheBucket::CreateReferenceCheckers(GcCtx& Ctx) { ZEN_TRACE_CPU("Z$::Bucket::CreateReferenceCheckers"); - auto Log = [&Ctx]() { return Ctx.Logger; }; + ZEN_SCOPED_LOG(Ctx.Logger); Stopwatch Timer; const auto _ = MakeGuard([&] { |