Skip to content

Commit

Permalink
#1938: change trace's beginProcessing interface and uses
Browse files Browse the repository at this point in the history
  • Loading branch information
stmcgovern committed Nov 17, 2022
1 parent bd65fa9 commit 6438371
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion src/vt/parameterization/parameterization.h
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ static void dataMessageHandler(DataMsg<Tuple>* 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

Expand Down
4 changes: 2 additions & 2 deletions src/vt/rdma/state/rdma_state.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/vt/runnable/invoke.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 <typename Callable, Callable f, typename... Args>
Expand Down
6 changes: 3 additions & 3 deletions src/vt/trace/trace.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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{};
Expand Down Expand Up @@ -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()
);
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/vt/trace/trace.h
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,9 @@ struct Trace : runtime::component::Component<Trace>, 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
);

/**
Expand Down

0 comments on commit 6438371

Please sign in to comment.