#774: active: move completed trace event to finish funcs

DARMA-tasking · Apr 17, 2020 · b5aadbf · b5aadbf
1 parent b8675a2
commit b5aadbf
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/src/vt/messaging/active.cc b/src/vt/messaging/active.cc
@@ -525,6 +525,13 @@ void ActiveMessenger::finishPendingDataMsgAsyncRecv(InProgressDataIRecv* irecv)
   auto dealloc_user_buf = irecv->dealloc_user_buf;
   auto next = irecv->next;
 
+# if backend_check_enabled(trace_enabled)
+  if (ArgType::vt_trace_mpi) {
+    auto tr_note = fmt::format("DM Irecv completed: from={}", irecv->sender);
+    trace::addUserNote(tr_note);
+  }
+# endif
+
   auto dealloc_buf = [=]{
     debug_print(
       active, node,
@@ -820,6 +827,13 @@ void ActiveMessenger::finishPendingActiveMsgAsyncRecv(InProgressIRecv* irecv) {
   auto num_probe_bytes = irecv->probe_bytes;
   auto sender = irecv->sender;
 
+# if backend_check_enabled(trace_enabled)
+  if (ArgType::vt_trace_mpi) {
+    auto tr_note = fmt::format("AM Irecv completed: from={}", irecv->sender);
+    trace::addUserNote(tr_note);
+  }
+# endif
+
   MessageType* msg = reinterpret_cast<MessageType*>(buf);
   messageConvertToShared(msg);
   auto base = promoteMsgOwner(msg);

diff --git a/src/vt/messaging/irecv_holder.h b/src/vt/messaging/irecv_holder.h
@@ -118,13 +118,6 @@ struct IRecvHolder {
         continue;
       }
 
-#     if backend_check_enabled(trace_enabled)
-      if (ArgType::vt_trace_mpi) {
-        auto tr_note = fmt::format("Irecv completed: from={}", stat.MPI_SOURCE);
-        trace::addUserNote(tr_note);
-      }
-#     endif
-
       c(&e);
       progress_made = true;
       e.valid = false;