X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a31a5aabed1a30637c9ccdd30361b1eda8155968..ae8f2dfc8f0fd854a2eb0268c12cdfcc4493d0a8:/src/s4u/s4u_ConditionVariable.cpp

diff --git a/src/s4u/s4u_ConditionVariable.cpp b/src/s4u/s4u_ConditionVariable.cpp
index 0e3713dfa3..c95fc4f6d7 100644
--- a/src/s4u/s4u_ConditionVariable.cpp
+++ b/src/s4u/s4u_ConditionVariable.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2006-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. */
@@ -19,8 +19,8 @@ namespace s4u {
 ConditionVariablePtr ConditionVariable::create()
 {
   kernel::activity::ConditionVariableImpl* cond =
-      simix::simcall([] { return new kernel::activity::ConditionVariableImpl(); });
-  return ConditionVariablePtr(&cond->cond_, false);
+      kernel::actor::simcall([] { return new kernel::activity::ConditionVariableImpl(); });
+  return ConditionVariablePtr(cond->get_iface(), false);
 }
 
 /**
@@ -31,12 +31,12 @@ void ConditionVariable::wait(MutexPtr lock)
   simcall_cond_wait(cond_, lock->pimpl_);
 }
 
-void ConditionVariable::wait(std::unique_lock<Mutex>& lock)
+void ConditionVariable::wait(const std::unique_lock<Mutex>& lock)
 {
   simcall_cond_wait(cond_, lock.mutex()->pimpl_);
 }
 
-std::cv_status s4u::ConditionVariable::wait_for(std::unique_lock<Mutex>& lock, double timeout)
+std::cv_status s4u::ConditionVariable::wait_for(const std::unique_lock<Mutex>& lock, double timeout)
 {
   // The simcall uses -1 for "any timeout" but we don't want this:
   if (timeout < 0)
@@ -51,7 +51,7 @@ std::cv_status s4u::ConditionVariable::wait_for(std::unique_lock<Mutex>& lock, d
   }
 }
 
-std::cv_status ConditionVariable::wait_until(std::unique_lock<Mutex>& lock, double timeout_time)
+std::cv_status ConditionVariable::wait_until(const std::unique_lock<Mutex>& lock, double timeout_time)
 {
   double now = SIMIX_get_clock();
   double timeout;
@@ -67,20 +67,20 @@ std::cv_status ConditionVariable::wait_until(std::unique_lock<Mutex>& lock, doub
  */
 void ConditionVariable::notify_one()
 {
-  simgrid::simix::simcall([this]() { cond_->signal(); });
+  simgrid::kernel::actor::simcall([this]() { cond_->signal(); });
 }
 
 void ConditionVariable::notify_all()
 {
-  simgrid::simix::simcall([this]() { cond_->broadcast(); });
+  simgrid::kernel::actor::simcall([this]() { cond_->broadcast(); });
 }
 
-void intrusive_ptr_add_ref(ConditionVariable* cond)
+void intrusive_ptr_add_ref(const ConditionVariable* cond)
 {
   intrusive_ptr_add_ref(cond->cond_);
 }
 
-void intrusive_ptr_release(ConditionVariable* cond)
+void intrusive_ptr_release(const ConditionVariable* cond)
 {
   intrusive_ptr_release(cond->cond_);
 }
@@ -92,7 +92,7 @@ void intrusive_ptr_release(ConditionVariable* cond)
 sg_cond_t sg_cond_init()
 {
   simgrid::kernel::activity::ConditionVariableImpl* cond =
-      simgrid::simix::simcall([] { return new simgrid::kernel::activity::ConditionVariableImpl(); });
+      simgrid::kernel::actor::simcall([] { return new simgrid::kernel::activity::ConditionVariableImpl(); });
 
   return new simgrid::s4u::ConditionVariable(cond);
 }
@@ -105,7 +105,7 @@ void sg_cond_wait(sg_cond_t cond, sg_mutex_t mutex)
 int sg_cond_wait_for(sg_cond_t cond, sg_mutex_t mutex, double delay)
 {
   std::unique_lock<simgrid::s4u::Mutex> lock(*mutex);
-  return static_cast<int>(cond->wait_for(lock, delay));
+  return cond->wait_for(lock, delay) == std::cv_status::timeout ? 1 : 0;
 }
 
 void sg_cond_notify_one(sg_cond_t cond)
@@ -118,7 +118,7 @@ void sg_cond_notify_all(sg_cond_t cond)
   cond->notify_all();
 }
 
-void sg_cond_destroy(sg_cond_t cond)
+void sg_cond_destroy(const_sg_cond_t cond)
 {
   delete cond;
 }