#1111: active: make allow-mpi calls tigher in blocks

DARMA-tasking · Nov 3, 2020 · aff8bfa · aff8bfa
1 parent e129574
commit aff8bfa
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/vt/messaging/active.cc b/src/vt/messaging/active.cc
@@ -563,7 +563,6 @@ std::tuple<EventType, int> ActiveMessenger::sendDataMPI(
       std::min(static_cast<std::size_t>(remainder), max_per_send)
     );
     {
-      VT_ALLOW_MPI_CALLS;
       #if vt_check_enabled(trace_enabled)
         double tr_begin = 0;
         if (theConfig()->vt_trace_mpi) {
@@ -578,6 +577,7 @@ std::tuple<EventType, int> ActiveMessenger::sendDataMPI(
         remainder, dest, tag, num_sends, subsize, std::get<1>(payload)
       );
 
+      VT_ALLOW_MPI_CALLS;
       int const ret = MPI_Isend(
         ptr, subsize, MPI_BYTE, dest, tag, theContext()->getComm(),
         mpi_event->getRequest()
@@ -1088,15 +1088,14 @@ bool ActiveMessenger::tryProcessIncomingActiveMsg() {
     MPI_Request req;
 
     {
-      VT_ALLOW_MPI_CALLS;
-
       #if vt_check_enabled(trace_enabled)
         double tr_begin = 0;
         if (theConfig()->vt_trace_mpi) {
           tr_begin = vt::timing::Timing::getCurrentTime();
         }
       #endif
 
+      VT_ALLOW_MPI_CALLS;
       MPI_Irecv(
         buf, num_probe_bytes, MPI_BYTE, sender, stat.MPI_TAG,
         theContext()->getComm(), &req