X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/14fcd43761ba2212ae5e48832a71ecf6c8f2b9f3..5ed37babb2fa9097abe82df299c0aa259ed84d5a:/src/kernel/activity/IoImpl.cpp?ds=sidebyside diff --git a/src/kernel/activity/IoImpl.cpp b/src/kernel/activity/IoImpl.cpp index f2c5bdcafe..21b55c90ed 100644 --- a/src/kernel/activity/IoImpl.cpp +++ b/src/kernel/activity/IoImpl.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2022. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2023. 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. */ @@ -12,16 +12,14 @@ #include "src/kernel/activity/IoImpl.hpp" #include "src/kernel/actor/ActorImpl.hpp" #include "src/kernel/actor/SimcallObserver.hpp" -#include "src/kernel/context/Context.hpp" #include "src/kernel/resource/CpuImpl.hpp" #include "src/kernel/resource/DiskImpl.hpp" #include "src/mc/mc_replay.hpp" +#include "src/surf/HostImpl.hpp" -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_io, simix, "Logging specific to SIMIX (io)"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_io, kernel, "Kernel io-related synchronization"); -namespace simgrid { -namespace kernel { -namespace activity { +namespace simgrid::kernel::activity { IoImpl::IoImpl() { @@ -29,7 +27,7 @@ IoImpl::IoImpl() actor::ActorImpl* self = actor::ActorImpl::self(); if (self) { set_actor(self); - self->activities_.emplace_back(this); + self->activities_.insert(this); } } @@ -72,12 +70,37 @@ IoImpl& IoImpl::set_disk(resource::DiskImpl* disk) return *this; } +IoImpl& IoImpl::set_host(s4u::Host* host) +{ + host_ = host; + return *this; +} + +IoImpl& IoImpl::set_dst_disk(resource::DiskImpl* disk) +{ + dst_disk_ = disk; + return *this; +} + +IoImpl& IoImpl::set_dst_host(s4u::Host* host) +{ + dst_host_ = host; + return *this; +} + IoImpl* IoImpl::start() { set_state(State::RUNNING); - surf_action_ = - disk_->get_host()->get_netpoint()->get_englobing_zone()->get_disk_model()->io_start(disk_, size_, type_); - surf_action_->set_sharing_penalty(sharing_penalty_); + if (dst_host_ == nullptr) { + XBT_DEBUG("Starting regular I/O"); + surf_action_ = disk_->io_start(size_, type_); + surf_action_->set_sharing_penalty(sharing_penalty_); + } else { + XBT_DEBUG("Starting streaming I/O"); + auto host_model = dst_host_->get_netpoint()->get_englobing_zone()->get_host_model(); + surf_action_ = host_model->io_stream(host_, disk_, dst_host_, dst_disk_, size_); + } + surf_action_->set_activity(this); set_start_time(surf_action_->get_start_time()); @@ -90,17 +113,19 @@ void IoImpl::post() { performed_ioops_ = surf_action_->get_cost(); if (surf_action_->get_state() == resource::Action::State::FAILED) { - if (disk_ && not disk_->is_on()) + if (host_ && dst_host_) { // this is an I/O stream + if (not host_->is_on()) + set_state(State::SRC_HOST_FAILURE); + else if (not dst_host_->is_on()) + set_state(State::DST_HOST_FAILURE); + } else if ((disk_ && not disk_->is_on()) || (dst_disk_ && not dst_disk_->is_on())) set_state(State::FAILED); else set_state(State::CANCELED); - } else if (timeout_detector_ && timeout_detector_->get_state() == resource::Action::State::FINISHED) { - if (surf_action_->get_remains() > 0.0) { - surf_action_->set_state(resource::Action::State::FAILED); - set_state(State::TIMEOUT); - } else { - set_state(State::DONE); - } + } else if (timeout_detector_ && timeout_detector_->get_state() == resource::Action::State::FINISHED && + surf_action_->get_remains() > 0.0) { + surf_action_->set_state(resource::Action::State::FAILED); + set_state(State::TIMEOUT); } else { set_state(State::DONE); } @@ -118,13 +143,19 @@ void IoImpl::set_exception(actor::ActorImpl* issuer) { switch (get_state()) { case State::FAILED: - issuer->context_->set_wannadie(); + issuer->set_wannadie(); static_cast(get_iface())->complete(s4u::Activity::State::FAILED); issuer->exception_ = std::make_exception_ptr(StorageFailureException(XBT_THROW_POINT, "Storage failed")); break; case State::CANCELED: issuer->exception_ = std::make_exception_ptr(CancelException(XBT_THROW_POINT, "I/O Canceled")); break; + case State::SRC_HOST_FAILURE: + case State::DST_HOST_FAILURE: + issuer->set_wannadie(); + static_cast(get_iface())->complete(s4u::Activity::State::FAILED); + issuer->exception_ = std::make_exception_ptr(StorageFailureException(XBT_THROW_POINT, "Host failed")); + break; case State::TIMEOUT: issuer->exception_ = std::make_exception_ptr(TimeoutException(XBT_THROW_POINT, "Timeouted")); break; @@ -138,67 +169,29 @@ void IoImpl::finish() { XBT_DEBUG("IoImpl::finish() in state %s", get_state_str()); while (not simcalls_.empty()) { - smx_simcall_t simcall = simcalls_.front(); + actor::Simcall* simcall = simcalls_.front(); simcalls_.pop_front(); /* If a waitany simcall is waiting for this synchro to finish, then remove it from the other synchros in the waitany * list. Afterwards, get the position of the actual synchro in the waitany list and return it as the result of the * simcall */ - if (simcall->call_ == simix::Simcall::NONE) // FIXME: maybe a better way to handle this case - continue; // if process handling comm is killed - if (auto* observer = dynamic_cast(simcall->observer_)) { // simcall is a wait_any? - const auto& ios = observer->get_ios(); - - for (auto* io : ios) { - io->unregister_simcall(simcall); + if (simcall->call_ == actor::Simcall::Type::NONE) // FIXME: maybe a better way to handle this case + continue; // if process handling comm is killed - if (simcall->timeout_cb_) { - simcall->timeout_cb_->remove(); - simcall->timeout_cb_ = nullptr; - } - } + handle_activity_waitany(simcall); - if (not MC_is_active() && not MC_record_replay_is_active()) { - auto element = std::find(ios.begin(), ios.end(), this); - int rank = element != ios.end() ? static_cast(std::distance(ios.begin(), element)) : -1; - observer->set_result(rank); + if (not simcall->issuer_->get_host()->is_on()) { + simcall->issuer_->set_wannadie(); + } else { + // Do not answer to dying actors + if (not simcall->issuer_->wannadie()) { + set_exception(simcall->issuer_); + simcall->issuer_->waiting_synchro_ = nullptr; + simcall->issuer_->simcall_answer(); } } - - set_exception(simcall->issuer_); - - simcall->issuer_->waiting_synchro_ = nullptr; - simcall->issuer_->simcall_answer(); - } -} - -void IoImpl::wait_any_for(actor::ActorImpl* issuer, const std::vector& ios, double timeout) -{ - if (timeout < 0.0) { - issuer->simcall_.timeout_cb_ = nullptr; - } else { - issuer->simcall_.timeout_cb_ = timer::Timer::set(s4u::Engine::get_clock() + timeout, [issuer, &ios]() { - issuer->simcall_.timeout_cb_ = nullptr; - for (auto* io : ios) - io->unregister_simcall(&issuer->simcall_); - // default result (-1) is set in actor::IoWaitanySimcall - issuer->simcall_answer(); - }); - } - - for (auto* io : ios) { - /* associate this simcall to the the synchro */ - io->simcalls_.push_back(&issuer->simcall_); - - /* see if the synchro is already finished */ - if (io->get_state() != State::WAITING && io->get_state() != State::RUNNING) { - io->finish(); - break; - } } } -} // namespace activity -} // namespace kernel -} // namespace simgrid +} // namespace simgrid::kernel::activity