diff options
| author | Matt Peters <[email protected]> | 2021-12-03 08:22:13 -0700 |
|---|---|---|
| committer | Matt Peters <[email protected]> | 2021-12-03 08:22:13 -0700 |
| commit | 0d8d8b09f925bd8bd0183c647e21e209ed71284b (patch) | |
| tree | 23dac3bb52fdd3311f61370702c6e0dfe6527a48 /zencore/iobuffer.cpp | |
| parent | Make IoBufferCore::Materialize threadsafe (diff) | |
| download | zen-0d8d8b09f925bd8bd0183c647e21e209ed71284b.tar.xz zen-0d8d8b09f925bd8bd0183c647e21e209ed71284b.zip | |
Fixes from code review
Diffstat (limited to 'zencore/iobuffer.cpp')
| -rw-r--r-- | zencore/iobuffer.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/zencore/iobuffer.cpp b/zencore/iobuffer.cpp index 9a7c6b30e..979772d5e 100644 --- a/zencore/iobuffer.cpp +++ b/zencore/iobuffer.cpp @@ -66,7 +66,7 @@ IoBufferCore::FreeBuffer() return; } - uint32_t LocalFlags = m_Flags.load(std::memory_order_relaxed); + const uint32_t LocalFlags = m_Flags.load(std::memory_order_relaxed); #if ZEN_PLATFORM_WINDOWS if (LocalFlags & kLowLevelAlloc) { @@ -171,12 +171,13 @@ IoBufferExtendedCore::IoBufferExtendedCore(void* FileHandle, uint64_t Offset, ui , m_FileHandle(FileHandle) , m_FileOffset(Offset) { - m_Flags.fetch_or(kIsOwnedByThis | kIsExtended, std::memory_order_relaxed); + uint32_t NewFlags = kIsOwnedByThis | kIsExtended; if (TransferHandleOwnership) { - m_Flags.fetch_or(kOwnsFile, std::memory_order_relaxed); + NewFlags |= kOwnsFile; } + m_Flags.fetch_or(NewFlags, std::memory_order_relaxed); } IoBufferExtendedCore::IoBufferExtendedCore(const IoBufferExtendedCore* Outer, uint64_t Offset, uint64_t Size) @@ -199,7 +200,7 @@ IoBufferExtendedCore::~IoBufferExtendedCore() #endif } - uint32_t LocalFlags = m_Flags.load(std::memory_order_relaxed); + const uint32_t LocalFlags = m_Flags.load(std::memory_order_relaxed); #if ZEN_PLATFORM_WINDOWS if (LocalFlags & kOwnsMmap) { @@ -241,7 +242,8 @@ IoBufferExtendedCore::Materialize() const RwLock::ExclusiveLockScope _(g_MappingLock); // Someone could have gotten here first - if (m_Flags.load(std::memory_order_acquire) & kIsMaterialized) + // We can use memory_order_relaxed on this load because the mutex has already provided the fence + if (m_Flags.load(std::memory_order_relaxed) & kIsMaterialized) return; uint32_t NewFlags = kIsMaterialized; |