don't use old fashioned simcall when you don't have to

[simgrid.git] / src / s4u / s4u_Mutex.cpp

diff --git a/src/s4u/s4u_Mutex.cpp b/src/s4u/s4u_Mutex.cpp
index 88a271b..2f90b26 100644 (file)
--- a/src/s4u/s4u_Mutex.cpp
+++ b/src/s4u/s4u_Mutex.cpp
@@ -11,8 +11,10 @@ namespace s4u {
 
 Mutex::~Mutex()
 {
-  SIMIX_mutex_unref(pimpl_);
+  if (pimpl_ != nullptr)
+    pimpl_->unref();
 }
+
 /** @brief Blocks the calling actor until the mutex can be obtained */
 void Mutex::lock()
 {
@@ -40,7 +42,7 @@ bool Mutex::try_lock()
  */
 MutexPtr Mutex::create()
 {
-  smx_mutex_t mutex = simcall_mutex_init();
+  kernel::activity::MutexImpl* mutex = simix::simcall([] { return new kernel::activity::MutexImpl(); });
   return MutexPtr(&mutex->mutex(), false);
 }
 
@@ -48,12 +50,15 @@ MutexPtr Mutex::create()
 void intrusive_ptr_add_ref(Mutex* mutex)
 {
   xbt_assert(mutex);
-  SIMIX_mutex_ref(mutex->pimpl_);
+  if (mutex->pimpl_)
+    mutex->pimpl_->ref();
 }
 void intrusive_ptr_release(Mutex* mutex)
 {
   xbt_assert(mutex);
-  SIMIX_mutex_unref(mutex->pimpl_);
+  if (mutex->pimpl_)
+    mutex->pimpl_->unref();
 }
+
 } // namespace s4u
 } // namespace simgrid