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

diff --git a/src/kernel/activity/ConditionVariableImpl.hpp b/src/kernel/activity/ConditionVariableImpl.hpp
index a41fa90007..7945f2a618 100644
--- a/src/kernel/activity/ConditionVariableImpl.hpp
+++ b/src/kernel/activity/ConditionVariableImpl.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2012-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. */
@@ -7,7 +7,7 @@
 #define SIMGRID_KERNEL_ACTIVITY_CONDITIONVARIABLEIMPL_HPP
 
 #include "simgrid/s4u/ConditionVariable.hpp"
-#include "src/simix/ActorImpl.hpp"
+#include "src/kernel/actor/ActorImpl.hpp"
 #include <boost/intrusive/list.hpp>
 
 namespace simgrid {
@@ -19,12 +19,13 @@ public:
   ConditionVariableImpl();
   ~ConditionVariableImpl();
 
-  simgrid::kernel::actor::SynchroList sleeping; /* list of sleeping processes */
-  smx_mutex_t mutex = nullptr;
-  simgrid::s4u::ConditionVariable cond_;
+  actor::SynchroList sleeping_; /* list of sleeping processes */
+  MutexImpl* mutex_ = nullptr;
+  s4u::ConditionVariable cond_;
 
   void broadcast();
   void signal();
+  void wait(MutexImpl* mutex, double timeout, actor::ActorImpl* issuer);
 
 private:
   std::atomic_int_fast32_t refcount_{1};
@@ -34,6 +35,5 @@ private:
 } // namespace activity
 } // namespace kernel
 } // namespace simgrid
-XBT_PRIVATE smx_cond_t SIMIX_cond_init();
 
 #endif