X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cdf6a962eb4e88efbed3df9c41343adabcf09e6c..080541387d2296c808397215b8c9401a9f97a1d5:/src/kernel/activity/MutexImpl.cpp

diff --git a/src/kernel/activity/MutexImpl.cpp b/src/kernel/activity/MutexImpl.cpp
index 9274c47766..45d0889216 100644
--- a/src/kernel/activity/MutexImpl.cpp
+++ b/src/kernel/activity/MutexImpl.cpp
@@ -1,115 +1,111 @@
-/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2022. 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 "src/kernel/activity/MutexImpl.hpp"
-#include "src/kernel/activity/SynchroRaw.hpp"
+#include "src/kernel/activity/Synchro.hpp"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_mutex, simix_synchro, "Mutex kernel-space implementation");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_mutex, ker_synchro, "Mutex kernel-space implementation");
 
 namespace simgrid {
 namespace kernel {
 namespace activity {
 
-void MutexImpl::lock(actor::ActorImpl* issuer)
+/* -------- Acquisition -------- */
+
+bool MutexAcquisitionImpl::test(actor::ActorImpl*)
+{
+  return mutex_->owner_ == issuer_;
+}
+void MutexAcquisitionImpl::wait_for(actor::ActorImpl* issuer, double timeout)
 {
-  XBT_IN("(%p; %p)", this, issuer);
-  /* FIXME: check where to validate the arguments */
-  RawImplPtr synchro = nullptr;
-
-  if (locked_) {
-    /* FIXME: check if the host is active ? */
-    /* Somebody using the mutex, use a synchronization to get host failures */
-    synchro = RawImplPtr(new RawImpl());
-    (*synchro).set_host(issuer->get_host()).start();
-    synchro->simcalls_.push_back(&issuer->simcall);
-    issuer->waiting_synchro = synchro;
-    sleeping_.push_back(*issuer);
+  xbt_assert(mutex_->owner_ != nullptr); // it was locked either by someone else or by me during the lock_async
+  xbt_assert(issuer == issuer_, "Cannot wait on acquisitions created by another actor (id %ld)", issuer_->get_pid());
+  xbt_assert(timeout < 0, "Timeouts on mutex acquisitions are not implemented yet.");
+
+  this->register_simcall(&issuer_->simcall_); // Block on that acquisition
+
+  if (mutex_->get_owner() == issuer_) { // I'm the owner
+    finish();
+  } else {
+    // Already in the queue
+  }
+}
+void MutexAcquisitionImpl::finish()
+{
+  xbt_assert(simcalls_.size() == 1, "Unexpected number of simcalls waiting: %zu", simcalls_.size());
+  simix::Simcall* simcall = simcalls_.front();
+  simcalls_.pop_front();
+
+  simcall->issuer_->waiting_synchro_ = nullptr;
+  simcall->issuer_->simcall_answer();
+}
+
+/* -------- Mutex -------- */
+
+unsigned MutexImpl::next_id_ = 0;
+
+MutexAcquisitionImplPtr MutexImpl::lock_async(actor::ActorImpl* issuer)
+{
+  auto res = MutexAcquisitionImplPtr(new kernel::activity::MutexAcquisitionImpl(issuer, this), true);
+
+  if (owner_ != nullptr) {
+    /* Somebody is using the mutex; register the acquisition */
+    ongoing_acquisitions_.push_back(res);
   } else {
-    /* mutex free */
-    locked_ = true;
     owner_  = issuer;
-    issuer->simcall_answer();
   }
-  XBT_OUT();
+  return res;
 }
 
-/** Tries to lock the mutex for a process
+/** Tries to lock the mutex for a actor
  *
- * @param  issuer  the process that tries to acquire the mutex
+ * @param  issuer  the actor that tries to acquire the mutex
  * @return whether we managed to lock the mutex
  */
 bool MutexImpl::try_lock(actor::ActorImpl* issuer)
 {
   XBT_IN("(%p, %p)", this, issuer);
-  if (locked_) {
+  if (owner_ != nullptr) {
     XBT_OUT();
     return false;
   }
 
-  locked_ = true;
   owner_  = issuer;
   XBT_OUT();
   return true;
 }
 
-/** Unlock a mutex for a process
+/** Unlock a mutex for a actor
  *
- * Unlocks the mutex and gives it to a process waiting for it.
+ * Unlocks the mutex and gives it to a actor waiting for it.
  * If the unlocker is not the owner of the mutex nothing happens.
- * If there are no process waiting, it sets the mutex as free.
+ * If there are no actor waiting, it sets the mutex as free.
  */
 void MutexImpl::unlock(actor::ActorImpl* issuer)
 {
   XBT_IN("(%p, %p)", this, issuer);
-  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());
+  xbt_assert(issuer == owner_, "Cannot release that mutex: you're not the owner. %s is (pid:%ld).",
+             owner_ != nullptr ? owner_->get_cname() : "(nobody)", owner_ != nullptr ? owner_->get_pid() : -1);
 
-  if (not sleeping_.empty()) {
+  if (not ongoing_acquisitions_.empty()) {
     /* Give the ownership to the first waiting actor */
-    owner_ = &sleeping_.front();
-    sleeping_.pop_front();
-    owner_->waiting_synchro = nullptr;
-    owner_->simcall_answer();
+    auto acq = ongoing_acquisitions_.front();
+    ongoing_acquisitions_.pop_front();
+
+    owner_ = acq->get_issuer();
+    if (acq == owner_->waiting_synchro_)
+      acq->finish();
+    // else, the issuer is not blocked on this acquisition so no need to release it
+
   } else {
     /* nobody to wake up */
-    locked_ = false;
     owner_  = nullptr;
   }
   XBT_OUT();
 }
-/** Increase the refcount for this mutex */
-MutexImpl* MutexImpl::ref()
-{
-  intrusive_ptr_add_ref(this);
-  return this;
-}
-
-/** Decrease the refcount for this mutex */
-void MutexImpl::unref()
-{
-  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)
-{
-  mutex->lock(simcall->issuer_);
-}
-
-int simcall_HANDLER_mutex_trylock(smx_simcall_t simcall, smx_mutex_t mutex)
-{
-  return mutex->try_lock(simcall->issuer_);
-}
-
-void simcall_HANDLER_mutex_unlock(smx_simcall_t simcall, smx_mutex_t mutex)
-{
-  mutex->unlock(simcall->issuer_);
-}