From e4beb9f29675ad7f6ec3c6d34d6a7f03d3c38880 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <fwinkl@cern>
Date: Mon, 3 Aug 2020 12:10:49 +0200
Subject: [PATCH] ITrigEventLoopMgr: add prepareForStart method
Add a new `ITrigEventLoopMgr::prepareForStart` method to the
`HltEventLoopMgr` that is being called by the `Psc` before calling the
start method of the `ApplicationMgr`. This will allow the EventLoopMgr to
setup anything that may be required during `start` (e.g. setting up
a partial EventContext, ATR-21331).
---
.../TrigKernel/TrigKernel/ITrigEventLoopMgr.h | 7 +-
HLT/Trigger/TrigControl/TrigPSC/src/Psc.cxx | 12 +--
.../TrigServices/src/HltEventLoopMgr.cxx | 81 +++++++++----------
.../TrigServices/src/HltEventLoopMgr.h | 7 +-
4 files changed, 56 insertions(+), 51 deletions(-)
diff --git a/HLT/Trigger/TrigControl/TrigKernel/TrigKernel/ITrigEventLoopMgr.h b/HLT/Trigger/TrigControl/TrigKernel/TrigKernel/ITrigEventLoopMgr.h
index 6a98c51ae21..d51d7cfaac1 100644
--- a/HLT/Trigger/TrigControl/TrigKernel/TrigKernel/ITrigEventLoopMgr.h
+++ b/HLT/Trigger/TrigControl/TrigKernel/TrigKernel/ITrigEventLoopMgr.h
@@ -22,7 +22,12 @@ public:
DeclareInterfaceID(ITrigEventLoopMgr, 21, 0);
/**
- * prepareForRun method invoked by framework
+ * invoked py the PSC before calling start() on all components
+ */
+ virtual StatusCode prepareForStart (const boost::property_tree::ptree &) = 0;
+
+ /**
+ * invoked by the PSC before event loop (before forking)
*/
virtual StatusCode prepareForRun ATLAS_NOT_THREAD_SAFE (const boost::property_tree::ptree &) = 0;
diff --git a/HLT/Trigger/TrigControl/TrigPSC/src/Psc.cxx b/HLT/Trigger/TrigControl/TrigPSC/src/Psc.cxx
index 034e6ca0d8e..a7239413683 100644
--- a/HLT/Trigger/TrigControl/TrigPSC/src/Psc.cxx
+++ b/HLT/Trigger/TrigControl/TrigPSC/src/Psc.cxx
@@ -506,14 +506,18 @@ bool psc::Psc::prepareForRun (const ptree& args)
{
ERS_PSC_ERROR("Bad ptree path: \"" << e.path<ptree::path_type>().dump()
<< "\" - " << e.what())
-
return false;
}
catch(const ptree_bad_data & e)
{
ERS_PSC_ERROR("Bad ptree data: \"" << e.data<ptree::data_type>() << "\" - "
<< e.what())
+ return false;
+ }
+ // Initializations needed for start()
+ if(!callOnEventLoopMgr<ITrigEventLoopMgr>([&args](ITrigEventLoopMgr* mgr) {return mgr->prepareForStart(args);},
+ "prepareForStart").isSuccess()) {
return false;
}
@@ -539,9 +543,7 @@ bool psc::Psc::prepareForRun (const ptree& args)
}
return ret;
};
- if(!callOnEventLoopMgr<ITrigEventLoopMgr>(prep, "prepareForRun").isSuccess())
- {
- ERS_PSC_ERROR("Error preparing the EventLoopMgr");
+ if(!callOnEventLoopMgr<ITrigEventLoopMgr>(prep, "prepareForRun").isSuccess()) {
return false;
}
@@ -559,7 +561,6 @@ bool psc::Psc::stopRun (const ptree& /*args*/)
if(!callOnEventLoopMgr<IService>(&IService::sysStop, "sysStop").isSuccess())
{
- ERS_PSC_ERROR("Error stopping the EventLoopManager");
return false;
}
@@ -737,7 +738,6 @@ bool psc::Psc::prepareWorker (const boost::property_tree::ptree& args)
{return mgr->hltUpdateAfterFork(args);};
if(!callOnEventLoopMgr<ITrigEventLoopMgr>(upd, "hltUpdateAfterFork").isSuccess())
{
- ERS_PSC_ERROR("Error updating EventLoopMgr after fork");
return false;
}
diff --git a/HLT/Trigger/TrigControl/TrigServices/src/HltEventLoopMgr.cxx b/HLT/Trigger/TrigControl/TrigServices/src/HltEventLoopMgr.cxx
index 25c9f2392f0..50c589da8c7 100644
--- a/HLT/Trigger/TrigControl/TrigServices/src/HltEventLoopMgr.cxx
+++ b/HLT/Trigger/TrigControl/TrigServices/src/HltEventLoopMgr.cxx
@@ -264,6 +264,43 @@ StatusCode HltEventLoopMgr::finalize()
return StatusCode::SUCCESS;
}
+// =============================================================================
+// Implementation of ITrigEventLoopMgr::prepareForStart
+// =============================================================================
+StatusCode HltEventLoopMgr::prepareForStart(const ptree& pt)
+{
+ try {
+ const auto& rparams = pt.get_child("RunParams");
+ m_sorHelper = std::make_unique<TrigSORFromPtreeHelper>(msgSvc(), m_detectorStore, m_sorPath, rparams);
+ }
+ catch(ptree_bad_path& e) {
+ ATH_MSG_ERROR("Bad ptree path: \"" << e.path<ptree::path_type>().dump() << "\" - " << e.what());
+ return StatusCode::FAILURE;
+ }
+
+ // Override run/timestamp if needed
+ if (m_forceRunNumber > 0) {
+ m_sorHelper->setRunNumber(m_forceRunNumber);
+ ATH_MSG_WARNING("Run number overwrite:" << m_forceRunNumber);
+ }
+ if (m_forceSOR_ns > 0) {
+ m_sorHelper->setSORtime_ns(m_forceSOR_ns);
+ ATH_MSG_WARNING("SOR time overwrite:" << m_forceSOR_ns);
+ }
+
+ // Set our "run context" (invalid event/slot)
+ m_currentRunCtx.setEventID( m_sorHelper->eventID() );
+ m_currentRunCtx.setExtension(Atlas::ExtendedEventContext(m_evtStore->hiveProxyDict(),
+ m_currentRunCtx.eventID().run_number()));
+
+ // Some algorithms expect a valid context during start()
+ ATH_MSG_DEBUG("Setting context for start transition: " << m_currentRunCtx.eventID());
+ Gaudi::Hive::setCurrentContext(m_currentRunCtx);
+
+ return StatusCode::SUCCESS;
+}
+
+
// =============================================================================
// Implementation of ITrigEventLoopMgr::prepareForRun
// =============================================================================
@@ -276,9 +313,9 @@ StatusCode HltEventLoopMgr::prepareForRun(const ptree& pt)
// (void)TClass::GetClass("vector<unsigned short>"); // preload to overcome an issue with dangling references in serialization
// (void)TClass::GetClass("vector<unsigned long>");
- ATH_CHECK(clearTemporaryStores()); // do the necessary resets
- ATH_CHECK( processRunParams(pt) ); // update SOR in det store
- ATH_CHECK( updateMagField(pt) ); // update magnetic field
+ ATH_CHECK( clearTemporaryStores() ); // do the necessary resets
+ ATH_CHECK( m_sorHelper->fillSOR(m_currentRunCtx) ); // update SOR in det store
+ ATH_CHECK( updateMagField(pt) ); // update magnetic field
auto& soral = getSorAttrList();
@@ -306,14 +343,6 @@ StatusCode HltEventLoopMgr::prepareForRun(const ptree& pt)
ATH_MSG_VERBOSE("end of " << __FUNCTION__);
return StatusCode::SUCCESS;
}
- catch(const ptree_bad_path & e)
- {
- ATH_MSG_ERROR("Bad ptree path: \"" << e.path<ptree::path_type>().dump() << "\" - " << e.what());
- }
- catch(const ptree_bad_data & e)
- {
- ATH_MSG_ERROR("Bad ptree data: \"" << e.data<ptree::data_type>() << "\" - " << e.what());
- }
catch(const std::runtime_error& e)
{
ATH_MSG_ERROR("Runtime error: " << e.what());
@@ -734,36 +763,6 @@ void HltEventLoopMgr::updateDFProps()
if (!wpid.empty()) m_workerPID = std::stoi(wpid);
}
-// =============================================================================
-StatusCode HltEventLoopMgr::processRunParams(const ptree & pt)
-{
- ATH_MSG_VERBOSE("start of " << __FUNCTION__);
-
- const auto& rparams = pt.get_child("RunParams");
- TrigSORFromPtreeHelper sorhelp(msgSvc(), m_detectorStore, m_sorPath, rparams);
-
- // Override run/timestamp if needed
- if (m_forceRunNumber > 0) {
- sorhelp.setRunNumber(m_forceRunNumber);
- ATH_MSG_WARNING("Run number overwrite:" << m_forceRunNumber);
- }
- if (m_forceSOR_ns > 0) {
- sorhelp.setSORtime_ns(m_forceSOR_ns);
- ATH_MSG_WARNING("SOR time overwrite:" << m_forceSOR_ns);
- }
-
- // Set our "run context" (invalid event/slot)
- m_currentRunCtx.setEventID( sorhelp.eventID() );
- m_currentRunCtx.setExtension(Atlas::ExtendedEventContext(m_evtStore->hiveProxyDict(),
- m_currentRunCtx.eventID().run_number()));
-
- // Fill SOR parameters from ptree and inform IOVDbSvc
- ATH_CHECK( sorhelp.fillSOR(m_currentRunCtx) );
-
- ATH_MSG_VERBOSE("end of " << __FUNCTION__);
- return StatusCode::SUCCESS;
-}
-
// =============================================================================
void HltEventLoopMgr::updateInternal(const coral::AttributeList & sor_attrlist)
{
diff --git a/HLT/Trigger/TrigControl/TrigServices/src/HltEventLoopMgr.h b/HLT/Trigger/TrigControl/TrigServices/src/HltEventLoopMgr.h
index 7c1703c343b..6a6360f476e 100644
--- a/HLT/Trigger/TrigControl/TrigServices/src/HltEventLoopMgr.h
+++ b/HLT/Trigger/TrigControl/TrigServices/src/HltEventLoopMgr.h
@@ -49,6 +49,7 @@ class IJobOptionsSvc;
class IScheduler;
class StoreGateSvc;
class TrigCOOLUpdateHelper;
+class TrigSORFromPtreeHelper;
class IIoComponentMgr;
namespace coral {
@@ -81,6 +82,7 @@ public:
/// @name State transitions of ITrigEventLoopMgr interface
///@{
+ virtual StatusCode prepareForStart (const boost::property_tree::ptree &) override;
virtual StatusCode prepareForRun ATLAS_NOT_THREAD_SAFE (const boost::property_tree::ptree& pt) override;
virtual StatusCode hltUpdateAfterFork(const boost::property_tree::ptree& pt) override;
///@}
@@ -123,9 +125,6 @@ private:
/// Read DataFlow configuration properties
void updateDFProps();
- /// Do whatever is necessary with RunParams (prepare) ptree
- StatusCode processRunParams(const boost::property_tree::ptree& pt);
-
// Update internally kept data from new sor
void updateInternal(const coral::AttributeList & sor_attrlist);
@@ -191,6 +190,8 @@ private:
SmartIF<IAlgExecStateSvc> m_aess;
SmartIF<IScheduler> m_schedulerSvc;
+ std::unique_ptr<TrigSORFromPtreeHelper> m_sorHelper;
+
// ------------------------- Other properties --------------------------------------
Gaudi::Property<std::string> m_schedulerName{
this, "SchedulerSvc", "AvalancheSchedulerSvc", "Name of the scheduler"};
--
GitLab