From f5e3fb398a35702f82e740a2ba57e1bdca89a50e Mon Sep 17 00:00:00 2001 From: Nathan Brei Date: Tue, 30 Jul 2024 01:29:46 -0400 Subject: [PATCH] Remove extra ref to 'record_call_stack' from JTopologyBuilder --- src/libraries/JANA/Services/JComponentManager.cc | 5 ++++- src/libraries/JANA/Topology/JTopologyBuilder.cc | 3 --- src/libraries/JANA/Topology/JTopologyBuilder.h | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/libraries/JANA/Services/JComponentManager.cc b/src/libraries/JANA/Services/JComponentManager.cc index ba97d5e44..9499c2c59 100644 --- a/src/libraries/JANA/Services/JComponentManager.cc +++ b/src/libraries/JANA/Services/JComponentManager.cc @@ -41,7 +41,10 @@ void JComponentManager::Init() { void JComponentManager::configure_components() { m_params->SetDefaultParameter("event_source_type", m_user_evt_src_typename, "Manually specifies which JEventSource should open the input file"); - m_params->SetDefaultParameter("record_call_stack", m_enable_call_graph_recording, "Records a trace of who called each factory. Reduces performance but necessary for plugins such as janadot."); + m_params->SetDefaultParameter("record_call_stack", + m_enable_call_graph_recording, + "Records a trace of who called each factory. Reduces performance but necessary for plugins such as janadot.") + ->SetIsAdvanced(true); m_params->SetDefaultParameter("jana:nevents", m_nevents, "Max number of events that sources can emit"); m_params->SetDefaultParameter("jana:nskip", m_nskip, "Number of events that sources should skip before starting emitting"); m_params->SetDefaultParameter("autoactivate", m_autoactivate, "List of factories to activate regardless of what the event processors request. Format is typename:tag,typename:tag"); diff --git a/src/libraries/JANA/Topology/JTopologyBuilder.cc b/src/libraries/JANA/Topology/JTopologyBuilder.cc index 9d5ab66d3..ff685575a 100644 --- a/src/libraries/JANA/Topology/JTopologyBuilder.cc +++ b/src/libraries/JANA/Topology/JTopologyBuilder.cc @@ -153,9 +153,6 @@ void JTopologyBuilder::acquire_services(JServiceLocator *sl) { m_params->SetDefaultParameter("jana:locality", m_locality, "Constrain memory locality. 0=No constraint. 1=Events stay on the same socket. 2=Events stay on the same NUMA domain. 3=Events stay on same core. 4=Events stay on same cpu/hyperthread.") ->SetIsAdvanced(true); - m_params->SetDefaultParameter("record_call_stack", m_enable_call_graph_recording, - "Records a trace of who called each factory. Reduces performance but necessary for plugins such as janadot.") - ->SetIsAdvanced(true); m_arrow_logger = m_logging->get_logger("JArrow"); m_queue_logger = m_logging->get_logger("JQueue"); diff --git a/src/libraries/JANA/Topology/JTopologyBuilder.h b/src/libraries/JANA/Topology/JTopologyBuilder.h index 098a324e5..a287d4631 100644 --- a/src/libraries/JANA/Topology/JTopologyBuilder.h +++ b/src/libraries/JANA/Topology/JTopologyBuilder.h @@ -43,7 +43,6 @@ class JTopologyBuilder : public JService { size_t m_event_source_chunksize = 40; size_t m_event_processor_chunksize = 1; size_t m_location_count = 1; - bool m_enable_call_graph_recording = false; bool m_enable_stealing = false; bool m_limit_total_events_in_flight = true; int m_affinity = 0;