From 19841c3be4d051852c23a962cc97f49e90d4ab0c Mon Sep 17 00:00:00 2001 From: Susumu Oda <susumu.oda@cern.ch> Date: Tue, 30 Jun 2020 09:02:33 +0000 Subject: [PATCH] Add missing ATLAS_CHECK_THREAD_SAFETY to TRT_Digitization package. Replace thread unsafe exit by return and replace std::cout by msg(MSG::FATAL) to notify the problem. --- .../TRT_Digitization/ATLAS_CHECK_THREAD_SAFETY | 1 + .../TRT_Digitization/src/TRTDigSettings.cxx | 17 +++++++---------- .../TRT_Digitization/src/TRTDigSettings.h | 2 -- 3 files changed, 8 insertions(+), 12 deletions(-) create mode 100644 InnerDetector/InDetDigitization/TRT_Digitization/ATLAS_CHECK_THREAD_SAFETY diff --git a/InnerDetector/InDetDigitization/TRT_Digitization/ATLAS_CHECK_THREAD_SAFETY b/InnerDetector/InDetDigitization/TRT_Digitization/ATLAS_CHECK_THREAD_SAFETY new file mode 100644 index 00000000000..ab973ecc9bb --- /dev/null +++ b/InnerDetector/InDetDigitization/TRT_Digitization/ATLAS_CHECK_THREAD_SAFETY @@ -0,0 +1 @@ +InnerDetector/InDetDigitization/TRT_Digitization diff --git a/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigSettings.cxx b/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigSettings.cxx index 5660feadd6f..d87795874cf 100644 --- a/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigSettings.cxx +++ b/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigSettings.cxx @@ -18,7 +18,6 @@ ///////////////////////////////////////////////////////////////// #include "TRTDigSettings.h" -#include "CxxUtils/checker_macros.h" #include "TRT_ReadoutGeometry/TRT_DetectorManager.h" //Geomodel @@ -34,8 +33,6 @@ #include <iostream> #include <limits> -ATLAS_NO_CHECK_FILE_THREAD_SAFETY; // std::exit is used. - // RDBAccessSvc (Interface to the DD database) has been removed since // TRT_Digitization-01-00-11 because the fetched values are correctly // hard-coded already. See TRT_Digitization-01-00-10 for an example of @@ -325,10 +322,10 @@ void TRTDigSettings::defineNewVariable(std::string name, double * datamember,std //sanity checks: if (m_intboolparMap.find(name)!=m_intboolparMap.end() || m_doubleparMap.find(name)!=m_doubleparMap.end()) { - std::cout << "TRTDigSettings: Multiple definitions of "<<name<<std::endl; exit(1); + msg(MSG::FATAL) << "TRTDigSettings: Multiple definitions of "<<name<<endmsg; return; } if (lowrange > highrange || lowrange*unitval<=m_propertyNotSetMagicNumber ) { - std::cout << "TRTDigSettings: Problem in range of par "<<name<<std::endl; exit(1); + msg(MSG::FATAL) << "TRTDigSettings: Problem in range of par "<<name<<endmsg; return; } doubleparameter p; @@ -349,10 +346,10 @@ void TRTDigSettings::defineNewUIntVariable(std::string name,unsigned int * datam unsigned int lowrange, unsigned int highrange) { //sanity checks: if (m_intboolparMap.find(name)!=m_intboolparMap.end() || m_doubleparMap.find(name)!=m_doubleparMap.end()) { - std::cout << "TRTDigSettings: Multiple definitions of "<<name<<std::endl; exit(1); + msg(MSG::FATAL) << "TRTDigSettings: Multiple definitions of "<<name<<endmsg; return; } if (lowrange > highrange ) { - std::cout << "TRTDigSettings: Problem in range of par "<<name<<std::endl; exit(1); + msg(MSG::FATAL) << "TRTDigSettings: Problem in range of par "<<name<<endmsg; return; } intboolparameter p; @@ -374,10 +371,10 @@ void TRTDigSettings::defineNewIntVariable(std::string name,int * datamember,std: int lowrange, int highrange) { //sanity checks: if (m_intboolparMap.find(name)!=m_intboolparMap.end() || m_doubleparMap.find(name)!=m_doubleparMap.end()) { - std::cout << "TRTDigSettings: Multiple definitions of "<<name<<std::endl; exit(1); + msg(MSG::FATAL) << "TRTDigSettings: Multiple definitions of "<<name<<endmsg; return; } if (lowrange > highrange || lowrange<=m_propertyNotSetMagicNumber_int ) { - std::cout << "TRTDigSettings: Problem in range of par "<<name<<std::endl; exit(1); + msg(MSG::FATAL) << "TRTDigSettings: Problem in range of par "<<name<<endmsg; return; } intboolparameter p; @@ -398,7 +395,7 @@ void TRTDigSettings::defineNewIntVariable(std::string name,int * datamember,std: void TRTDigSettings::defineNewBoolVariable(std::string name,bool * datamember,std::string description) { //sanity checks: if (m_intboolparMap.find(name)!=m_intboolparMap.end() || m_doubleparMap.find(name)!=m_doubleparMap.end()) { - std::cout << "TRTDigSettings: Multiple definitions of "<<name<<std::endl; exit(1); + msg(MSG::FATAL) << "TRTDigSettings: Multiple definitions of "<<name<<endmsg; return; } intboolparameter p; diff --git a/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigSettings.h b/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigSettings.h index 4a0737ed9f0..31495bf0c14 100644 --- a/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigSettings.h +++ b/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigSettings.h @@ -25,8 +25,6 @@ #include <string> #include <vector> -ATLAS_NO_CHECK_FILE_THREAD_SAFETY; // std::exit is used. - class Algorithm; class AlgTool; namespace InDetDD { class TRT_DetectorManager; } -- GitLab