aboutsummaryrefslogtreecommitdiff
path: root/src/zenserver/cache/cachedisklayer.h
diff options
context:
space:
mode:
authorDan Engelbrecht <[email protected]>2023-11-10 16:12:59 +0100
committerGitHub <[email protected]>2023-11-10 16:12:59 +0100
commitfa7c53b1dec7254bf793e7c0df82eb486a7490a5 (patch)
tree4eb9e8885231eb8364a7ec22d75b2f5a9626dca0 /src/zenserver/cache/cachedisklayer.h
parentreduce memory footprint for bucket indexes (#526) (diff)
downloadzen-fa7c53b1dec7254bf793e7c0df82eb486a7490a5.tar.xz
zen-fa7c53b1dec7254bf793e7c0df82eb486a7490a5.zip
fix bad access to unlocked state (#527)
* don't touch non-locked data when creating manifest * safety assert for test dir
Diffstat (limited to 'src/zenserver/cache/cachedisklayer.h')
-rw-r--r--src/zenserver/cache/cachedisklayer.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/zenserver/cache/cachedisklayer.h b/src/zenserver/cache/cachedisklayer.h
index 4efdeebd7..d46d629e4 100644
--- a/src/zenserver/cache/cachedisklayer.h
+++ b/src/zenserver/cache/cachedisklayer.h
@@ -335,7 +335,10 @@ private:
uint64_t ReadIndexFile(const std::filesystem::path& IndexPath, uint32_t& OutVersion);
uint64_t ReadLog(const std::filesystem::path& LogPath, uint64_t LogPosition);
void OpenLog(const bool IsNew);
- CbObject MakeManifest(IndexMap&& Index, std::vector<AccessTime>&& AccessTimes, const std::vector<BucketPayload>& Payloads);
+ CbObject MakeManifest(IndexMap&& Index,
+ std::vector<AccessTime>&& AccessTimes,
+ const std::vector<BucketPayload>& Payloads,
+ const std::vector<BucketMetaData>& MetaDatas);
void SaveManifest(
CbObject&& Manifest,
const std::function<uint64_t()>& ClaimDiskReserveFunc = []() { return 0; });