X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b8df87e176f27b25534f27d7e240defa32ca35bc..09be3731dc0739ab7e4cdb00716335b60acb4331:/src/kernel/activity/ConditionVariableImpl.hpp diff --git a/src/kernel/activity/ConditionVariableImpl.hpp b/src/kernel/activity/ConditionVariableImpl.hpp index 9927841913..f165dde62f 100644 --- a/src/kernel/activity/ConditionVariableImpl.hpp +++ b/src/kernel/activity/ConditionVariableImpl.hpp @@ -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 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, smx_simcall_t simcall); private: std::atomic_int_fast32_t refcount_{1};