X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/39c935d6d5ee86d153f6f7e6a10d723ae7c57f6f..fa87b694ef63aa4f3193029f4705cc3d96492f04:/src/s4u/s4u_Mutex.cpp

diff --git a/src/s4u/s4u_Mutex.cpp b/src/s4u/s4u_Mutex.cpp
index 2bec1c841d..832c8fb9f1 100644
--- a/src/s4u/s4u_Mutex.cpp
+++ b/src/s4u/s4u_Mutex.cpp
@@ -7,20 +7,17 @@
 #include "simgrid/mutex.h"
 #include "simgrid/s4u/Mutex.hpp"
 #include "src/kernel/activity/MutexImpl.hpp"
+#include "src/kernel/actor/SimcallObserver.hpp"
 
 namespace simgrid {
 namespace s4u {
 
-Mutex::~Mutex()
-{
-  if (pimpl_ != nullptr)
-    pimpl_->unref();
-}
-
 /** @brief Blocks the calling actor until the mutex can be obtained */
 void Mutex::lock()
 {
-  simcall_mutex_lock(pimpl_);
+  kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
+  kernel::actor::MutexLockSimcall observer{issuer, pimpl_};
+  kernel::actor::simcall_blocking([&observer] { observer.get_mutex()->lock(observer.get_issuer()); }, &observer);
 }
 
 /** @brief Release the ownership of the mutex, unleashing a blocked actor (if any)
@@ -29,13 +26,18 @@ void Mutex::lock()
  */
 void Mutex::unlock()
 {
-  simcall_mutex_unlock(pimpl_);
+  kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
+  kernel::actor::MutexUnlockSimcall observer{issuer};
+  kernel::actor::simcall([this, issuer] { this->pimpl_->unlock(issuer); }, &observer);
 }
 
 /** @brief Acquire the mutex if it's free, and return false (without blocking) if not */
 bool Mutex::try_lock()
 {
-  return simcall_mutex_trylock(pimpl_);
+  kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
+  kernel::actor::MutexLockSimcall observer{issuer, pimpl_, false};
+  return kernel::actor::simcall([&observer] { return observer.get_mutex()->try_lock(observer.get_issuer()); },
+                                &observer);
 }
 
 /** @brief Create a new mutex
@@ -44,7 +46,7 @@ bool Mutex::try_lock()
  */
 MutexPtr Mutex::create()
 {
-  kernel::activity::MutexImpl* mutex = kernel::actor::simcall([] { return new kernel::activity::MutexImpl(); });
+  auto* mutex = new kernel::activity::MutexImpl();
   return MutexPtr(&mutex->mutex(), false);
 }
 
@@ -52,14 +54,12 @@ MutexPtr Mutex::create()
 void intrusive_ptr_add_ref(const Mutex* mutex)
 {
   xbt_assert(mutex);
-  if (mutex->pimpl_)
-    mutex->pimpl_->ref();
+  mutex->pimpl_->ref();
 }
 void intrusive_ptr_release(const Mutex* mutex)
 {
   xbt_assert(mutex);
-  if (mutex->pimpl_)
-    mutex->pimpl_->unref();
+  mutex->pimpl_->unref();
 }
 
 } // namespace s4u
@@ -68,10 +68,7 @@ void intrusive_ptr_release(const Mutex* mutex)
 /* **************************** Public C interface *************************** */
 sg_mutex_t sg_mutex_init()
 {
-  simgrid::kernel::activity::MutexImpl* mutex =
-      simgrid::kernel::actor::simcall([] { return new simgrid::kernel::activity::MutexImpl(); });
-
-  return new simgrid::s4u::Mutex(mutex);
+  return simgrid::s4u::Mutex::create().detach();
 }
 
 void sg_mutex_lock(sg_mutex_t mutex)
@@ -91,5 +88,5 @@ int sg_mutex_try_lock(sg_mutex_t mutex)
 
 void sg_mutex_destroy(const_sg_mutex_t mutex)
 {
-  delete mutex;
+  intrusive_ptr_release(mutex);
 }