X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/956cb23848021301bcb4c20fd31675f65e4348e5..2cdb13351fe9ef4d8b550c66cbbb5d70d7d9f30c:/src/kernel/activity/MutexImpl.cpp

diff --git a/src/kernel/activity/MutexImpl.cpp b/src/kernel/activity/MutexImpl.cpp
index 396c537a9e..624c80b3c3 100644
--- a/src/kernel/activity/MutexImpl.cpp
+++ b/src/kernel/activity/MutexImpl.cpp
@@ -1,24 +1,18 @@
-/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-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 "smx_private.hpp"
-#include "src/surf/cpu_interface.hpp"
-#include "src/surf/surf_interface.hpp"
-#include <xbt/ex.hpp>
-#include <xbt/log.h>
-#include <xbt/utility.hpp>
-
+#include "src/kernel/activity/MutexImpl.hpp"
 #include "src/kernel/activity/SynchroRaw.hpp"
-#include "src/simix/MutexImpl.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_mutex, simix_synchro, "Mutex kernel-space implementation");
 
 namespace simgrid {
-namespace simix {
+namespace kernel {
+namespace activity {
 
-MutexImpl::MutexImpl() : mutex_(this)
+MutexImpl::MutexImpl() : piface_(this)
 {
   XBT_IN("(%p)", this);
   XBT_OUT();
@@ -34,13 +28,13 @@ void MutexImpl::lock(smx_actor_t issuer)
 {
   XBT_IN("(%p; %p)", this, issuer);
   /* FIXME: check where to validate the arguments */
-  smx_activity_t synchro = nullptr;
+  RawImplPtr synchro = nullptr;
 
   if (this->locked) {
     /* FIXME: check if the host is active ? */
     /* Somebody using the mutex, use a synchronization to get host failures */
-    synchro = SIMIX_synchro_wait(issuer->host, -1);
-    synchro->simcalls.push_back(&issuer->simcall);
+    synchro = RawImplPtr(new RawImpl())->start(issuer->get_host(), -1);
+    synchro->simcalls_.push_back(&issuer->simcall);
     issuer->waiting_synchro = synchro;
     this->sleeping.push_back(*issuer);
   } else {
@@ -54,8 +48,8 @@ void MutexImpl::lock(smx_actor_t issuer)
 
 /** Tries to lock the mutex for a process
  *
- * \param  issuer  the process that tries to acquire the mutex
- * \return whether we managed to lock the mutex
+ * @param  issuer  the process that tries to acquire the mutex
+ * @return whether we managed to lock the mutex
  */
 bool MutexImpl::try_lock(smx_actor_t issuer)
 {
@@ -85,8 +79,8 @@ void MutexImpl::unlock(smx_actor_t issuer)
 
   /* If the mutex is not owned by the issuer, that's not good */
   if (issuer != this->owner)
-    THROWF(mismatch_error, 0, "Cannot release that mutex: it was locked by %s (pid:%lu), not by you.",
-           this->owner->getCname(), this->owner->pid);
+    THROWF(mismatch_error, 0, "Cannot release that mutex: it was locked by %s (pid:%ld), not by you.",
+           this->owner->get_cname(), this->owner->get_pid());
 
   if (not this->sleeping.empty()) {
     /*process to wake up */
@@ -102,24 +96,23 @@ void MutexImpl::unlock(smx_actor_t issuer)
   }
   XBT_OUT();
 }
-}
-}
-
 /** Increase the refcount for this mutex */
-smx_mutex_t SIMIX_mutex_ref(smx_mutex_t mutex)
+MutexImpl* MutexImpl::ref()
 {
-  if (mutex != nullptr)
-    intrusive_ptr_add_ref(mutex);
-  return mutex;
+  intrusive_ptr_add_ref(this);
+  return this;
 }
 
 /** Decrease the refcount for this mutex */
-void SIMIX_mutex_unref(smx_mutex_t mutex)
+void MutexImpl::unref()
 {
-  if (mutex != nullptr)
-    intrusive_ptr_release(mutex);
+  intrusive_ptr_release(this);
 }
 
+} // namespace activity
+} // namespace kernel
+} // namespace simgrid
+
 // Simcall handlers:
 
 void simcall_HANDLER_mutex_lock(smx_simcall_t simcall, smx_mutex_t mutex)