Merge branch 'control_thrchk' into 'master'

Control: enable thread-checker for several packages

See merge request atlas/athena!49967

Control/AthCUDA/AthCUDACore/AthCUDACore/ATLAS_CHECK_THREAD_SAFETY

+Control/AthCUDA/AthCUDACore

Control/AthCUDA/AthCUDACore/CMakeLists.txt

-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 
 # Set the name of the package.
 atlas_subdir( AthCUDACore )
@@ -14,7 +14,7 @@ atlas_add_library( AthCUDACoreLib
    PUBLIC_HEADERS AthCUDACore
    INCLUDE_DIRS ${TBB_INCLUDE_DIRS}
    LINK_LIBRARIES ${TBB_LIBRARIES} GaudiKernel
-   PRIVATE_LINK_LIBRARIES Threads::Threads AthCUDAInterfacesLib )
+   PRIVATE_LINK_LIBRARIES Threads::Threads AthCUDAInterfacesLib CxxUtils )
 
 # Unit test(s) in the package.
 atlas_add_test( Memory

Control/AthCUDA/AthCUDACore/src/TaskArena.cxx

 //
-// Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+// Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 //
 
+#include "CxxUtils/checker_macros.h"
+
 // Local include(s).
 #include "AthCUDACore/TaskArena.h"
 
@@ -9,7 +11,7 @@ namespace AthCUDA {
 
    tbb::task_arena& taskArena() {
 
-      static tbb::task_arena arena( 1, 0 );
+      static tbb::task_arena arena ATLAS_THREAD_SAFE ( 1, 0 );
       return arena;
    }
 

Control/AthCUDA/AthCUDAInterfaces/AthCUDAInterfaces/ATLAS_CHECK_THREAD_SAFETY

+Control/AthCUDA/AthCUDAInterfaces

Control/AthCUDA/AthCUDAKernel/AthCUDAKernel/ATLAS_CHECK_THREAD_SAFETY

+Control/AthCUDA/AthCUDAKernel

Control/AthCUDA/AthCUDAServices/ATLAS_CHECK_THREAD_SAFETY

+Control/AthCUDA/AthCUDAServices

Control/AthenaExamples/AthAsgExUnittest/AthAsgExUnittest/ATLAS_CHECK_THREAD_SAFETY

+Control/AthenaExamples/AthAsgExUnittest

Control/AthenaExamples/AthExCUDA/ATLAS_CHECK_THREAD_SAFETY

+Control/AthenaExamples/AthExCUDA

Control/AthenaExamples/AthExFortranAlgorithm/ATLAS_CHECK_THREAD_SAFETY

+Control/AthenaExamples/AthExFortranAlgorithm

Control/AthenaExamples/AthExHIP/ATLAS_CHECK_THREAD_SAFETY

+Control/AthenaExamples/AthExHIP

Control/AthenaExamples/AthExHistNtup/ATLAS_CHECK_THREAD_SAFETY

+Control/AthenaExamples/AthExHistNtup

Control/AthenaExamples/AthExHive/AthExHive/ATLAS_CHECK_THREAD_SAFETY

+Control/AthenaExamples/AthExHive

Control/AthenaExamples/AthExHive/CMakeLists.txt

-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( AthExHive )
 
 # External dependencies:
 find_package( Boost )
+find_package( CLHEP )
 
 # Component(s) in the package:
 atlas_add_library( AthExHiveLib
@@ -18,7 +19,8 @@ atlas_add_component( AthExHive
                      src/condEx/*.cxx
                      src/loopTest/*.cxx
                      src/components/*.cxx
-                     LINK_LIBRARIES AthenaKernel AthenaBaseComps StoreGateLib xAODEventInfo AthExHiveLib )
+                     INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
+                     LINK_LIBRARIES ${Boost_LIBRARIES} ${CLHEP_LIBRARIES} AthenaKernel AthenaBaseComps GaudiKernel StoreGateLib xAODEventInfo AthExHiveLib )
 
 # Install files from the package:
 atlas_install_joboptions( share/*.py )

Control/AthenaExamples/AthExHive/src/HiveAlgBase.cxx

 /*
-  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "HiveAlgBase.h"
 #include <thread>
 
+#include "AthenaKernel/RNGWrapper.h"
+#include "CLHEP/Random/RandomEngine.h"
+#include "CLHEP/Random/RandFlat.h"
+
 HiveAlgBase::HiveAlgBase( const std::string& name, 
                       ISvcLocator* pSvcLocator ) : 
   ::AthAlgorithm( name, pSvcLocator ),
   m_hes("HiveExSvc",name),
-  m_ccs("CPUCrunchSvc",name) {}
+  m_ccs("CPUCrunchSvc",name),
+  m_rngSvc("AthRNGSvc", name) {}
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
@@ -22,16 +27,11 @@ StatusCode HiveAlgBase::initialize() {
 
   // retrieve the CPUCrunchSvc if Alg chooses to Crunch instead of Sleep
   if (m_doCrunch) {
-    if (m_ccs.retrieve().isFailure()) {
-      ATH_MSG_ERROR("unable to retrieve the CPUCrunchSvc");
-      return StatusCode::FAILURE;
-    }
+    ATH_CHECK( m_ccs.retrieve() );
   }
 
-  if (m_hes.retrieve().isFailure()) {
-    ATH_MSG_ERROR("unable to retrieve the HiveExSvc");
-    return StatusCode::FAILURE;
-  }
+  ATH_CHECK( m_hes.retrieve() );
+  ATH_CHECK( m_rngSvc.retrieve() );
 
   return StatusCode::SUCCESS;
 }
@@ -41,8 +41,12 @@ StatusCode HiveAlgBase::initialize() {
 unsigned int
 HiveAlgBase::sleep() {
 
+  auto ctx = Gaudi::Hive::currentContext();
+  ATHRNG::RNGWrapper* rngWrapper = m_rngSvc->getEngine(this);
+  rngWrapper->setSeed( name(), ctx );
+
   // add a bit of variability to the sleep/crunch time
-  unsigned int sleep = igen( m_time );
+  const unsigned int sleep = CLHEP::RandFlat::shoot(rngWrapper->getEngine(ctx), 0, m_time);
 
   if (m_doCrunch) {
     ATH_MSG_INFO("  crunch for: " << sleep << " ms");

Control/AthenaExamples/AthExHive/src/HiveAlgBase.h

 /*
-  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
@@ -16,14 +16,14 @@
 #define ATHEXHIVE_BASEALG_H 1
 
 #include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaKernel/IAthRNGSvc.h"
 #include "GaudiKernel/ServiceHandle.h"
 #include "GaudiKernel/ICPUCrunchSvc.h"
 #include "AthExHive/IHiveExSvc.h"
-#include "rGen.h"
 
 #include <string>
 
-class HiveAlgBase  :  public AthAlgorithm, public rGen {
+class HiveAlgBase  :  public AthAlgorithm {
   
 public:
   
@@ -45,7 +45,10 @@ protected:
 
   // Handle to CPUCrunchSvc, which burns CPU time
   ServiceHandle<ICPUCrunchSvc> m_ccs;
-  
+
+  // Handle to random number service
+  ServiceHandle<IAthRNGSvc> m_rngSvc;
+
 private:
 
   Gaudi::Property<unsigned int> m_time{this, "Time", 0, "default alg sleep time in ms"};

Control/AthenaExamples/AthExHive/src/condEx/ASCIICondDbSvc.cxx

 /*
-  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "ASCIICondDbSvc.h"
@@ -11,13 +11,13 @@
 
 #include <fstream>
 
-std::string r_t("\\[([0-9]+),([0-9]+)\\]");
-std::string r_r = "\\s*\\{" + r_t + "-" + r_t + "\\}\\s*";
-std::string r_e = "\\s*\\{" + r_t + "-" + r_t + "\\}=([0-9]+)\\s*";
-std::string r_ef = "\\s*\\{" + r_t + "-" + r_t + "\\}=(-*[0-9]*\\.*[0-9]*)\\s*";
-boost::regex rr(r_r);
-boost::regex re(r_e);
-boost::regex ref(r_ef);
+const std::string r_t("\\[([0-9]+),([0-9]+)\\]");
+const std::string r_r = "\\s*\\{" + r_t + "-" + r_t + "\\}\\s*";
+const std::string r_e = "\\s*\\{" + r_t + "-" + r_t + "\\}=([0-9]+)\\s*";
+const std::string r_ef = "\\s*\\{" + r_t + "-" + r_t + "\\}=(-*[0-9]*\\.*[0-9]*)\\s*";
+const boost::regex rr(r_r);
+const boost::regex re(r_e);
+const boost::regex ref(r_ef);
 
 
 //---------------------------------------------------------------------------

Control/AthenaExamples/AthExHive/src/rGen.cxx

-/*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "rGen.h"
-#include <thread>
-
-std::once_flag rGen::m_f;
-std::default_random_engine rGen::m_gen;
-std::uniform_real_distribution<float> rGen::m_dst(0.5,2.0);
-
-void rGen::init() {
-  unsigned long seed = std::hash<std::thread::id>()(std::this_thread::get_id());
-  m_gen.seed(seed);
-}

Control/AthenaExamples/AthExHive/src/rGen.h

-/*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-*/
-
-/**
- * @file rGen.h
- * @brief interface to a random number generator, used to make sleep time
- * of Algorithms slightly variable
- */
-
-#ifndef RGEN_H
-#define RGEN_H 1
-
-#include <random>
-#include <mutex>
-
-class rGen {
-public:
-
-  rGen() {
-    std::call_once( m_f, &rGen::init, this );    
-  }
-
-  float gen() {
-    return m_dst(m_gen);
-  }
-
-  unsigned int igen(int t) {
-    return (unsigned int)( m_dst(m_gen) * float(t) );
-  }
-
-private:
-  void init();
-  static std::once_flag m_f;
-
-  static std::default_random_engine m_gen;
-  static std::uniform_real_distribution<float> m_dst;
-
-};
-
-  
-#endif

Control/AthenaExamples/AthExJobOptions/AthExJobOptions/ATLAS_CHECK_THREAD_SAFETY

+Control/AthenaExamples/AthExJobOptions

Control/AthenaExamples/AthExMonitored/ATLAS_CHECK_THREAD_SAFETY

+Control/AthenaExamples/AthExMonitored