Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
athena
Manage
Activity
Members
Labels
Plan
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
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
atlas
athena
Merge requests
!20979
CxxUtils: Fix potential locking issue in ConcurrentRangeMap test.
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
CxxUtils: Fix potential locking issue in ConcurrentRangeMap test.
ssnyder/athena:test.CxxUtils-20190208
into
master
Overview
3
Commits
1
Pipelines
1
Changes
1
Merged
Scott Snyder
requested to merge
ssnyder/athena:test.CxxUtils-20190208
into
master
6 years ago
Overview
3
Commits
1
Pipelines
1
Changes
1
Expand
m_inGrace should be protected by the mutex. Only affects the unit test.
0
0
Merge request reports
Compare
master
master (base)
and
latest version
latest version
df181a42
1 commit,
6 years ago
1 file
+
2
−
2
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Control/CxxUtils/test/ConcurrentRangeMap_test.cxx
+
2
−
2
Options
/*
Copyright (C) 2002-201
8
CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-201
9
CERN for the benefit of the ATLAS collaboration
*/
/*
*/
@@ -134,8 +134,8 @@ public:
void
quiescent
(
int
slot
)
{
unsigned
int
mask
=
(
1
<<
slot
);
if
((
m_inGrace
&
mask
)
==
0
)
return
;
std
::
lock_guard
<
std
::
mutex
>
g
(
m_mutex
);
if
((
m_inGrace
&
mask
)
==
0
)
return
;
m_inGrace
&=
~
mask
;
if
(
!
m_inGrace
)
{
for
(
T
*
p
:
m_garbage
)
delete
p
;
Loading