Mutex are now DPOR compatible

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

diff --git a/src/kernel/activity/MutexImpl.cpp b/src/kernel/activity/MutexImpl.cpp
index 74af186..17b3936 100644 (file)
--- a/src/kernel/activity/MutexImpl.cpp
+++ b/src/kernel/activity/MutexImpl.cpp
@@ -6,22 +6,14 @@
 #include "src/kernel/activity/MutexImpl.hpp"
 #include "src/kernel/activity/Synchro.hpp"
 
-#if SIMGRID_HAVE_MC
-#include "simgrid/modelchecker.h"
-#include "src/mc/mc_safety.hpp"
-#define MC_CHECK_NO_DPOR()                                                                                             \
-  xbt_assert(not MC_is_active() || mc::reduction_mode != mc::ReductionMode::dpor,                                      \
-             "Mutex is currently not supported with DPOR,  use --cfg=model-check/reduction:none")
-#else
-#define MC_CHECK_NO_DPOR() (void)0
-#endif
-
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_mutex, ker_synchro, "Mutex kernel-space implementation");
 
 namespace simgrid {
 namespace kernel {
 namespace activity {
 
+/* -------- Acquisition -------- */
+
 bool MutexAcquisitionImpl::test(actor::ActorImpl*)
 {
   return mutex_->owner_ == issuer_;
@@ -50,6 +42,8 @@ void MutexAcquisitionImpl::finish()
   simcall->issuer_->simcall_answer();
 }
 
+/* -------- Mutex -------- */
+
 unsigned MutexImpl::next_id_ = 0;
 
 MutexAcquisitionImplPtr MutexImpl::lock_async(actor::ActorImpl* issuer)
@@ -58,7 +52,7 @@ MutexAcquisitionImplPtr MutexImpl::lock_async(actor::ActorImpl* issuer)
 
   if (owner_ != nullptr) {
     /* Somebody is using the mutex; register the acquisition */
-    sleeping_.push_back(res);
+    ongoing_acquisitions_.push_back(res);
   } else {
     owner_  = issuer;
   }
@@ -73,7 +67,6 @@ MutexAcquisitionImplPtr MutexImpl::lock_async(actor::ActorImpl* issuer)
 bool MutexImpl::try_lock(actor::ActorImpl* issuer)
 {
   XBT_IN("(%p, %p)", this, issuer);
-  MC_CHECK_NO_DPOR();
   if (owner_ != nullptr) {
     XBT_OUT();
     return false;
@@ -96,10 +89,10 @@ void MutexImpl::unlock(actor::ActorImpl* issuer)
   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 */
-    auto acq = sleeping_.front();
-    sleeping_.pop_front();
+    auto acq = ongoing_acquisitions_.front();
+    ongoing_acquisitions_.pop_front();
 
     owner_ = acq->get_issuer();
     if (acq == owner_->waiting_synchro_)