From 02b61a6eb5fb7f656a45bf45cdcc57e2d9452401 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Wed, 26 Jan 2022 09:21:17 +0100
Subject: [PATCH] AthenaServices: enable thread-checker for entire package
Enable the thread-checker for the entire package. The explicit selection
of services to be checked is no longer needed and the relevant
thread-checker attributes have been removed again.
---
Control/AthenaServices/ATLAS_CHECK_THREAD_SAFETY | 1 +
Control/AthenaServices/src/AthDictLoaderSvc.h | 4 ++--
Control/AthenaServices/src/AthenaSummarySvc.h | 4 ++--
Control/AthenaServices/src/ConditionsCleanerSvc.h | 4 ++--
Control/AthenaServices/src/DecisionSvc.h | 4 ++--
Control/AthenaServices/src/DelayedConditionsCleanerSvc.h | 4 ++--
Control/AthenaServices/src/ItemListSvc.h | 4 ++--
Control/AthenaServices/src/JobIDSvc.h | 4 ++--
Control/AthenaServices/src/LoggedMessageSvc.h | 4 ++--
Control/AthenaServices/src/MetaDataSvc.h | 4 ++--
Control/AthenaServices/src/RCUSvc.h | 4 ++--
11 files changed, 21 insertions(+), 20 deletions(-)
create mode 100644 Control/AthenaServices/ATLAS_CHECK_THREAD_SAFETY
diff --git a/Control/AthenaServices/ATLAS_CHECK_THREAD_SAFETY b/Control/AthenaServices/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 00000000000..a205dc23f85
--- /dev/null
+++ b/Control/AthenaServices/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+Control/AthenaServices
diff --git a/Control/AthenaServices/src/AthDictLoaderSvc.h b/Control/AthenaServices/src/AthDictLoaderSvc.h
index 6cc3187f4cc..9b465373ed1 100644
--- a/Control/AthenaServices/src/AthDictLoaderSvc.h
+++ b/Control/AthenaServices/src/AthDictLoaderSvc.h
@@ -1,7 +1,7 @@
///////////////////////// -*- C++ -*- /////////////////////////////
/*
- Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
*/
// AthDictLoaderSvc.h
@@ -32,7 +32,7 @@ class ITPCnvSvc;
class ISvcLocator;
template <class TYPE> class SvcFactory;
-class ATLAS_CHECK_THREAD_SAFETY AthDictLoaderSvc
+class AthDictLoaderSvc
: virtual public ::IDictLoaderSvc,
public ::AthService
{
diff --git a/Control/AthenaServices/src/AthenaSummarySvc.h b/Control/AthenaServices/src/AthenaSummarySvc.h
index 08f2571ef50..eb4b0faf039 100644
--- a/Control/AthenaServices/src/AthenaSummarySvc.h
+++ b/Control/AthenaServices/src/AthenaSummarySvc.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
*/
#ifndef ATHENASERVICES_ATHENASUMSVC_H
@@ -32,7 +32,7 @@
#include <fstream>
-class ATLAS_CHECK_THREAD_SAFETY AthenaSummarySvc :
+class AthenaSummarySvc :
public extends<AthService, IIncidentListener, IAthenaSummarySvc> {
public:
diff --git a/Control/AthenaServices/src/ConditionsCleanerSvc.h b/Control/AthenaServices/src/ConditionsCleanerSvc.h
index c2b4e2ab145..45d75bc2516 100644
--- a/Control/AthenaServices/src/ConditionsCleanerSvc.h
+++ b/Control/AthenaServices/src/ConditionsCleanerSvc.h
@@ -1,6 +1,6 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
*/
/*
*/
@@ -32,7 +32,7 @@ namespace Athena {
* the concrete class in one place. The concrete service may be left
* unspecified, in which case no garbage collection will be done.
*/
-class ATLAS_CHECK_THREAD_SAFETY ConditionsCleanerSvc
+class ConditionsCleanerSvc
: public extends<AthService, IConditionsCleanerSvc>
{
public:
diff --git a/Control/AthenaServices/src/DecisionSvc.h b/Control/AthenaServices/src/DecisionSvc.h
index f4d8b177b27..957b09c5330 100644
--- a/Control/AthenaServices/src/DecisionSvc.h
+++ b/Control/AthenaServices/src/DecisionSvc.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
*/
#ifndef ATHENASERVICES_DECISIONSVC_H
#define ATHENASERVICES_DECISIONSVC_H
@@ -27,7 +27,7 @@
* @author S.Binet<binet@cern.ch>
* @author B.Radics<radbal@cern.ch>
*/
-class ATLAS_CHECK_THREAD_SAFETY DecisionSvc : public extends<AthService, IDecisionSvc>
+class DecisionSvc : public extends<AthService, IDecisionSvc>
{
public:
diff --git a/Control/AthenaServices/src/DelayedConditionsCleanerSvc.h b/Control/AthenaServices/src/DelayedConditionsCleanerSvc.h
index 309b6e6b3a5..f9627284b4d 100644
--- a/Control/AthenaServices/src/DelayedConditionsCleanerSvc.h
+++ b/Control/AthenaServices/src/DelayedConditionsCleanerSvc.h
@@ -1,6 +1,6 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
*/
/*
*/
@@ -56,7 +56,7 @@ class DelayedConditionsCleanerSvcProps;
* The cleaning can optionally be done as an asynchronous TBB job if
* Async is true and allowAsync=true is passed to @c event.
*/
-class ATLAS_CHECK_THREAD_SAFETY DelayedConditionsCleanerSvc
+class DelayedConditionsCleanerSvc
: public extends<AthService, IConditionsCleanerSvc>
{
public:
diff --git a/Control/AthenaServices/src/ItemListSvc.h b/Control/AthenaServices/src/ItemListSvc.h
index 94674f1a809..6ea2009d4fa 100644
--- a/Control/AthenaServices/src/ItemListSvc.h
+++ b/Control/AthenaServices/src/ItemListSvc.h
@@ -1,7 +1,7 @@
///////////////////////// -*- C++ -*- /////////////////////////////
/*
- Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
*/
// ItemListSvc.h
@@ -52,7 +52,7 @@ namespace item {
};
}
-class ATLAS_CHECK_THREAD_SAFETY ItemListSvc : public extends<AthService, IItemListSvc>
+class ItemListSvc : public extends<AthService, IItemListSvc>
{
public:
diff --git a/Control/AthenaServices/src/JobIDSvc.h b/Control/AthenaServices/src/JobIDSvc.h
index 35fd75f07e1..d5233a63173 100644
--- a/Control/AthenaServices/src/JobIDSvc.h
+++ b/Control/AthenaServices/src/JobIDSvc.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
*/
#ifndef ATHENASERVICES_JOBIDSVC_H
@@ -14,7 +14,7 @@
* @brief a service to distribute unique job identifier
* @author Yushu Yao <yyao@lbl.gov> - ATLAS Collaboration
*/
-class ATLAS_CHECK_THREAD_SAFETY JobIDSvc : public extends<AthService, IJobIDSvc> {
+class JobIDSvc : public extends<AthService, IJobIDSvc> {
public:
// Standard Constructor
JobIDSvc(const std::string& name, ISvcLocator* svc);
diff --git a/Control/AthenaServices/src/LoggedMessageSvc.h b/Control/AthenaServices/src/LoggedMessageSvc.h
index 7b61d78fd98..33070dce059 100644
--- a/Control/AthenaServices/src/LoggedMessageSvc.h
+++ b/Control/AthenaServices/src/LoggedMessageSvc.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
*/
#ifndef ATHENASERVICES_LOGGEDMESSAGESVC_H
@@ -34,7 +34,7 @@ class ISvcLocator;
//
// Author: Charles Leggett
//
-class ATLAS_CHECK_THREAD_SAFETY LoggedMessageSvc :
+class LoggedMessageSvc :
public extends<AthService, ILoggedMessageSvc, IInactiveMessageCounter> {
public:
diff --git a/Control/AthenaServices/src/MetaDataSvc.h b/Control/AthenaServices/src/MetaDataSvc.h
index 1e5d56dab44..b2a1c8dfedf 100644
--- a/Control/AthenaServices/src/MetaDataSvc.h
+++ b/Control/AthenaServices/src/MetaDataSvc.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
*/
#ifndef ATHENASERVICES_METADATASVC_H
@@ -43,7 +43,7 @@ template <class TYPE> class SvcFactory;
/** @class MetaDataSvc
* @brief This class provides the interface to the LCG POOL persistency software.
**/
-class ATLAS_CHECK_THREAD_SAFETY MetaDataSvc : public ::AthService,
+class MetaDataSvc : public ::AthService,
virtual public IAddressProvider,
virtual public IIncidentListener,
virtual public IMetaDataSvc,
diff --git a/Control/AthenaServices/src/RCUSvc.h b/Control/AthenaServices/src/RCUSvc.h
index dc92decaef6..d56947fdc96 100644
--- a/Control/AthenaServices/src/RCUSvc.h
+++ b/Control/AthenaServices/src/RCUSvc.h
@@ -1,7 +1,7 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
*/
/**
@@ -36,7 +36,7 @@ namespace Athena {
* This service keeps a registry of RCU objects. At EndEvent,
* it declares them quiescent for the current event slot.
*/
-class ATLAS_CHECK_THREAD_SAFETY RCUSvc
+class RCUSvc
: public extends<AthService, IRCUSvc, IIncidentListener>
{
public:
--
GitLab