Skip to content
Snippets Groups Projects
Commit e23c00a4 authored by Philippe Canal's avatar Philippe Canal
Browse files

Mark TBufferMerger::fBuffered as atomic

parent c583b993
No related branches found
No related tags found
No related merge requests found
...@@ -117,7 +117,7 @@ private: ...@@ -117,7 +117,7 @@ private:
bool TryMerge(TBufferMergerFile *memfile); bool TryMerge(TBufferMergerFile *memfile);
size_t fAutoSave{0}; //< AutoSave only every fAutoSave bytes 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 TFileMerger fMerger{false, false}; //< TFileMerger used to merge all buffers
std::mutex fMergeMutex; //< Mutex used to lock fMerger std::mutex fMergeMutex; //< Mutex used to lock fMerger
mutable std::mutex fQueueMutex; //< Mutex used to lock fQueue mutable std::mutex fQueueMutex; //< Mutex used to lock fQueue
......
...@@ -72,7 +72,6 @@ size_t TBufferMerger::GetQueueSize() const ...@@ -72,7 +72,6 @@ size_t TBufferMerger::GetQueueSize() const
size_t TBufferMerger::GetBuffered() const size_t TBufferMerger::GetBuffered() const
{ {
std::lock_guard<std::mutex> lock(fQueueMutex);
return fBuffered; return fBuffered;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment