From fead390d15701241447a71eecb47881f5b9bd2b8 Mon Sep 17 00:00:00 2001 From: scott snyder <sss@karma> Date: Sat, 7 Mar 2020 16:49:59 +0100 Subject: [PATCH] TrigKernel: Mark ITrigEventLoopMgr::prepareForRun as not thread-safe. The implementation of prepareForRun in TrigServices is marked as not thread-safe, so the interface here should be similarly marked. --- HLT/Trigger/TrigControl/TrigKernel/CMakeLists.txt | 2 +- .../TrigControl/TrigKernel/TrigKernel/ITrigEventLoopMgr.h | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/HLT/Trigger/TrigControl/TrigKernel/CMakeLists.txt b/HLT/Trigger/TrigControl/TrigKernel/CMakeLists.txt index 81e2589d617c..3244ba5cbb7e 100644 --- a/HLT/Trigger/TrigControl/TrigKernel/CMakeLists.txt +++ b/HLT/Trigger/TrigControl/TrigKernel/CMakeLists.txt @@ -13,4 +13,4 @@ atlas_add_library( TrigKernel INTERFACE PUBLIC_HEADERS TrigKernel INCLUDE_DIRS ${Boost_INCLUDE_DIRS} - LINK_LIBRARIES GaudiKernel ) + LINK_LIBRARIES GaudiKernel CxxUtils ) diff --git a/HLT/Trigger/TrigControl/TrigKernel/TrigKernel/ITrigEventLoopMgr.h b/HLT/Trigger/TrigControl/TrigKernel/TrigKernel/ITrigEventLoopMgr.h index 7158fce919fd..6a98c51ae21d 100644 --- a/HLT/Trigger/TrigControl/TrigKernel/TrigKernel/ITrigEventLoopMgr.h +++ b/HLT/Trigger/TrigControl/TrigKernel/TrigKernel/ITrigEventLoopMgr.h @@ -1,11 +1,12 @@ /* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration */ #ifndef TRIGKERNEL_ITRIGEVENTLOOPMGR_H #define TRIGKERNEL_ITRIGEVENTLOOPMGR_H #include "GaudiKernel/IInterface.h" +#include "CxxUtils/checker_macros.h" #include <boost/property_tree/ptree.hpp> /**@class ITrigEventLoopMgr @@ -23,7 +24,7 @@ public: /** * prepareForRun method invoked by framework */ - virtual StatusCode prepareForRun(const boost::property_tree::ptree &) = 0; + virtual StatusCode prepareForRun ATLAS_NOT_THREAD_SAFE (const boost::property_tree::ptree &) = 0; /** * update parameters if necessary after forking workers and issue incident -- GitLab