From e63fc8d05c3ae2e35ac7baa6ff7c357b06ddff4f Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@ens-rennes.fr>
Date: Wed, 14 Aug 2019 01:26:51 +0200
Subject: [PATCH] code simplification + replace a FIXME with an assert

---
 src/kernel/activity/ConditionVariableImpl.cpp | 22 +++++++------------
 src/kernel/activity/ConditionVariableImpl.hpp |  2 +-
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/src/kernel/activity/ConditionVariableImpl.cpp b/src/kernel/activity/ConditionVariableImpl.cpp
index ccaeac9a87..5efb83c75b 100644
--- a/src/kernel/activity/ConditionVariableImpl.cpp
+++ b/src/kernel/activity/ConditionVariableImpl.cpp
@@ -15,21 +15,13 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ConditionVariable, simix_synchro, "Condition var
 /** @brief Handle a condition waiting simcall without timeouts */
 void simcall_HANDLER_cond_wait(smx_simcall_t simcall, smx_cond_t cond, smx_mutex_t mutex)
 {
-  XBT_IN("(%p)", simcall);
-  smx_actor_t issuer = simcall->issuer_;
-
-  cond->wait(mutex, -1, issuer, simcall);
-  XBT_OUT();
+  cond->wait(mutex, -1, simcall->issuer_);
 }
 
 /** @brief Handle a condition waiting simcall with timeouts */
 void simcall_HANDLER_cond_wait_timeout(smx_simcall_t simcall, smx_cond_t cond, smx_mutex_t mutex, double timeout)
 {
-  XBT_IN("(%p)", simcall);
-  smx_actor_t issuer = simcall->issuer_;
-  simcall_cond_wait_timeout__set__result(simcall, 0); // default result, will be set to 1 on timeout
-  cond->wait(mutex, timeout, issuer, simcall);
-  XBT_OUT();
+  cond->wait(mutex, timeout, simcall->issuer_);
 }
 
 namespace simgrid {
@@ -87,21 +79,23 @@ void ConditionVariableImpl::broadcast()
     signal();
 }
 
-void ConditionVariableImpl::wait(smx_mutex_t mutex, double timeout, actor::ActorImpl* issuer, smx_simcall_t simcall)
+void ConditionVariableImpl::wait(smx_mutex_t mutex, double timeout, actor::ActorImpl* issuer)
 {
   XBT_DEBUG("Wait condition %p", this);
 
   /* If there is a mutex unlock it */
-  /* FIXME: what happens if the issuer is not the owner of the mutex? */
   if (mutex != nullptr) {
+    xbt_assert(mutex->owner_ == issuer,
+               "Actor %s cannot wait on ConditionVariable %p since it does not own the provided mutex %p",
+               issuer->get_cname(), this, mutex);
     mutex_ = mutex;
     mutex->unlock(issuer);
   }
 
   RawImplPtr synchro(new RawImpl());
   synchro->set_host(issuer->get_host()).set_timeout(timeout).start();
-  synchro->register_simcall(simcall);
-  sleeping_.push_back(*simcall->issuer_);
+  synchro->register_simcall(&issuer->simcall);
+  sleeping_.push_back(*issuer);
 }
 
 // boost::intrusive_ptr<ConditionVariableImpl> support:
diff --git a/src/kernel/activity/ConditionVariableImpl.hpp b/src/kernel/activity/ConditionVariableImpl.hpp
index f165dde62f..7945f2a618 100644
--- a/src/kernel/activity/ConditionVariableImpl.hpp
+++ b/src/kernel/activity/ConditionVariableImpl.hpp
@@ -25,7 +25,7 @@ public:
 
   void broadcast();
   void signal();
-  void wait(MutexImpl* mutex, double timeout, actor::ActorImpl* issuer, smx_simcall_t simcall);
+  void wait(MutexImpl* mutex, double timeout, actor::ActorImpl* issuer);
 
 private:
   std::atomic_int_fast32_t refcount_{1};
-- 
2.20.1