#1111: rdma: remove exception for Win_lock, guard code

DARMA-tasking · Oct 20, 2020 · db4dc1f · db4dc1f
1 parent b107c97
commit db4dc1f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/vt/pmpi/generate_mpi_wrappers.pl b/src/vt/pmpi/generate_mpi_wrappers.pl
@@ -127,7 +127,6 @@ sub extract_defs {
     MPI_Comm_rank
     MPI_Comm_size
     MPI_Get_.*(?<!accumulate)
-    MPI_Win_(lock|unlock)
 );
 
 sub should_guard_call {

diff --git a/src/vt/rdmahandle/lock_mpi.h b/src/vt/rdmahandle/lock_mpi.h
@@ -46,6 +46,7 @@
 #define INCLUDED_VT_RDMAHANDLE_LOCK_MPI_H
 
 #include "vt/config.h"
+#include "vt/runtime/mpi_access.h"
 
 namespace vt { namespace rdma {
 
@@ -63,6 +64,7 @@ struct LockMPI {
   {
     if (l_ != Lock::None) {
       auto lock_type = l_ == Lock::Exclusive ? MPI_LOCK_EXCLUSIVE : MPI_LOCK_SHARED;
+      VT_ALLOW_MPI_CALLS;
       MPI_Win_lock(lock_type, rank_, 0, window_);
     }
   }
@@ -71,6 +73,7 @@ struct LockMPI {
 
   ~LockMPI() {
     if (l_ != Lock::None) {
+      VT_ALLOW_MPI_CALLS;
       MPI_Win_unlock(rank_, window_);
     }
   }