Merge branch 'thread.LArRawUtils-20201110' into 'master'

LArRawUtils: Enable thread-safety checking.

See merge request atlas/athena!38065

LArCalorimeter/LArRawUtils/CMakeLists.txt

@@ -7,7 +7,7 @@ atlas_subdir( LArRawUtils )
 atlas_add_library( LArRawUtilsLib
                    src/*.cxx
                    PUBLIC_HEADERS LArRawUtils
-                   LINK_LIBRARIES CaloIdentifier CaloTTDetDescr AthenaBaseComps AthenaKernel Identifier GaudiKernel LArCablingLib LArIdentifier LArRawEvent StoreGateLib CaloTriggerToolLib
+                   LINK_LIBRARIES CaloIdentifier CaloTTDetDescr AthenaBaseComps AthenaKernel Identifier GaudiKernel LArCablingLib LArIdentifier LArRawEvent StoreGateLib CaloTriggerToolLib CxxUtils
                    PRIVATE_LINK_LIBRARIES AtlasDetDescr )
 
 atlas_add_component( LArRawUtils

LArCalorimeter/LArRawUtils/LArRawUtils/ATLAS_CHECK_THREAD_SAFETY

+LArCalorimeter/LArRawUtils

LArCalorimeter/LArRawUtils/LArRawUtils/LArRawOrdering.h

 /*
-  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 LARRAWUTILS_LARRAWORDERING_H
 #define LARRAWUTILS_LARRAWORDERING_H
 
 
-#include "LArRawEvent/LArRawChannel.h" 
+#include "LArRawEvent/LArRawChannel.h"
+#include "CxxUtils/checker_macros.h"
 
 class LArRoI_Map; 
 
 
-class LArRawOrdering
+class ATLAS_NOT_THREAD_SAFE LArRawOrdering
 {
 
   public: 

LArCalorimeter/LArRawUtils/LArRawUtils/LArRoI_Map.h

 /*
-  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 LARRAWEVENT_LARROI_MAP_H
@@ -16,6 +16,7 @@
 #include "StoreGate/DataHandle.h" 
 #include "GaudiKernel/IIncidentListener.h"
 #include "AthenaKernel/IOVSvcDefs.h"
+#include "CxxUtils/checker_macros.h"
 
 #include "AthenaBaseComps/AthAlgTool.h"
 #include <map> 
@@ -36,8 +37,10 @@ class LArFCAL_ID ;
  */
 
 
-class LArRoI_Map : public AthAlgTool,
-		      public IIncidentListener 
+// Not thread-safe due to the use of old cabling tools + callbacks
+class ATLAS_NOT_THREAD_SAFE
+      LArRoI_Map : public AthAlgTool,
+                   public IIncidentListener 
  { 
 
  public:

LArCalorimeter/LArRawUtils/LArRawUtils/LArTT_Selector.h

 /*
-  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 LARRAWUTILS_LARTT_SELECTOR_H
 #define LARRAWUTILS_LARTT_SELECTOR_H
 
 #include "Identifier/Identifier.h" 
-#include "Identifier/IdentifierHash.h" 
+#include "Identifier/IdentifierHash.h"
+#include "CxxUtils/checker_macros.h"
 
 class LArRoI_Map; 
 
+// Not thread-safe due to the use of LArRoI_Map.
 template <class CONTAINER >
 class LArTT_Selector
 {
@@ -95,7 +97,8 @@ class LArTT_Selector
 
    // set RoI according TT, + a sam number. 
 //   void setRoIs( const VEC_TT_ID& ids,  int sam ) ; 
-   void setRoIs( const VEC_TT_ID& ids ) ; 
+   // Not thread-safe due to the use of LArRoI_Map.
+   void setRoIs ATLAS_NOT_THREAD_SAFE ( const VEC_TT_ID& ids ) ; 
 
    // set RoI according to combined TT_Sampling ID (unsigned int).    
 //   void setRoIs( const VEC_TT_SAM_ID& ids ) ; 

LArCalorimeter/LArRawUtils/LArRawUtils/LArTT_Selector.icc

 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "LArRawUtils/LArRoI_Map.h" 
@@ -150,7 +150,7 @@ void LArTT_Selector<CONTAINER>::setContainer(const CONTAINER* c) {
 template <class CONTAINER >
 //void LArTT_Selector<CONTAINER> :: setRoIs( const VEC_TT_ID& ids, 
 //							int sam)
-void LArTT_Selector<CONTAINER> :: setRoIs( const VEC_TT_ID& ids)
+void LArTT_Selector<CONTAINER> :: setRoIs ATLAS_NOT_THREAD_SAFE ( const VEC_TT_ID& ids)
 {
 
   // clean it up.