Actually we can have locks and fences (erk) in the same program.

diff --git a/src/smpi/smpi_win.cpp b/src/smpi/smpi_win.cpp
index 28f399f..184b89e 100644 (file)
--- a/src/smpi/smpi_win.cpp
+++ b/src/smpi/smpi_win.cpp
@@ -559,9 +559,6 @@ int Win::wait(){
 }
 
 int Win::lock(int lock_type, int rank, int assert){
 }
 
 int Win::lock(int lock_type, int rank, int assert){

-  if(opened_!=0)
-    return MPI_ERR_WIN;
-

   MPI_Win target_win = connected_wins_[rank];
 
   if ((lock_type == MPI_LOCK_EXCLUSIVE && target_win->mode_ != MPI_LOCK_SHARED)|| target_win->mode_ == MPI_LOCK_EXCLUSIVE){
   MPI_Win target_win = connected_wins_[rank];
 
   if ((lock_type == MPI_LOCK_EXCLUSIVE && target_win->mode_ != MPI_LOCK_SHARED)|| target_win->mode_ == MPI_LOCK_EXCLUSIVE){


@@ -593,9 +590,6 @@ int Win::lock_all(int assert){
 }
 
 int Win::unlock(int rank){
 }
 
 int Win::unlock(int rank){

-  if(opened_!=0)
-    return MPI_ERR_WIN;
-

   MPI_Win target_win = connected_wins_[rank];
   int target_mode = target_win->mode_;
   target_win->mode_= 0;
   MPI_Win target_win = connected_wins_[rank];
   int target_mode = target_win->mode_;
   target_win->mode_= 0;