X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ea74f5d95928a521a588737e81f1de94eef25d19..617d14f39e028a3bf39fc8e0ce691ed2e709bc8e:/src/kernel/activity/SleepImpl.cpp diff --git a/src/kernel/activity/SleepImpl.cpp b/src/kernel/activity/SleepImpl.cpp index 68382f1c53..78813f718b 100644 --- a/src/kernel/activity/SleepImpl.cpp +++ b/src/kernel/activity/SleepImpl.cpp @@ -8,7 +8,6 @@ #include "src/kernel/activity/SleepImpl.hpp" #include "src/kernel/actor/ActorImpl.hpp" #include "src/kernel/resource/CpuImpl.hpp" -#include "src/simix/popping_private.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ker_actor); @@ -40,11 +39,11 @@ void SleepImpl::post() { if (surf_action_->get_state() == resource::Action::State::FAILED) { if (host_ && not host_->is_on()) - state_ = State::SRC_HOST_FAILURE; + set_state(State::SRC_HOST_FAILURE); else - state_ = State::CANCELED; + set_state(State::CANCELED); } else if (surf_action_->get_state() == resource::Action::State::FINISHED) { - state_ = State::DONE; + set_state(State::DONE); } clean_action(); @@ -57,9 +56,9 @@ void SleepImpl::set_exception(actor::ActorImpl* issuer) } void SleepImpl::finish() { - XBT_DEBUG("SleepImpl::finish() in state %s", to_c_str(state_)); + XBT_DEBUG("SleepImpl::finish() in state %s", get_state_str()); while (not simcalls_.empty()) { - const s_smx_simcall* simcall = simcalls_.front(); + const actor::Simcall* simcall = simcalls_.front(); simcalls_.pop_front(); simcall->issuer_->waiting_synchro_ = nullptr;