From 6438371503170f306dec511c67e09085eac4e3c1 Mon Sep 17 00:00:00 2001 From: Sean McGovern Date: Tue, 15 Nov 2022 23:50:40 +0000 Subject: [PATCH] #1938: change trace's beginProcessing interface and uses --- src/vt/parameterization/parameterization.h | 2 +- src/vt/rdma/state/rdma_state.cc | 4 ++-- src/vt/runnable/invoke.h | 2 +- src/vt/trace/trace.cc | 6 +++--- src/vt/trace/trace.h | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/vt/parameterization/parameterization.h b/src/vt/parameterization/parameterization.h index eb0fa73191..2369a85037 100644 --- a/src/vt/parameterization/parameterization.h +++ b/src/vt/parameterization/parameterization.h @@ -107,7 +107,7 @@ static void dataMessageHandler(DataMsg* msg) { NodeType const& from_node = theContext()->getFromNodeCurrentTask(); processing_tag = - theTrace()->beginProcessing(ep, msg_size, event, from_node); + theTrace()->beginProcessing(ep, msg_size, event, from_node, timing::getCurrentTime()); } #endif diff --git a/src/vt/rdma/state/rdma_state.cc b/src/vt/rdma/state/rdma_state.cc index 72f39b226b..078b0791b3 100644 --- a/src/vt/rdma/state/rdma_state.cc +++ b/src/vt/rdma/state/rdma_state.cc @@ -261,7 +261,7 @@ void State::getData( size_t msg_size = info.num_bytes; processing_tag = - theTrace()->beginProcessing(trace_id, msg_size, event, from_node); + theTrace()->beginProcessing(trace_id, msg_size, event, from_node, timing::getCurrentTime()); } #endif @@ -328,7 +328,7 @@ void State::putData( size_t msg_size = info.num_bytes; processing_tag = - theTrace()->beginProcessing(trace_id, msg_size, event, from_node); + theTrace()->beginProcessing(trace_id, msg_size, event, from_node, timing::getCurrentTime()); } #endif diff --git a/src/vt/runnable/invoke.h b/src/vt/runnable/invoke.h index 7e494ab1d5..1058066807 100644 --- a/src/vt/runnable/invoke.h +++ b/src/vt/runnable/invoke.h @@ -140,7 +140,7 @@ static trace::TraceProcessingTag BeginProcessingInvokeEvent() { const auto trace_event = theTrace()->messageCreation(trace_id, 0); const auto from_node = theContext()->getNode(); - return theTrace()->beginProcessing(trace_id, 0, trace_event, from_node); + return theTrace()->beginProcessing(trace_id, 0, trace_event, from_node, timing::getCurrentTime()); } template diff --git a/src/vt/trace/trace.cc b/src/vt/trace/trace.cc index dd1f3a7dff..29c9ea7bd1 100644 --- a/src/vt/trace/trace.cc +++ b/src/vt/trace/trace.cc @@ -335,9 +335,9 @@ void Trace::addMemoryEvent(std::size_t memory, double time) { TraceProcessingTag Trace::beginProcessing( TraceEntryIDType const ep, TraceMsgLenType const len, TraceEventIDType const event, NodeType const from_node, + TimeType const time, uint64_t const idx1, uint64_t const idx2, - uint64_t const idx3, uint64_t const idx4, - double const time + uint64_t const idx3, uint64_t const idx4 ) { if (not checkDynamicRuntimeEnabled()) { return TraceProcessingTag{}; @@ -449,7 +449,7 @@ void Trace::endSchedulerLoop() { // Start an event representing time outside of top-level scheduler. if (event_holds_.size() == 1) { between_sched_event_ = beginProcessing( - between_sched_event_type_, 0, trace::no_trace_event, 0 + between_sched_event_type_, 0, trace::no_trace_event, 0, timing::getCurrentTime() ); } } diff --git a/src/vt/trace/trace.h b/src/vt/trace/trace.h index e41fe2050f..af7c203cca 100644 --- a/src/vt/trace/trace.h +++ b/src/vt/trace/trace.h @@ -147,9 +147,9 @@ struct Trace : runtime::component::Component, TraceLite { TraceProcessingTag beginProcessing( TraceEntryIDType const ep, TraceMsgLenType const len, TraceEventIDType const event, NodeType const from_node, + TimeType const time, uint64_t const idx1 = 0, uint64_t const idx2 = 0, - uint64_t const idx3 = 0, uint64_t const idx4 = 0, - double const time = getCurrentTime() + uint64_t const idx3 = 0, uint64_t const idx4 = 0 ); /**