From 89ae913fcd03c5600e63f24cd7456fb5d259b01d Mon Sep 17 00:00:00 2001
From: Susumu Oda <susumu.oda@cern.ch>
Date: Wed, 1 Jul 2020 09:58:26 +0000
Subject: [PATCH] Revert m_strawstatusHTG4 to DataHandle and add
ATLAS_NO_CHECK_FILE_THREAD_SAFETY to StrawStatusMultChanContainer.h/cxx.
---
.../TRT_ConditionsServices/CMakeLists.txt | 5 +++--
.../ATLAS_CHECK_THREAD_SAFETY | 1 +
.../TRT_ConditionsServices/src/TRT_AlignDbSvc.cxx | 4 +++-
.../TRT_ConditionsServices/src/TRT_AlignDbSvc.h | 5 ++++-
.../TRT_ConditionsServices/src/TRT_CalDbTool.h | 3 +--
.../src/TRT_DCS_ConditionsSvc.h | 15 ++++++++-------
.../src/TRT_StrawAlignDbSvc.cxx | 1 +
.../src/TRT_StrawAlignDbSvc.h | 5 ++++-
.../src/TRT_StrawStatusSummaryTool.cxx | 5 ++---
.../src/TRT_StrawStatusSummaryTool.h | 7 ++++++-
10 files changed, 33 insertions(+), 18 deletions(-)
create mode 100644 InnerDetector/InDetConditions/TRT_ConditionsServices/TRT_ConditionsServices/ATLAS_CHECK_THREAD_SAFETY
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsServices/CMakeLists.txt b/InnerDetector/InDetConditions/TRT_ConditionsServices/CMakeLists.txt
index 2403ae0ca65..7189431e704 100644
--- a/InnerDetector/InDetConditions/TRT_ConditionsServices/CMakeLists.txt
+++ b/InnerDetector/InDetConditions/TRT_ConditionsServices/CMakeLists.txt
@@ -24,6 +24,7 @@ atlas_depends_on_subdirs( PUBLIC
InnerDetector/InDetConditions/TRT_ConditionsData
PRIVATE
Control/AthenaBaseComps
+ Control/CxxUtils
Control/StoreGate
Database/AthenaPOOL/AthenaPoolUtilities
Database/RDBAccessSvc
@@ -51,11 +52,11 @@ atlas_add_library( TRT_ConditionsServicesLib
PUBLIC_HEADERS TRT_ConditionsServices
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${COOL_INCLUDE_DIRS}
LINK_LIBRARIES AthenaKernel GeoPrimitives EventPrimitives GaudiKernel TRT_ConditionsData StoreGateLib SGtests InDetConditionsSummaryService
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} ${COOL_LIBRARIES} AthenaBaseComps AthenaPoolUtilities DetDescrConditions GeoModelUtilities Identifier xAODEventInfo InDetCoolCoralClientUtils InDetIdentifier InDetReadoutGeometry TRT_ReadoutGeometry PathResolver RegistrationServicesLib ${extra_lib} RDBAccessSvcLib )
+ PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} ${COOL_LIBRARIES} AthenaBaseComps CxxUtils AthenaPoolUtilities DetDescrConditions GeoModelUtilities Identifier xAODEventInfo InDetCoolCoralClientUtils InDetIdentifier InDetReadoutGeometry TRT_ReadoutGeometry PathResolver RegistrationServicesLib ${extra_lib} RDBAccessSvcLib )
atlas_add_component( TRT_ConditionsServices
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${COOL_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} ${COOL_LIBRARIES} AthenaKernel GeoPrimitives EventPrimitives GaudiKernel TRT_ConditionsData AthenaBaseComps StoreGateLib SGtests AthenaPoolUtilities DetDescrConditions GeoModelUtilities Identifier xAODEventInfo EventInfo InDetCoolCoralClientUtils InDetIdentifier InDetReadoutGeometry TRT_ReadoutGeometry PathResolver TRT_ConditionsServicesLib InDetConditionsSummaryService ${extra_lib} RegistrationServicesLib )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} ${COOL_LIBRARIES} AthenaKernel GeoPrimitives EventPrimitives GaudiKernel TRT_ConditionsData AthenaBaseComps CxxUtils StoreGateLib SGtests AthenaPoolUtilities DetDescrConditions GeoModelUtilities Identifier xAODEventInfo EventInfo InDetCoolCoralClientUtils InDetIdentifier InDetReadoutGeometry TRT_ReadoutGeometry PathResolver TRT_ConditionsServicesLib InDetConditionsSummaryService ${extra_lib} RegistrationServicesLib )
atlas_install_python_modules( python/*.py )
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsServices/TRT_ConditionsServices/ATLAS_CHECK_THREAD_SAFETY b/InnerDetector/InDetConditions/TRT_ConditionsServices/TRT_ConditionsServices/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 00000000000..11c23b9daab
--- /dev/null
+++ b/InnerDetector/InDetConditions/TRT_ConditionsServices/TRT_ConditionsServices/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+InnerDetector/InDetConditions/TRT_ConditionsServices
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_AlignDbSvc.cxx b/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_AlignDbSvc.cxx
index fb0ca3d2e56..13b0318737b 100755
--- a/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_AlignDbSvc.cxx
+++ b/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_AlignDbSvc.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/** @file TRT_AlignDbSvc.cxx
@@ -32,6 +32,8 @@
#include "GeoPrimitives/CLHEPtoEigenConverter.h"
#include "GeoPrimitives/CLHEPtoEigenEulerAnglesConverters.h"
+ATLAS_NO_CHECK_FILE_THREAD_SAFETY; // This class uses const_cast and regFcn (callback). Legacy code
+
TRT_AlignDbSvc::TRT_AlignDbSvc( const std::string& name, ISvcLocator* pSvcLocator )
: AthService(name,pSvcLocator),
m_detStore("DetectorStore",name),
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_AlignDbSvc.h b/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_AlignDbSvc.h
index 50297b74873..e415d828d4f 100755
--- a/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_AlignDbSvc.h
+++ b/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_AlignDbSvc.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRT_ALIGNDBSVC_H
@@ -22,6 +22,7 @@
#include <vector>
#include "AthenaBaseComps/AthService.h"
+#include "CxxUtils/checker_macros.h"
#include "GaudiKernel/ToolHandle.h"
#include "StoreGate/DataHandle.h"
#include "TRT_ConditionsServices/ITRT_AlignDbSvc.h"
@@ -30,6 +31,8 @@
#include "GaudiKernel/ServiceHandle.h"
#include "StoreGate/StoreGateSvc.h"
+ATLAS_NO_CHECK_FILE_THREAD_SAFETY; // This class uses const_cast. Legacy code
+
namespace InDetDD {
class TRT_DetectorManager ;
}
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_CalDbTool.h b/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_CalDbTool.h
index 4ffee3baf73..a819c22180f 100644
--- a/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_CalDbTool.h
+++ b/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_CalDbTool.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRT_CALDBTOOL_H
@@ -20,7 +20,6 @@
#include "GaudiKernel/ICondSvc.h"
// Storegate
#include "StoreGate/ReadCondHandleKey.h"
-#include "StoreGate/DataHandle.h"
//Athena
#include "AthenaBaseComps/AthAlgTool.h"
// TRT
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_DCS_ConditionsSvc.h b/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_DCS_ConditionsSvc.h
index 3195d4a9b5d..0749d168c00 100755
--- a/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_DCS_ConditionsSvc.h
+++ b/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_DCS_ConditionsSvc.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRT_DCS_CONDITIONSSVC_H
@@ -12,6 +12,7 @@
**/
#include <vector>
#include "AthenaBaseComps/AthService.h"
+#include "CxxUtils/checker_macros.h"
#include "TRT_ConditionsServices/ITRT_DCS_ConditionsSvc.h"
#include "TRT_ConditionsServices/ITRT_ConditionsSvc.h"
#include "AthenaBaseComps/AthService.h"
@@ -101,13 +102,13 @@ class TRT_DCS_ConditionsSvc : public AthService,
SG::ReadCondHandleKey<CondAttrListCollection> m_barrelReadKey{this,"BarrelKeyName","in","HV Barrel in-key"};
SG::ReadCondHandleKey<CondAttrListCollection> m_EAReadKey{this,"EAKeyName","in","HV EA in-key"};
SG::ReadCondHandleKey<CondAttrListCollection> m_ECReadKey{this,"ECKeyName","in","HV EC in-key"};
- mutable std::vector<const CondAttrListCollection*> m_Barrel_HV_COOLCont;
- mutable std::vector<const CondAttrListCollection*> m_EndcapA_HV_COOLCont;
- mutable std::vector<const CondAttrListCollection*> m_EndcapC_HV_COOLCont;
+ mutable std::vector<const CondAttrListCollection*> m_Barrel_HV_COOLCont ATLAS_THREAD_SAFE; // Guarded by m_cacheMutex
+ mutable std::vector<const CondAttrListCollection*> m_EndcapA_HV_COOLCont ATLAS_THREAD_SAFE; // Guarded by m_cacheMutex
+ mutable std::vector<const CondAttrListCollection*> m_EndcapC_HV_COOLCont ATLAS_THREAD_SAFE; // Guarded by m_cacheMutex
mutable std::mutex m_cacheMutex;
- mutable std::vector<EventContext::ContextEvt_t> m_evtBA;
- mutable std::vector<EventContext::ContextEvt_t> m_evtEA;
- mutable std::vector<EventContext::ContextEvt_t> m_evtEC;
+ mutable std::vector<EventContext::ContextEvt_t> m_evtBA ATLAS_THREAD_SAFE; // Guarded by m_cacheMutex
+ mutable std::vector<EventContext::ContextEvt_t> m_evtEA ATLAS_THREAD_SAFE; // Guarded by m_cacheMutex
+ mutable std::vector<EventContext::ContextEvt_t> m_evtEC ATLAS_THREAD_SAFE; // Guarded by m_cacheMutex
int m_IOVmaxLength;
bool m_doIOVchecking;
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_StrawAlignDbSvc.cxx b/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_StrawAlignDbSvc.cxx
index c0126aa78ab..936225464f2 100755
--- a/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_StrawAlignDbSvc.cxx
+++ b/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_StrawAlignDbSvc.cxx
@@ -22,6 +22,7 @@
#include "Identifier/Identifier.h"
#include "TRT_ReadoutGeometry/TRT_DetectorManager.h"
+ATLAS_NO_CHECK_FILE_THREAD_SAFETY; // This class uses const_cast, regFcn (callback) and DataHandle. Legacy code
TRT_StrawAlignDbSvc::TRT_StrawAlignDbSvc( const std::string& name,
ISvcLocator* pSvcLocator )
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_StrawAlignDbSvc.h b/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_StrawAlignDbSvc.h
index 9a0b2b96423..b7f5e9279eb 100755
--- a/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_StrawAlignDbSvc.h
+++ b/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_StrawAlignDbSvc.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRT_STRAWALIGNDBSVC_H
@@ -11,6 +11,7 @@
#include <vector>
#include "AthenaBaseComps/AthService.h"
+#include "CxxUtils/checker_macros.h"
#include "GaudiKernel/ToolHandle.h"
#include "StoreGate/DataHandle.h"
#include "InDetIdentifier/TRT_ID.h"
@@ -19,6 +20,8 @@
#include "StoreGate/StoreGateSvc.h"
#include "GaudiKernel/ServiceHandle.h"
+ATLAS_NO_CHECK_FILE_THREAD_SAFETY; // This class uses const_cast, regFcn (callback) and DataHandle. Legacy code
+
class IAthenaOutputStreamTool ;
namespace InDetDD {
class TRT_DetectorManager ;
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_StrawStatusSummaryTool.cxx b/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_StrawStatusSummaryTool.cxx
index 93277e85370..2827547aac9 100644
--- a/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_StrawStatusSummaryTool.cxx
+++ b/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_StrawStatusSummaryTool.cxx
@@ -12,7 +12,6 @@
#include "TRT_StrawStatusSummaryTool.h"
#include "InDetIdentifier/TRT_ID.h"
-
TRT_StrawStatusSummaryTool::TRT_StrawStatusSummaryTool( const std::string& type, const std::string& name, const IInterface* parent)
: base_class(type, name, parent),
m_condSvc("CondSvc",name) {}
@@ -94,7 +93,7 @@ int TRT_StrawStatusSummaryTool::getStatusHT(Identifier offlineID, const EventCon
const StrawStatusContainer* strawstatusHTcontainer;
if(m_isGEANT4) {
- strawstatusHTcontainer=m_strawstatusHTG4.cptr();
+ strawstatusHTcontainer=m_strawstatusHTG4.cptr();
}
else {
SG::ReadCondHandle<StrawStatusContainer> rht(m_statHTReadKey,ctx);
@@ -108,7 +107,7 @@ const TRTCond::StrawStatusMultChanContainer* TRT_StrawStatusSummaryTool::getStra
const StrawStatusContainer* strawstatusHTcontainer;
if(m_isGEANT4) {
- strawstatusHTcontainer=m_strawstatusHTG4.cptr();
+ strawstatusHTcontainer=m_strawstatusHTG4.cptr();
}
else {
SG::ReadCondHandle<StrawStatusContainer> rht(m_statHTReadKey,Gaudi::Hive::currentContext());
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_StrawStatusSummaryTool.h b/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_StrawStatusSummaryTool.h
index 5d6bfc71a79..e9baa4b200b 100644
--- a/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_StrawStatusSummaryTool.h
+++ b/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_StrawStatusSummaryTool.h
@@ -26,7 +26,12 @@
#include "TRT_ConditionsData/StrawStatusMultChanContainer.h"
-class TRT_StrawStatusSummaryTool: public extends<AthAlgTool, ITRT_StrawStatusSummaryTool>
+#include "CxxUtils/checker_macros.h"
+
+class ATLAS_NOT_THREAD_SAFE TRT_StrawStatusSummaryTool: // This class uses thread-unsafe DataHandle (m_strawstatusHTG4).
+// If bare pointer is used, GeoModelSvc.TRT_DetectorTool.TRT_StrawStatusSummaryTool
+// cannot retrieve folder 'SimStatusHTKey':/TRT/Cond/StatusHT
+ public extends<AthAlgTool, ITRT_StrawStatusSummaryTool>
{
public:
typedef TRTCond::StrawStatusMultChanContainer StrawStatusContainer;
--
GitLab