X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/74c54d770c8a3c775a801b64fdaa5b84843798c0..b5e12b5385e12f089e86f207422e19d2faea235a:/src/kernel/activity/ConditionVariableImpl.hpp diff --git a/src/kernel/activity/ConditionVariableImpl.hpp b/src/kernel/activity/ConditionVariableImpl.hpp index eeb95d126d..eb6937b339 100644 --- a/src/kernel/activity/ConditionVariableImpl.hpp +++ b/src/kernel/activity/ConditionVariableImpl.hpp @@ -1,13 +1,13 @@ -/* Copyright (c) 2012-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2012-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. */ -#ifndef SIMGRID_KERNEL_ACTIVITY_CONDITIONVARIABLEIMPL_HPP -#define SIMGRID_KERNEL_ACTIVITY_CONDITIONVARIABLEIMPL_HPP +#ifndef SIMGRID_KERNEL_ACTIVITY_CONDITIONVARIABLE_HPP +#define SIMGRID_KERNEL_ACTIVITY_CONDITIONVARIABLE_HPP #include "simgrid/s4u/ConditionVariable.hpp" -#include "src/simix/ActorImpl.hpp" +#include "src/kernel/actor/ActorImpl.hpp" #include namespace simgrid { @@ -15,29 +15,26 @@ namespace kernel { namespace activity { class XBT_PUBLIC ConditionVariableImpl { -public: - ConditionVariableImpl(); - ~ConditionVariableImpl(); - - simgrid::kernel::actor::SynchroList sleeping; /* list of sleeping processes */ - smx_mutex_t mutex = nullptr; - simgrid::s4u::ConditionVariable cond_; - - void broadcast(); - void signal(); + MutexImpl* mutex_ = nullptr; + s4u::ConditionVariable piface_; + actor::SynchroList sleeping_; /* list of sleeping actors*/ -private: std::atomic_int_fast32_t refcount_{1}; friend void intrusive_ptr_add_ref(ConditionVariableImpl* cond); friend void intrusive_ptr_release(ConditionVariableImpl* cond); + +public: + ConditionVariableImpl() : piface_(this){}; + ~ConditionVariableImpl() = default; + + void remove_sleeping_actor(actor::ActorImpl& actor) { xbt::intrusive_erase(sleeping_, actor); } + s4u::ConditionVariable* get_iface() { return &piface_; } + void broadcast(); + void signal(); + void wait(MutexImpl* mutex, double timeout, actor::ActorImpl* issuer); }; } // namespace activity } // namespace kernel } // namespace simgrid -XBT_PRIVATE smx_cond_t SIMIX_cond_init(); - -// simcall handlers -XBT_PRIVATE void simcall_HANDLER_cond_signal(smx_simcall_t simcall, smx_cond_t cond); -XBT_PRIVATE void simcall_HANDLER_cond_broadcast(smx_simcall_t simcall, smx_cond_t cond); #endif