X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/121e8462d6b912a252a9016683d2e3e021cde9a0..65e32be46137f88aaa89385c2c9e83025bfbb06f:/src/kernel/activity/MutexImpl.cpp

diff --git a/src/kernel/activity/MutexImpl.cpp b/src/kernel/activity/MutexImpl.cpp
index 80fa3d529d..9269c91f6e 100644
--- a/src/kernel/activity/MutexImpl.cpp
+++ b/src/kernel/activity/MutexImpl.cpp
@@ -12,36 +12,25 @@ namespace simgrid {
 namespace kernel {
 namespace activity {
 
-MutexImpl::MutexImpl() : piface_(this)
-{
-  XBT_IN("(%p)", this);
-  XBT_OUT();
-}
-
-MutexImpl::~MutexImpl()
-{
-  XBT_IN("(%p)", this);
-  XBT_OUT();
-}
-
-void MutexImpl::lock(smx_actor_t issuer)
+void MutexImpl::lock(actor::ActorImpl* issuer)
 {
   XBT_IN("(%p; %p)", this, issuer);
   /* FIXME: check where to validate the arguments */
   RawImplPtr synchro = nullptr;
 
-  if (this->locked) {
+  if (locked_) {
     /* FIXME: check if the host is active ? */
     /* Somebody using the mutex, use a synchronization to get host failures */
-    synchro = RawImplPtr(new RawImpl())->start(issuer->get_host(), -1);
+    synchro = RawImplPtr(new RawImpl());
+    (*synchro).set_host(issuer->get_host()).start();
     synchro->simcalls_.push_back(&issuer->simcall);
     issuer->waiting_synchro = synchro;
-    this->sleeping.push_back(*issuer);
+    sleeping_.push_back(*issuer);
   } else {
     /* mutex free */
-    this->locked = true;
-    this->owner  = issuer;
-    SIMIX_simcall_answer(&issuer->simcall);
+    locked_ = true;
+    owner_  = issuer;
+    issuer->simcall_answer();
   }
   XBT_OUT();
 }
@@ -51,16 +40,16 @@ void MutexImpl::lock(smx_actor_t issuer)
  * @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)
+bool MutexImpl::try_lock(actor::ActorImpl* issuer)
 {
   XBT_IN("(%p, %p)", this, issuer);
-  if (this->locked) {
+  if (locked_) {
     XBT_OUT();
     return false;
   }
 
-  this->locked = true;
-  this->owner  = issuer;
+  locked_ = true;
+  owner_  = issuer;
   XBT_OUT();
   return true;
 }
@@ -71,50 +60,43 @@ bool MutexImpl::try_lock(smx_actor_t issuer)
  * If the unlocker is not the owner of the mutex nothing happens.
  * If there are no process waiting, it sets the mutex as free.
  */
-void MutexImpl::unlock(smx_actor_t issuer)
+void MutexImpl::unlock(actor::ActorImpl* issuer)
 {
   XBT_IN("(%p, %p)", this, issuer);
-  if (not this->locked)
-    THROWF(mismatch_error, 0, "Cannot release that mutex: it was not locked.");
-
-  /* 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:%ld), not by you.",
-           this->owner->get_cname(), this->owner->get_pid());
-
-  if (not this->sleeping.empty()) {
-    /*process to wake up */
-    smx_actor_t p = &this->sleeping.front();
-    this->sleeping.pop_front();
-    p->waiting_synchro = nullptr;
-    this->owner        = p;
-    SIMIX_simcall_answer(&p->simcall);
+  xbt_assert(locked_, "Cannot release that mutex: it was not locked.");
+  xbt_assert(issuer == owner_, "Cannot release that mutex: it was locked by %s (pid:%ld), not by you.",
+             owner_->get_cname(), owner_->get_pid());
+
+  if (not sleeping_.empty()) {
+    /* Give the ownership to the first waiting actor */
+    owner_ = &sleeping_.front();
+    sleeping_.pop_front();
+    owner_->waiting_synchro = nullptr;
+    owner_->simcall_answer();
   } else {
     /* nobody to wake up */
-    this->locked = false;
-    this->owner  = nullptr;
+    locked_ = false;
+    owner_  = nullptr;
   }
   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)