Correctly set result for simcall_cond_wait_timeout.

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

diff --git a/src/kernel/activity/ConditionVariableImpl.cpp b/src/kernel/activity/ConditionVariableImpl.cpp
index c29e907..fdc1def 100644 (file)
--- a/src/kernel/activity/ConditionVariableImpl.cpp
+++ b/src/kernel/activity/ConditionVariableImpl.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2020. 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. */
@@ -8,37 +8,27 @@
 #include "src/kernel/activity/MutexImpl.hpp"
 #include "src/kernel/activity/SynchroRaw.hpp"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ConditionVariable, simix_synchro, "Condition variables");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_condition, simix_synchro, "Condition variables");
 
 /********************************* Condition **********************************/
 
 /** @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 {
 namespace kernel {
 namespace activity {
 
-ConditionVariableImpl::ConditionVariableImpl() : cond_(this) {}
-ConditionVariableImpl::~ConditionVariableImpl() = default;
-
 /**
  * @brief Signalizes a condition.
  *
@@ -56,18 +46,18 @@ void ConditionVariableImpl::signal()
     sleeping_.pop_front();
 
     /* Destroy waiter's synchronization */
-    proc.waiting_synchro = nullptr;
+    proc.waiting_synchro_ = nullptr;
 
     /* Now transform the cond wait simcall into a mutex lock one */
-    smx_simcall_t simcall = &proc.simcall;
+    smx_simcall_t simcall = &proc.simcall_;
     MutexImpl* simcall_mutex;
-    if (simcall->call == SIMCALL_COND_WAIT)
+    if (simcall->call_ == SIMCALL_COND_WAIT)
       simcall_mutex = simcall_cond_wait__get__mutex(simcall);
     else
       simcall_mutex = simcall_cond_wait_timeout__get__mutex(simcall);
-    simcall->call = SIMCALL_MUTEX_LOCK;
+    simcall->call_ = SIMCALL_MUTEX_LOCK;
 
-    simcall_mutex->lock(simcall->issuer);
+    simcall_mutex->lock(simcall->issuer_);
   }
   XBT_OUT();
 }
@@ -87,22 +77,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->get_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->simcalls_.push_front(simcall);
-  issuer->waiting_synchro = std::move(synchro);
-  sleeping_.push_back(*simcall->issuer);
+  synchro->set_host(issuer->get_host()).set_timeout(timeout).start();
+  synchro->register_simcall(&issuer->simcall_);
+  sleeping_.push_back(*issuer);
 }
 
 // boost::intrusive_ptr<ConditionVariableImpl> support: