From 5edec65e26d76490b9753d8db950a8a2ddf3cb2c Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@ens-rennes.fr>
Date: Mon, 13 Nov 2023 22:08:30 +0100
Subject: [PATCH] another try at cleanly unlocking the mutexes before
 destroying them in SMPI::RMA

---
 src/smpi/mpi/smpi_win.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/smpi/mpi/smpi_win.cpp b/src/smpi/mpi/smpi_win.cpp
index b6d1f34e1e..af63fe62d0 100644
--- a/src/smpi/mpi/smpi_win.cpp
+++ b/src/smpi/mpi/smpi_win.cpp
@@ -97,8 +97,9 @@ int Win::del(Win* win){
   }
   if (win->allocated_)
     xbt_free(win->base_);
-  if (win->mut_->get_owner() != nullptr)
-    win->mut_->unlock();
+  for (auto m : {win->mut_, win->lock_mut_, win->atomic_mut_})
+    if (m->get_owner() != nullptr)
+      m->unlock();
 
   F2C::free_f(win->f2c_id());
   win->cleanup_attr<Win>();
-- 
2.20.1