X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/effadf994078b5f7bbc589d3ac0ba2aae8aaa59f..e63fc8d05c3ae2e35ac7baa6ff7c357b06ddff4f:/src/kernel/activity/ConditionVariableImpl.cpp

diff --git a/src/kernel/activity/ConditionVariableImpl.cpp b/src/kernel/activity/ConditionVariableImpl.cpp
index a238297a3c..5efb83c75b 100644
--- a/src/kernel/activity/ConditionVariableImpl.cpp
+++ b/src/kernel/activity/ConditionVariableImpl.cpp
@@ -1,80 +1,27 @@
-/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2019. 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/ConditionVariableImpl.hpp"
+#include "simgrid/Exception.hpp"
 #include "src/kernel/activity/MutexImpl.hpp"
 #include "src/kernel/activity/SynchroRaw.hpp"
-#include "src/simix/smx_synchro_private.hpp"
-#include "xbt/ex.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ConditionVariable, simix_synchro, "Condition variables");
 
-static void _SIMIX_cond_wait(smx_cond_t cond, smx_mutex_t mutex, double timeout, smx_actor_t issuer,
-                             smx_simcall_t simcall);
-
 /********************************* Condition **********************************/
 
-/**
- * \brief Initialize a condition.
- *
- * Allocates and creates the data for the condition.
- * It have to be called before the use of the condition.
- * \return A condition
- */
-smx_cond_t SIMIX_cond_init()
-{
-  XBT_IN("()");
-  smx_cond_t cond = new simgrid::kernel::activity::ConditionVariableImpl();
-  XBT_OUT();
-  return cond;
-}
-
-/**
- * \brief Handle a condition waiting simcall without timeouts
- */
+/** @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;
-
-  _SIMIX_cond_wait(cond, mutex, -1, issuer, simcall);
-  XBT_OUT();
+  cond->wait(mutex, -1, simcall->issuer_);
 }
 
-/**
- * \brief Handle a condition waiting simcall with timeouts
- */
+/** @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;
-
-  _SIMIX_cond_wait(cond, mutex, timeout, issuer, simcall);
-  XBT_OUT();
-}
-
-static void _SIMIX_cond_wait(smx_cond_t cond, smx_mutex_t mutex, double timeout, smx_actor_t issuer,
-                             smx_simcall_t simcall)
-{
-  XBT_IN("(%p, %p, %f, %p,%p)", cond, mutex, timeout, issuer, simcall);
-  smx_activity_t synchro = nullptr;
-
-  XBT_DEBUG("Wait condition %p", cond);
-
-  /* If there is a mutex unlock it */
-  /* FIXME: what happens if the issuer is not the owner of the mutex? */
-  if (mutex != nullptr) {
-    cond->mutex = mutex;
-    mutex->unlock(issuer);
-  }
-
-  synchro = SIMIX_synchro_wait(issuer->host, timeout);
-  synchro->simcalls.push_front(simcall);
-  issuer->waiting_synchro = synchro;
-  cond->sleeping.push_back(*simcall->issuer);
-  XBT_OUT();
+  cond->wait(mutex, timeout, simcall->issuer_);
 }
 
 namespace simgrid {
@@ -85,7 +32,7 @@ ConditionVariableImpl::ConditionVariableImpl() : cond_(this) {}
 ConditionVariableImpl::~ConditionVariableImpl() = default;
 
 /**
- * \brief Signalizes a condition.
+ * @brief Signalizes a condition.
  *
  * Signalizes a condition and wakes up a sleeping process.
  * If there are no process sleeping, no action is done.
@@ -96,29 +43,29 @@ void ConditionVariableImpl::signal()
 
   /* If there are processes waiting for the condition choose one and try
      to make it acquire the mutex */
-  if (not sleeping.empty()) {
-    auto& proc = sleeping.front();
-    sleeping.pop_front();
+  if (not sleeping_.empty()) {
+    auto& proc = sleeping_.front();
+    sleeping_.pop_front();
 
     /* Destroy waiter's synchronization */
     proc.waiting_synchro = nullptr;
 
     /* Now transform the cond wait simcall into a mutex lock one */
     smx_simcall_t simcall = &proc.simcall;
-    smx_mutex_t simcall_mutex;
-    if (simcall->call == SIMCALL_COND_WAIT)
+    MutexImpl* simcall_mutex;
+    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_HANDLER_mutex_lock(simcall, simcall_mutex);
+    simcall_mutex->lock(simcall->issuer_);
   }
   XBT_OUT();
 }
 
 /**
- * \brief Broadcasts a condition.
+ * @brief Broadcasts a condition.
  *
  * Signal ALL processes waiting on a condition.
  * If there are no process waiting, no action is done.
@@ -128,10 +75,29 @@ void ConditionVariableImpl::broadcast()
   XBT_DEBUG("Broadcast condition %p", this);
 
   /* Signal the condition until nobody is waiting on it */
-  while (not sleeping.empty())
+  while (not sleeping_.empty())
     signal();
 }
 
+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 */
+  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(&issuer->simcall);
+  sleeping_.push_back(*issuer);
+}
+
 // boost::intrusive_ptr<ConditionVariableImpl> support:
 void intrusive_ptr_add_ref(simgrid::kernel::activity::ConditionVariableImpl* cond)
 {
@@ -142,10 +108,10 @@ void intrusive_ptr_release(simgrid::kernel::activity::ConditionVariableImpl* con
 {
   if (cond->refcount_.fetch_sub(1, std::memory_order_release) == 1) {
     std::atomic_thread_fence(std::memory_order_acquire);
-    xbt_assert(cond->sleeping.empty(), "Cannot destroy conditional since someone is still using it");
+    xbt_assert(cond->sleeping_.empty(), "Cannot destroy conditional since someone is still using it");
     delete cond;
   }
 }
 } // namespace activity
 } // namespace kernel
-}
+} // namespace simgrid