diff options
| author | Martin Ridgers <[email protected]> | 2021-11-12 08:57:38 +0100 |
|---|---|---|
| committer | Martin Ridgers <[email protected]> | 2021-11-12 08:57:38 +0100 |
| commit | 96888168970c947636e9663cbf7c3dd219d1aeab (patch) | |
| tree | 55824a08801932ad75100868204254a6372af7e3 /zenserver/cache | |
| parent | Fixed dlopen/close() unresolved symbols (diff) | |
| parent | Horde remote execute (#25) (diff) | |
| download | zen-96888168970c947636e9663cbf7c3dd219d1aeab.tar.xz zen-96888168970c947636e9663cbf7c3dd219d1aeab.zip | |
Merged main
Diffstat (limited to 'zenserver/cache')
| -rw-r--r-- | zenserver/cache/structuredcachestore.cpp | 15 | ||||
| -rw-r--r-- | zenserver/cache/structuredcachestore.h | 6 |
2 files changed, 13 insertions, 8 deletions
diff --git a/zenserver/cache/structuredcachestore.cpp b/zenserver/cache/structuredcachestore.cpp index 9c5f88d47..2b43cddeb 100644 --- a/zenserver/cache/structuredcachestore.cpp +++ b/zenserver/cache/structuredcachestore.cpp @@ -331,27 +331,32 @@ inline DiskLocation::DiskLocation(uint64_t Offset, uint64_t ValueSize, uint32_t { } -inline uint64_t DiskLocation::CombineOffsetAndFlags(uint64_t Offset, uint64_t Flags) +inline uint64_t +DiskLocation::CombineOffsetAndFlags(uint64_t Offset, uint64_t Flags) { return Offset | Flags; } -inline uint64_t DiskLocation::Offset() const +inline uint64_t +DiskLocation::Offset() const { return OffsetAndFlags & kOffsetMask; } -inline uint64_t DiskLocation::Size() const +inline uint64_t +DiskLocation::Size() const { return LowerSize; } -inline uint64_t DiskLocation::IsFlagSet(uint64_t Flag) const +inline uint64_t +DiskLocation::IsFlagSet(uint64_t Flag) const { return OffsetAndFlags & Flag; } -inline ZenContentType DiskLocation::GetContentType() const +inline ZenContentType +DiskLocation::GetContentType() const { ZenContentType ContentType = ZenContentType::kBinary; diff --git a/zenserver/cache/structuredcachestore.h b/zenserver/cache/structuredcachestore.h index aabd91529..e3013b53f 100644 --- a/zenserver/cache/structuredcachestore.h +++ b/zenserver/cache/structuredcachestore.h @@ -111,9 +111,9 @@ struct DiskLocation static const uint64_t kStructured = 0x4000'0000'0000'0000ull; static const uint64_t kTombStone = 0x2000'0000'0000'0000ull; - DiskLocation(); - DiskLocation(uint64_t Offset, uint64_t ValueSize, uint32_t IndexSize, uint64_t Flags); - static uint64_t CombineOffsetAndFlags(uint64_t Offset, uint64_t Flags); + DiskLocation(); + DiskLocation(uint64_t Offset, uint64_t ValueSize, uint32_t IndexSize, uint64_t Flags); + static uint64_t CombineOffsetAndFlags(uint64_t Offset, uint64_t Flags); uint64_t Offset() const; uint64_t Size() const; uint64_t IsFlagSet(uint64_t Flag) const; |