X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f23b0fb864cb60978c1fcfd48d50f62dd054fe31..e3771caa277bcafe6b67c9bfaf18ab8ee70001a7:/src/s4u/s4u_Mutex.cpp

diff --git a/src/s4u/s4u_Mutex.cpp b/src/s4u/s4u_Mutex.cpp
index f8ecb27df4..6494276c9a 100644
--- a/src/s4u/s4u_Mutex.cpp
+++ b/src/s4u/s4u_Mutex.cpp
@@ -1,14 +1,22 @@
-/* Copyright (c) 2006-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2006-2019. 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"
 
 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()
 {
@@ -36,7 +44,7 @@ bool Mutex::try_lock()
  */
 MutexPtr Mutex::create()
 {
-  smx_mutex_t mutex = simcall_mutex_init();
+  kernel::activity::MutexImpl* mutex = kernel::actor::simcall([] { return new kernel::activity::MutexImpl(); });
   return MutexPtr(&mutex->mutex(), false);
 }
 
@@ -44,12 +52,44 @@ 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
+
+/* **************************** 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(sg_mutex_t mutex)
+{
+  delete mutex;
+}