Test the dependencies of Mutex transitions

[simgrid.git] / src / kernel / activity / MutexImpl.cpp

diff --git a/src/kernel/activity/MutexImpl.cpp b/src/kernel/activity/MutexImpl.cpp
index 7c13296..f1e089f 100644 (file)
--- a/src/kernel/activity/MutexImpl.cpp
+++ b/src/kernel/activity/MutexImpl.cpp
@@ -1,10 +1,10 @@
-/* Copyright (c) 2007-2021. 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"
 
 #if SIMGRID_HAVE_MC
 #include "simgrid/modelchecker.h"
@@ -16,31 +16,57 @@
 #define MC_CHECK_NO_DPOR() (void)0
 #endif
 
-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)
+bool MutexAcquisitionImpl::test(actor::ActorImpl*)
 {
-  XBT_IN("(%p; %p)", this, issuer);
-  MC_CHECK_NO_DPOR();
+  return mutex_->owner_ == issuer_;
+}
+void MutexAcquisitionImpl::wait_for(actor::ActorImpl* issuer, double timeout)
+{
+  xbt_assert(mutex_->owner_ != nullptr); // it was locked either by someone else or by me during the lock_async
+  xbt_assert(
+      issuer == issuer_,
+      "Actors can only wait acquisitions that they created themselves while this one was created by 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());
+  smx_simcall_t simcall = simcalls_.front();
+  simcalls_.pop_front();
 
-  if (locked_) {
+  simcall->issuer_->waiting_synchro_ = nullptr;
+  simcall->issuer_->simcall_answer();
+}
+
+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) {
     /* FIXME: check if the host is active ? */
     /* Somebody using the mutex, use a synchronization to get host failures */
-    RawImplPtr synchro(new RawImpl([this, issuer]() { this->remove_sleeping_actor(*issuer); }));
-    (*synchro).set_host(issuer->get_host()).start();
-    synchro->register_simcall(&issuer->simcall_);
-    sleeping_.push_back(*issuer);
+    sleeping_.push_back(res);
   } else {
-    /* mutex free */
-    locked_ = true;
     owner_  = issuer;
-    issuer->simcall_answer();
   }
-  XBT_OUT();
+  return res;
 }
 
 /** Tries to lock the mutex for a actor
@@ -52,12 +78,11 @@ bool MutexImpl::try_lock(actor::ActorImpl* issuer)
 {
   XBT_IN("(%p, %p)", this, issuer);
   MC_CHECK_NO_DPOR();
-  if (locked_) {
+  if (owner_ != nullptr) {
     XBT_OUT();
     return false;
   }
 
-  locked_ = true;
   owner_  = issuer;
   XBT_OUT();
   return true;
@@ -72,19 +97,20 @@ bool MutexImpl::try_lock(actor::ActorImpl* issuer)
 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()) {
     /* Give the ownership to the first waiting actor */
-    owner_ = &sleeping_.front();
+    auto acq = sleeping_.front();
+    owner_   = acq->get_issuer();
+
+    if (acq == owner_->waiting_synchro_)
+      acq->finish();
+
     sleeping_.pop_front();
-    owner_->waiting_synchro_ = nullptr;
-    owner_->simcall_answer();
   } else {
     /* nobody to wake up */
-    locked_ = false;
     owner_  = nullptr;
   }
   XBT_OUT();