From: Frederic Suter <frederic.suter@cc.in2p3.fr>
Date: Wed, 22 Mar 2017 09:30:45 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
X-Git-Tag: v3_15~13
X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/3aa62b6a4755ba871847a5f86473c0e651c9d661?hp=92b118819a99fbc7ccb31afd7e5fe9e6ec0c4d46

Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
---

diff --git a/src/smpi/smpi_bench.cpp b/src/smpi/smpi_bench.cpp
index 7329819c6b..412faf2755 100644
--- a/src/smpi/smpi_bench.cpp
+++ b/src/smpi/smpi_bench.cpp
@@ -416,7 +416,7 @@ unsigned long long smpi_rastro_timestamp ()
   smpi_bench_end();
   double now = SIMIX_get_clock();
 
-  unsigned long long sec = (unsigned long long)now;
+  unsigned long long sec = static_cast<unsigned long long>(now);
   unsigned long long pre = (now - sec) * smpi_rastro_resolution();
   smpi_bench_begin();
   return static_cast<unsigned long long>(sec) * smpi_rastro_resolution() + pre;
@@ -609,12 +609,12 @@ void *smpi_shared_malloc(size_t size, const char *file, int line)
       char* name                   = xbt_strdup("/tmp/simgrid-shmalloc-XXXXXX");
       smpi_shared_malloc_bogusfile = mkstemp(name);
       unlink(name);
-      free(name);
+      xbt_free(name);
       char* dumb = (char*)calloc(1, smpi_shared_malloc_blocksize);
       ssize_t err = write(smpi_shared_malloc_bogusfile, dumb, smpi_shared_malloc_blocksize);
       if(err<0)
         xbt_die("Could not write bogus file for shared malloc");
-      free(dumb);
+      xbt_free(dumb);
     }
 
     /* Map the bogus file in place of the anonymous memory */
diff --git a/src/smpi/smpi_win.cpp b/src/smpi/smpi_win.cpp
index 5f819980b1..f5e573dfb8 100644
--- a/src/smpi/smpi_win.cpp
+++ b/src/smpi/smpi_win.cpp
@@ -32,6 +32,7 @@ Win::Win(void *base, MPI_Aint size, int disp_unit, MPI_Info info, MPI_Comm comm)
   if(rank_==0){
     bar_ = MSG_barrier_init(comm_size);
   }
+  mode_=0;
 
   comm->add_rma_win(this);
 
@@ -436,40 +437,42 @@ int Win::wait(){
 }
 
 int Win::lock(int lock_type, int rank, int assert){
+  if(opened_!=0)
+    return MPI_ERR_WIN;
+
   MPI_Win target_win = connected_wins_[rank];
 
-  //window already locked, we have to wait
-  if (lock_type == MPI_LOCK_EXCLUSIVE){
-  XBT_DEBUG("Win_lock - Entering lock %d", rank);
+  if ((lock_type == MPI_LOCK_EXCLUSIVE && target_win->mode_ != MPI_LOCK_SHARED)|| target_win->mode_ == MPI_LOCK_EXCLUSIVE){
     xbt_mutex_acquire(target_win->lock_mut_);
-  XBT_DEBUG("Win_lock - Released from lock %d", rank);
-}
+    target_win->mode_+= lock_type;//add the lock_type to differentiate case when we are switching from EXCLUSIVE to SHARED (no release needed in the unlock)
+    if(lock_type == MPI_LOCK_SHARED){//the window used to be exclusive, it's now shared.
+      xbt_mutex_release(target_win->lock_mut_);
+   }
+  } else if(!(target_win->mode_==MPI_LOCK_SHARED && lock_type == MPI_LOCK_EXCLUSIVE))
+        target_win->mode_+= lock_type; // don't set to exclusive if it's already shared
 
-  xbt_mutex_acquire(target_win->mut_);
   target_win->lockers_.push_back(comm_->rank());
-  xbt_mutex_release(target_win->mut_);  
 
   int finished = finish_comms();
-  XBT_DEBUG("Win_lock - Finished %d RMA calls", finished);
+  XBT_DEBUG("Win_lock %d - Finished %d RMA calls", rank, finished);
 
   return MPI_SUCCESS;
 }
 
 int Win::unlock(int rank){
-  MPI_Win target_win = connected_wins_[rank];
+  if(opened_!=0)
+    return MPI_ERR_WIN;
 
-  xbt_mutex_acquire(target_win->mut_);
-  int size=target_win->lockers_.size();
+  MPI_Win target_win = connected_wins_[rank];
+  int target_mode = target_win->mode_;
+  target_win->mode_= 0;
   target_win->lockers_.remove(comm_->rank());
-
-
-  if (size<=1){//0 or 1 lockers -> exclusive assumed
-    xbt_mutex_try_acquire(target_win->lock_mut_);
+  if (target_mode==MPI_LOCK_EXCLUSIVE){
     xbt_mutex_release(target_win->lock_mut_);
   }
-  xbt_mutex_release(target_win->mut_);
+
   int finished = finish_comms();
-  XBT_DEBUG("Win_unlock - Finished %d RMA calls", finished);
+  XBT_DEBUG("Win_unlock %d - Finished %d RMA calls", rank, finished);
 
   return MPI_SUCCESS;
 }
diff --git a/src/smpi/smpi_win.hpp b/src/smpi/smpi_win.hpp
index fbf009dc90..f88eb4fc9b 100644
--- a/src/smpi/smpi_win.hpp
+++ b/src/smpi/smpi_win.hpp
@@ -33,6 +33,7 @@ class Win : public F2C, public Keyval {
   xbt_mutex_t lock_mut_;
   std::list<int> lockers_;
   int rank_; // to identify owner for barriers in MPI_COMM_WORLD
+  int mode_; // exclusive or shared lock
 
 public:
   static std::unordered_map<int, smpi_key_elem> keyvals_;