From e23c00a4eeaa3e5ab40ced30fc834dfcf34c9272 Mon Sep 17 00:00:00 2001
From: Philippe Canal <pcanal@fnal.gov>
Date: Thu, 11 Feb 2021 18:15:06 -0600
Subject: [PATCH] Mark TBufferMerger::fBuffered as atomic
---
io/io/inc/ROOT/TBufferMerger.hxx | 2 +-
io/io/src/TBufferMerger.cxx | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/io/io/inc/ROOT/TBufferMerger.hxx b/io/io/inc/ROOT/TBufferMerger.hxx
index cfca3648147..1746c54e664 100644
--- a/io/io/inc/ROOT/TBufferMerger.hxx
+++ b/io/io/inc/ROOT/TBufferMerger.hxx
@@ -117,7 +117,7 @@ private:
bool TryMerge(TBufferMergerFile *memfile);
size_t fAutoSave{0}; //< AutoSave only every fAutoSave bytes
- size_t fBuffered{0}; //< Number of bytes currently buffered
+ std::atomic<size_t> fBuffered{0}; //< Number of bytes currently buffered
TFileMerger fMerger{false, false}; //< TFileMerger used to merge all buffers
std::mutex fMergeMutex; //< Mutex used to lock fMerger
mutable std::mutex fQueueMutex; //< Mutex used to lock fQueue
diff --git a/io/io/src/TBufferMerger.cxx b/io/io/src/TBufferMerger.cxx
index 72c1a07d3f6..1c083a48d24 100644
--- a/io/io/src/TBufferMerger.cxx
+++ b/io/io/src/TBufferMerger.cxx
@@ -72,7 +72,6 @@ size_t TBufferMerger::GetQueueSize() const
size_t TBufferMerger::GetBuffered() const
{
- std::lock_guard<std::mutex> lock(fQueueMutex);
return fBuffered;
}
--
GitLab