Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
CERN ROOT
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Rutherford Experiment Lab Course Online
CERN ROOT
Commits
e23c00a4
Commit
e23c00a4
authored
4 years ago
by
Philippe Canal
Browse files
Options
Downloads
Patches
Plain Diff
Mark TBufferMerger::fBuffered as atomic
parent
c583b993
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
io/io/inc/ROOT/TBufferMerger.hxx
+1
-1
1 addition, 1 deletion
io/io/inc/ROOT/TBufferMerger.hxx
io/io/src/TBufferMerger.cxx
+0
-1
0 additions, 1 deletion
io/io/src/TBufferMerger.cxx
with
1 addition
and
2 deletions
io/io/inc/ROOT/TBufferMerger.hxx
+
1
−
1
View file @
e23c00a4
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
io/io/src/TBufferMerger.cxx
+
0
−
1
View file @
e23c00a4
...
...
@@ -72,7 +72,6 @@ size_t TBufferMerger::GetQueueSize() const
size_t
TBufferMerger
::
GetBuffered
()
const
{
std
::
lock_guard
<
std
::
mutex
>
lock
(
fQueueMutex
);
return
fBuffered
;
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment