X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e295c984a0d5f6ba7d8ae0e802a46d1b642c2ba2..e709643ef0c5b61c6c878016c418bffa2b1b20cd:/src/kernel/activity/SleepImpl.cpp diff --git a/src/kernel/activity/SleepImpl.cpp b/src/kernel/activity/SleepImpl.cpp index dc94cffb13..c08a7ab0e1 100644 --- a/src/kernel/activity/SleepImpl.cpp +++ b/src/kernel/activity/SleepImpl.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-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. */ @@ -42,11 +42,11 @@ void SleepImpl::post() { if (surf_action_->get_state() == resource::Action::State::FAILED) { if (host_ && not host_->is_on()) - state_ = SIMIX_SRC_HOST_FAILURE; + state_ = State::SRC_HOST_FAILURE; else - state_ = SIMIX_CANCELED; + state_ = State::CANCELED; } else if (surf_action_->get_state() == resource::Action::State::FINISHED) { - state_ = SIMIX_DONE; + state_ = State::DONE; } /* Answer all simcalls associated with the synchro */ finish(); @@ -55,10 +55,10 @@ void SleepImpl::post() void SleepImpl::finish() { while (not simcalls_.empty()) { - smx_simcall_t simcall = simcalls_.front(); + const s_smx_simcall* simcall = simcalls_.front(); simcalls_.pop_front(); - simcall->issuer_->waiting_synchro = nullptr; + simcall->issuer_->waiting_synchro_ = nullptr; if (simcall->issuer_->is_suspended()) { XBT_DEBUG("Wait! This process is suspended and can't wake up now."); simcall->issuer_->suspended_ = false;