Merge branch 'master-TRT_CalibAlgs-v2' into 'master'

Add ATLAS_CHECK_THREAD_SAFETY to TRT_CalibAlgs package

See merge request atlas/athena!34359

InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/TRT_CalibAlgs/ATLAS_CHECK_THREAD_SAFETY

+InnerDetector/InDetCalibAlgs/TRT_CalibAlgs

InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/TRT_CalibAlgs/TRTCalibrationMgr.h

@@ -72,7 +72,7 @@ public:
   virtual StatusCode initialize(void) override;
   virtual StatusCode execute(void) override;
   virtual StatusCode finalize(void) override;
-  StatusCode streamOutCalibObjects() const;
+  StatusCode streamOutCalibObjects();
 
 private:
 

InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/TRT_CalibAlgs/TRT_StrawStatus.h

@@ -22,6 +22,7 @@
 #include "VxVertex/VxContainer.h"
 #include "StoreGate/ReadHandleKey.h"
 #include "TrkToolInterfaces/ITrackHoleSearchTool.h"
+#include "CxxUtils/checker_macros.h"
 
 #include <cstdlib>
 #include <string>
@@ -51,7 +52,7 @@ namespace InDet
       @author  Sasa Fratina <sasa.fratina@cern.ch>
   */  
 
-  class TRT_StrawStatus : public AthAlgorithm
+  class ATLAS_NOT_THREAD_SAFE TRT_StrawStatus : public AthAlgorithm // A global variable (last_lumiBlock0) is read and written. Results should not be reproducible in multi-threading.
     {
     public:
 

InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/src/TRTCalibrationMgr.cxx

@@ -247,16 +247,10 @@ StatusCode TRTCalibrationMgr::finalize()
 	return StatusCode::SUCCESS;
 }
 
-StatusCode TRTCalibrationMgr::streamOutCalibObjects() const
+StatusCode TRTCalibrationMgr::streamOutCalibObjects()
 {
   ATH_MSG_INFO( "entering streamOutCalibObjects " );
-  StatusCode sc;
-  
-
-  IAthenaOutputStreamTool*  streamer=const_cast<IAthenaOutputStreamTool*>(&(*m_streamer));
-
-
-  sc = streamer->connectOutput();
+  StatusCode sc = m_streamer->connectOutput();
   if (sc.isFailure()) {
     ATH_MSG_ERROR("Could not connect stream to output");
     return( StatusCode::FAILURE);
@@ -266,13 +260,13 @@ StatusCode TRTCalibrationMgr::streamOutCalibObjects() const
   typeKeys.push_back( IAthenaOutputStreamTool::TypeKeyPair(StrawT0Container::classname(),m_par_t0containerkey)) ;
   typeKeys.push_back( IAthenaOutputStreamTool::TypeKeyPair(RtRelationContainer::classname(),m_par_rtcontainerkey)) ;
   
-  sc = streamer->streamObjects(typeKeys);
+  sc = m_streamer->streamObjects(typeKeys);
   if (sc.isFailure()) {
     ATH_MSG_ERROR("Could not stream out Containers ");
     return( StatusCode::FAILURE);
   }
   
-  sc = streamer->commitOutput();
+  sc = m_streamer->commitOutput();
   if (sc.isFailure()) {
     ATH_MSG_ERROR("Could not commit output stream");
     return( StatusCode::FAILURE);

InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/src/TRTOccupancyInclude.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 /* *******************************************************************
@@ -12,6 +12,7 @@
 #include "xAODEventInfo/EventInfo.h"
 
 #include "StoreGate/ReadHandle.h"
+#include "CxxUtils/checker_macros.h"
 
 TRTOccupancyInclude::TRTOccupancyInclude(const std::string& name, ISvcLocator* pSvcLocator) :
   AthAlgorithm   (name, pSvcLocator),
@@ -44,7 +45,7 @@ StatusCode TRTOccupancyInclude::initialize()
 
 //---------------------------------------------------------------------
 
-StatusCode TRTOccupancyInclude::execute()
+StatusCode TRTOccupancyInclude::execute ATLAS_NOT_THREAD_SAFE () // static variables are used.
 {
   msg(MSG::DEBUG) << "execute()" << endmsg;