Modernize simcall mutex_lock.

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

diff --git a/src/s4u/s4u_Mutex.cpp b/src/s4u/s4u_Mutex.cpp
index f9bc892..8975cb7 100644 (file)
--- a/src/s4u/s4u_Mutex.cpp
+++ b/src/s4u/s4u_Mutex.cpp
@@ -1,18 +1,29 @@
-/* Copyright (c) 2006-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2006-2021. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
+#include "simgrid/forward.h"
+#include "simgrid/mutex.h"
 #include "simgrid/s4u/Mutex.hpp"
 #include "src/kernel/activity/MutexImpl.hpp"
+#include "src/mc/checker/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();
+  mc::MutexLockSimcall observer{issuer, pimpl_};
+  kernel::actor::simcall_blocking<void>([&observer] { observer.get_mutex()->lock(observer.get_issuer()); }, &observer);
 }
 
 /** @brief Release the ownership of the mutex, unleashing a blocked actor (if any)
@@ -21,35 +32,72 @@ void Mutex::lock()
  */
 void Mutex::unlock()
 {
-  simcall_mutex_unlock(pimpl_);
+  kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
+  mc::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();
+  mc::MutexTrylockSimcall observer{issuer, pimpl_};
+  return kernel::actor::simcall([&observer] { return observer.get_mutex()->try_lock(observer.get_issuer()); },
+                                &observer);
 }
 
 /** @brief Create a new mutex
  *
  * See @ref s4u_raii.
  */
-MutexPtr Mutex::createMutex()
+MutexPtr Mutex::create()
 {
-  smx_mutex_t mutex = simcall_mutex_init();
+  auto* mutex = new kernel::activity::MutexImpl();
   return MutexPtr(&mutex->mutex(), false);
 }
 
 /* refcounting of the intrusive_ptr is delegated to the implementation object */
-void intrusive_ptr_add_ref(Mutex* mutex)
+void intrusive_ptr_add_ref(const Mutex* mutex)
 {
   xbt_assert(mutex);
-  SIMIX_mutex_ref(mutex->pimpl_);
+  if (mutex->pimpl_)
+    mutex->pimpl_->ref();
 }
-void intrusive_ptr_release(Mutex* mutex)
+void intrusive_ptr_release(const Mutex* mutex)
 {
   xbt_assert(mutex);
-  SIMIX_mutex_unref(mutex->pimpl_);
+  if (mutex->pimpl_)
+    mutex->pimpl_->unref();
 }
+
 } // namespace s4u
 } // namespace simgrid
+
+/* **************************** 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);
+}
+
+void sg_mutex_lock(sg_mutex_t mutex)
+{
+  mutex->lock();
+}
+
+void sg_mutex_unlock(sg_mutex_t mutex)
+{
+  mutex->unlock();
+}
+
+int sg_mutex_try_lock(sg_mutex_t mutex)
+{
+  return mutex->try_lock();
+}
+
+void sg_mutex_destroy(const_sg_mutex_t mutex)
+{
+  delete mutex;
+}