Skip to content
Snippets Groups Projects
Commit 6fa12afe authored by scott snyder's avatar scott snyder Committed by scott snyder
Browse files

EventAthenaPool: Enable thread-safety checking. 

Enable thread-safety checking and clean up warnings.
parent eb24eb1f
No related branches found
No related tags found
9 merge requests!69091Fix correlated smearing bug in JER in JetUncertainties in 22.0,!58791DataQualityConfigurations: Modify L1Calo config for web display,!51674Fixing hotSpotInHIST for Run3 HIST,!50012RecExConfig: Adjust log message levels from GetRunNumber and GetLBNumber,!46784MuonCondInterface: Enable thread-safety checking.,!46776Updated LArMonitoring config file for WD to match new files produced using MT,!46538Draft: Added missing xAOD::TrigConfKeys from DESDM_MCP,!46514TGC Digitization: Implementation of signal propagation time between the sensor edge and ASD,!46353EventAthenaPool: Enable thread-safety checking.
Hide whitespace changes
Inline Side-by-side
Showing
with 50 additions and 49 deletions
Event/EventAthenaPool/ATLAS_CHECK_THREAD_SAFETY 0 → 100644
+ 1
− 0
View file @ 6fa12afe
Event/EventAthenaPool
Event/EventAthenaPool/src/EventInfoCnv.cxx
+ 15
− 15
View file @ 6fa12afe
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
/**
......@@ -20,10 +20,10 @@
#include "AthenaKernel/IEvtIdModifierSvc.h"
static EventInfoCnv_p4 TPconverter_p4;
static EventInfoCnv_p3 TPconverter_p3;
static EventInfoCnv_p2 TPconverter_p2;
static EventInfoCnv_p1 TPconverter_p1;
static const EventInfoCnv_p4 TPconverter_p4;
static const EventInfoCnv_p3 TPconverter_p3;
static const EventInfoCnv_p2 TPconverter_p2;
static const EventInfoCnv_p1 TPconverter_p1;
EventInfoCnv::EventInfoCnv(ISvcLocator* svcloc)
:
......@@ -49,45 +49,45 @@ EventInfoCnv::EventInfoCnv(ISvcLocator* svcloc)
EventInfo_PERS* EventInfoCnv::createPersistent(EventInfo* transObj) {
MsgStream log(msgSvc(), "EventInfoCnv" );
EventInfo_PERS *persObj = TPconverter_p4.createPersistent( transObj, log );
EventInfo_PERS *persObj = TPconverter_p4.createPersistentConst( transObj, log );
log << MSG::DEBUG << "EventInfo write Success" << endmsg;
return persObj;
}
EventInfo* EventInfoCnv::createTransient() {
static pool::Guid p4_guid("C634FDB6-CC4B-4BA2-B8F9-A84BE6A786C7");
static pool::Guid p3_guid("3E240CA8-5124-405B-9059-FAFC4C5954C6");
static pool::Guid p2_guid("22006E19-F0DA-4EFB-AF55-6FBDA421BF06");
static pool::Guid p1_guid("A3053CD9-47F4-4C0F-B73A-A6F93F5CC7B7");
static pool::Guid p0_guid("380D8BB9-B34F-470F-92CC-06C3D60F7BE4");
static const pool::Guid p4_guid("C634FDB6-CC4B-4BA2-B8F9-A84BE6A786C7");
static const pool::Guid p3_guid("3E240CA8-5124-405B-9059-FAFC4C5954C6");
static const pool::Guid p2_guid("22006E19-F0DA-4EFB-AF55-6FBDA421BF06");
static const pool::Guid p1_guid("A3053CD9-47F4-4C0F-B73A-A6F93F5CC7B7");
static const pool::Guid p0_guid("380D8BB9-B34F-470F-92CC-06C3D60F7BE4");
if( compareClassGuid(p4_guid) ) {
// using unique_ptr ensures deletion of the persistent object
std::unique_ptr< EventInfo_p4 > col_vect( poolReadObject< EventInfo_p4 >() );
MsgStream log(msgSvc(), "EventInfoCnv" );
//log << MSG::DEBUG << "Reading EventInfo_p4" << endmsg;
return massageEventInfo(TPconverter_p4.createTransient( col_vect.get(), log ));
return massageEventInfo(TPconverter_p4.createTransientConst( col_vect.get(), log ));
}
else if( compareClassGuid(p3_guid) ) {
// using unique_ptr ensures deletion of the persistent object
std::unique_ptr< EventInfo_p3 > col_vect( poolReadObject< EventInfo_p3 >() );
MsgStream log(msgSvc(), "EventInfoCnv" );
//log << MSG::DEBUG << "Reading EventInfo_p3" << endmsg;
return massageEventInfo(TPconverter_p3.createTransient( col_vect.get(), log ));
return massageEventInfo(TPconverter_p3.createTransientConst( col_vect.get(), log ));
}
else if( compareClassGuid(p2_guid) ) {
// using unique_ptr ensures deletion of the persistent object
std::unique_ptr< EventInfo_p2 > col_vect( poolReadObject< EventInfo_p2 >() );
MsgStream log(msgSvc(), "EventInfoCnv" );
// log << MSG::DEBUG << "ILIJA Reading EventInfo_p2" << endmsg;
return massageEventInfo(TPconverter_p2.createTransient( col_vect.get(), log ));
return massageEventInfo(TPconverter_p2.createTransientConst( col_vect.get(), log ));
}
else if( compareClassGuid(p1_guid) ) {
// using unique_ptr ensures deletion of the persistent object
std::unique_ptr< EventInfo_p1 > col_vect( poolReadObject< EventInfo_p1 >() );
MsgStream log(msgSvc(), "EventInfoCnv" );
//log << MSG::DEBUG << "Reading EventInfo_p1" << endmsg;
return massageEventInfo(TPconverter_p1.createTransient( col_vect.get(), log ));
return massageEventInfo(TPconverter_p1.createTransientConst( col_vect.get(), log ));
}
else if( compareClassGuid(p0_guid) ) {
// regular object from before TP separation, just return it
......
Event/EventAthenaPool/src/EventStreamInfoCnv.cxx
+ 4
− 4
View file @ 6fa12afe
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
/** @file EventStreamInfoCnv.cxx
......@@ -27,9 +27,9 @@ EventStreamInfo_PERS* EventStreamInfoCnv::createPersistent(EventStreamInfo* tran
}
//______________________________________________________________________________
EventStreamInfo* EventStreamInfoCnv::createTransient() {
static pool::Guid p3_guid("11DF1B8C-0DEE-4687-80D7-E74B520ACBB4");
static pool::Guid p2_guid("9AD4889D-C8EB-4F3B-9920-D37FF092CAB6");
static pool::Guid p1_guid("9998C282-403B-4EA5-A795-C8C9BA9909C3");
static const pool::Guid p3_guid("11DF1B8C-0DEE-4687-80D7-E74B520ACBB4");
static const pool::Guid p2_guid("9AD4889D-C8EB-4F3B-9920-D37FF092CAB6");
static const pool::Guid p1_guid("9998C282-403B-4EA5-A795-C8C9BA9909C3");
if (compareClassGuid(p3_guid)) {
// using unique_ptr ensures deletion of the persistent object
std::unique_ptr<EventStreamInfo_p3> esi_p3(poolReadObject<EventStreamInfo_p3>());
......
Event/EventAthenaPool/src/MergedEventInfoCnv.cxx
+ 10
− 10
View file @ 6fa12afe
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
/**
......@@ -12,29 +12,29 @@
MergedEventInfo_PERS* MergedEventInfoCnv::createPersistent(MergedEventInfo* transObj) {
MsgStream log(msgSvc(), "MergedEventInfoConverter" );
static MergedEventInfoCnv_p2 TPconv;
MergedEventInfo_PERS *persObj = TPconv.createPersistent( transObj, log );
static const MergedEventInfoCnv_p2 TPconv;
MergedEventInfo_PERS *persObj = TPconv.createPersistentConst( transObj, log );
//log << MSG::DEBUG << "Success" << endmsg;
return persObj;
}
MergedEventInfo* MergedEventInfoCnv::createTransient() {
static pool::Guid p2_guid("5B0C1A92-6836-4B3C-9EE6-5E69792A28B5");
static pool::Guid p1_guid("9540DED6-51E8-48A3-8F86-05CB1D9CC812");
static pool::Guid p0_guid("FA93B80D-82C7-4096-8A04-62885A679A6F");
static const pool::Guid p2_guid("5B0C1A92-6836-4B3C-9EE6-5E69792A28B5");
static const pool::Guid p1_guid("9540DED6-51E8-48A3-8F86-05CB1D9CC812");
static const pool::Guid p0_guid("FA93B80D-82C7-4096-8A04-62885A679A6F");
if( compareClassGuid(p2_guid) ) {
std::unique_ptr< MergedEventInfo_p2 > col_vect( poolReadObject< MergedEventInfo_p2 >() );
MsgStream log(msgSvc(), "MergedEventInfoConverter" );
//log << MSG::DEBUG << "Reading MergedEventInfo_p2" << endmsg;
static MergedEventInfoCnv_p2 TPconverter;
return TPconverter.createTransient( col_vect.get(), log );
static const MergedEventInfoCnv_p2 TPconverter;
return TPconverter.createTransientConst( col_vect.get(), log );
} else
if( compareClassGuid(p1_guid) ) {
std::unique_ptr< MergedEventInfo_p1 > col_vect( poolReadObject< MergedEventInfo_p1 >() );
MsgStream log(msgSvc(), "MergedEventInfoConverter" );
//log << MSG::DEBUG << "Reading MergedEventInfo_p1" << endmsg;
static MergedEventInfoCnv_p1 TPconverter;
return TPconverter.createTransient( col_vect.get(), log );
static const MergedEventInfoCnv_p1 TPconverter;
return TPconverter.createTransientConst( col_vect.get(), log );
}
else if( compareClassGuid(p0_guid) ) {
// regular object from before TP separation, just return it
......
Event/EventAthenaPool/src/MergedEventInfoCnv.h
+ 1
− 1
View file @ 6fa12afe
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
/**
......
Event/EventAthenaPool/src/PileUpEventInfoCnv.cxx
+ 19
− 19
View file @ 6fa12afe
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
/**
......@@ -13,58 +13,58 @@
PileUpEventInfo_PERS* PileUpEventInfoCnv::createPersistent(PileUpEventInfo* transObj) {
MsgStream log(msgSvc(), "PileUpEventInfoConverter" );
static PileUpEventInfoCnv_p5 TPconverter;
PileUpEventInfo_PERS *persObj = TPconverter.createPersistent( transObj, log );
static const PileUpEventInfoCnv_p5 TPconverter;
PileUpEventInfo_PERS *persObj = TPconverter.createPersistentConst( transObj, log );
//log << MSG::DEBUG << "Success" << endmsg;
return persObj;
}
PileUpEventInfo* PileUpEventInfoCnv::createTransient() {
static pool::Guid p5_guid("F53A1735-F61A-4CA4-B25F-DB0E277E2DDC");
static pool::Guid p4_guid("7D72CE05-E814-4A70-B3B2-B54B05069103");
static pool::Guid p3_guid("32A54198-BCDF-0AB5-DC0B-542CAE9866C2");
static pool::Guid p2_guid("C2A54FC3-759C-4F01-AF7E-668D9198E10F");
static pool::Guid p1_guid("1A399605-8E31-4150-B766-2049FD689485");
static pool::Guid p0_guid("6A58157B-6B6E-430F-A72A-EAAA4BDC4AE2");
static const pool::Guid p5_guid("F53A1735-F61A-4CA4-B25F-DB0E277E2DDC");
static const pool::Guid p4_guid("7D72CE05-E814-4A70-B3B2-B54B05069103");
static const pool::Guid p3_guid("32A54198-BCDF-0AB5-DC0B-542CAE9866C2");
static const pool::Guid p2_guid("C2A54FC3-759C-4F01-AF7E-668D9198E10F");
static const pool::Guid p1_guid("1A399605-8E31-4150-B766-2049FD689485");
static const pool::Guid p0_guid("6A58157B-6B6E-430F-A72A-EAAA4BDC4AE2");
if( compareClassGuid(p5_guid) ) {
// using unique_ptr ensures deletion of the persistent object
std::unique_ptr< PileUpEventInfo_p5 > col_vect( poolReadObject< PileUpEventInfo_p5 >() );
MsgStream log(msgSvc(), "PileUpEventInfoConverter" );
//log << MSG::DEBUG << "Reading PileUpEventInfo_p5" << endmsg;
static PileUpEventInfoCnv_p5 TPconverter;
return TPconverter.createTransient( col_vect.get(), log );
static const PileUpEventInfoCnv_p5 TPconverter;
return TPconverter.createTransientConst( col_vect.get(), log );
}
else if( compareClassGuid(p4_guid) ) {
// using unique_ptr ensures deletion of the persistent object
std::unique_ptr< PileUpEventInfo_p4 > col_vect( poolReadObject< PileUpEventInfo_p4 >() );
MsgStream log(msgSvc(), "PileUpEventInfoConverter" );
//log << MSG::DEBUG << "Reading PileUpEventInfo_p4" << endmsg;
static PileUpEventInfoCnv_p4 TPconverter;
return TPconverter.createTransient( col_vect.get(), log );
static const PileUpEventInfoCnv_p4 TPconverter;
return TPconverter.createTransientConst( col_vect.get(), log );
}
if( compareClassGuid(p3_guid) ) {
// using unique_ptr ensures deletion of the persistent object
std::unique_ptr< PileUpEventInfo_p3 > col_vect( poolReadObject< PileUpEventInfo_p3 >() );
MsgStream log(msgSvc(), "PileUpEventInfoConverter" );
//log << MSG::DEBUG << "Reading PileUpEventInfo_p3" << endmsg;
static PileUpEventInfoCnv_p3 TPconverter;
return TPconverter.createTransient( col_vect.get(), log );
static const PileUpEventInfoCnv_p3 TPconverter;
return TPconverter.createTransientConst( col_vect.get(), log );
}
else if( compareClassGuid(p2_guid) ) {
// using unique_ptr ensures deletion of the persistent object
std::unique_ptr< PileUpEventInfo_p2 > col_vect( poolReadObject< PileUpEventInfo_p2 >() );
MsgStream log(msgSvc(), "PileUpEventInfoConverter" );
//log << MSG::DEBUG << "Reading PileUpEventInfo_p2" << endmsg;
static PileUpEventInfoCnv_p2 TPconverter;
return TPconverter.createTransient( col_vect.get(), log );
static const PileUpEventInfoCnv_p2 TPconverter;
return TPconverter.createTransientConst( col_vect.get(), log );
}
else if( compareClassGuid(p1_guid) ) {
// using unique_ptr ensures deletion of the persistent object
std::unique_ptr< PileUpEventInfo_p1 > col_vect( poolReadObject< PileUpEventInfo_p1 >() );
MsgStream log(msgSvc(), "PileUpEventInfoConverter" );
//log << MSG::DEBUG << "Reading PileUpEventInfo_p1" << endmsg;
static PileUpEventInfoCnv_p1 TPconverter;
return TPconverter.createTransient( col_vect.get(), log );
static const PileUpEventInfoCnv_p1 TPconverter;
return TPconverter.createTransientConst( col_vect.get(), log );
}
else if( compareClassGuid(p0_guid) ) {
// regular object from before TP separation, just return it
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment