X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d70f8e758b34f51465c538b127f9cc8c40634603..01b6b0c026e5fa6a87a45b53a4ce1e4dc580a358:/src/kernel/activity/ExecImpl.cpp diff --git a/src/kernel/activity/ExecImpl.cpp b/src/kernel/activity/ExecImpl.cpp index a55c1f3483..c1b58d5157 100644 --- a/src/kernel/activity/ExecImpl.cpp +++ b/src/kernel/activity/ExecImpl.cpp @@ -7,7 +7,7 @@ #include "simgrid/Exception.hpp" #include "simgrid/modelchecker.h" #include "src/mc/mc_replay.hpp" -#include "src/simix/smx_host_private.hpp" +#include "src/surf/HostImpl.hpp" #include "src/surf/cpu_interface.hpp" #include "src/surf/surf_interface.hpp" @@ -51,87 +51,105 @@ namespace simgrid { namespace kernel { namespace activity { -ExecImpl::ExecImpl(std::string name, std::string tracing_category, s4u::Host* host) - : ActivityImpl(std::move(name)), host_(host) +ExecImpl::~ExecImpl() { - this->state_ = SIMIX_RUNNING; - this->set_category(std::move(tracing_category)); + if (timeout_detector_) + timeout_detector_->unref(); + XBT_DEBUG("Destroy exec %p", this); +} - XBT_DEBUG("Create exec %p", this); +ExecImpl& ExecImpl::set_host(s4u::Host* host) +{ + if (not hosts_.empty()) + hosts_.clear(); + hosts_.push_back(host); + return *this; } -ExecImpl::ExecImpl(std::string name, std::string tracing_category, s4u::Host* host, double timeout) - : ExecImpl(std::move(name), std::move(tracing_category), nullptr) +ExecImpl& ExecImpl::set_hosts(const std::vector& hosts) +{ + hosts_ = hosts; + return *this; +} + +ExecImpl& ExecImpl::set_timeout(double timeout) { if (timeout > 0 && not MC_is_active() && not MC_record_replay_is_active()) { - timeout_detector_ = host->pimpl_cpu->sleep(timeout); + timeout_detector_ = hosts_.front()->pimpl_cpu->sleep(timeout); timeout_detector_->set_data(this); } - XBT_DEBUG("Create exec %p", this); + return *this; } -ExecImpl::~ExecImpl() +ExecImpl& ExecImpl::set_flops_amount(double flops_amount) { - if (surf_action_) - surf_action_->unref(); - if (timeout_detector_) - timeout_detector_->unref(); - XBT_DEBUG("Destroy exec %p", this); + if (not flops_amounts_.empty()) + flops_amounts_.clear(); + flops_amounts_.push_back(flops_amount); + return *this; +} + +ExecImpl& ExecImpl::set_flops_amounts(const std::vector& flops_amounts) +{ + flops_amounts_ = flops_amounts; + return *this; +} + +ExecImpl& ExecImpl::set_bytes_amounts(const std::vector& bytes_amounts) +{ + bytes_amounts_ = bytes_amounts; + + return *this; } -ExecImpl* ExecImpl::start(double flops_amount, double priority, double bound) +ExecImpl* ExecImpl::start() { + state_ = SIMIX_RUNNING; if (not MC_is_active() && not MC_record_replay_is_active()) { - surf_action_ = host_->pimpl_cpu->execution_start(flops_amount); + if (hosts_.size() == 1) { + surf_action_ = hosts_.front()->pimpl_cpu->execution_start(flops_amounts_.front()); + surf_action_->set_priority(priority_); + surf_action_->set_category(get_tracing_category()); + + if (bound_ > 0) + surf_action_->set_bound(bound_); + } else { + surf_action_ = surf_host_model->execute_parallel(hosts_, flops_amounts_.data(), bytes_amounts_.data(), -1); + } surf_action_->set_data(this); - surf_action_->set_priority(priority); - if (bound > 0) - surf_action_->set_bound(bound); } XBT_DEBUG("Create execute synchro %p: %s", this, get_cname()); - ExecImpl::on_creation(this); + ExecImpl::on_creation(*this); return this; } -void ExecImpl::cancel() +double ExecImpl::get_seq_remaining_ratio() { - XBT_VERB("This exec %p is canceled", this); - if (surf_action_ != nullptr) - surf_action_->cancel(); + return (surf_action_ == nullptr) ? 0 : surf_action_->get_remains() / surf_action_->get_cost(); } -double ExecImpl::get_remaining() +double ExecImpl::get_par_remaining_ratio() { - xbt_assert(host_ != nullptr, "Calling remains() on a parallel execution is not allowed. " - "We would need to return a vector instead of a scalar. " - "Did you mean remainingRatio() instead?"); - return surf_action_ ? surf_action_->get_remains() : 0; + // parallel task: their remain is already between 0 and 1 + return (surf_action_ == nullptr) ? 0 : surf_action_->get_remains(); } -double ExecImpl::get_remaining_ratio() +ExecImpl& ExecImpl::set_bound(double bound) { - if (host_ == - nullptr) // parallel task: their remain is already between 0 and 1 (see comment in ExecImpl::get_remaining()) - return (surf_action_ == nullptr) ? 0 : surf_action_->get_remains(); - else // Actually compute the ratio for sequential tasks - return (surf_action_ == nullptr) ? 0 : surf_action_->get_remains() / surf_action_->get_cost(); + bound_ = bound; + return *this; } -void ExecImpl::set_bound(double bound) +ExecImpl& ExecImpl::set_priority(double priority) { - if (surf_action_) - surf_action_->set_bound(bound); -} -void ExecImpl::set_priority(double priority) -{ - if (surf_action_) - surf_action_->set_priority(priority); + priority_ = priority; + return *this; } void ExecImpl::post() { - if (host_ && not host_->is_on()) { /* FIXME: handle resource failure for parallel tasks too */ + if (hosts_.size() == 1 && not hosts_.front()->is_on()) { /* FIXME: handle resource failure for parallel tasks too */ /* If the host running the synchro failed, notice it. This way, the asking * process can be killed if it runs on that host itself */ state_ = SIMIX_FAILED; @@ -144,7 +162,7 @@ void ExecImpl::post() state_ = SIMIX_DONE; } - on_completion(this); + on_completion(*this); if (surf_action_) { surf_action_->unref(); @@ -175,8 +193,10 @@ void ExecImpl::finish() case SIMIX_FAILED: XBT_DEBUG("ExecImpl::finish(): host '%s' failed", simcall->issuer->get_host()->get_cname()); simcall->issuer->context_->iwannadie = true; - simcall->issuer->exception_ = - std::make_exception_ptr(simgrid::HostFailureException(XBT_THROW_POINT, "Host failed")); + if (simcall->issuer->get_host()->is_on()) + simcall->issuer->exception_ = + std::make_exception_ptr(simgrid::HostFailureException(XBT_THROW_POINT, "Host failed")); + /* else, the actor will be killed with no possibility to survive */ break; case SIMIX_CANCELED: @@ -205,7 +225,7 @@ void ExecImpl::finish() } } -ActivityImpl* ExecImpl::migrate(simgrid::s4u::Host* to) +ActivityImpl* ExecImpl::migrate(s4u::Host* to) { if (not MC_is_active() && not MC_record_replay_is_active()) { resource::Action* old_action = this->surf_action_; @@ -223,16 +243,16 @@ ActivityImpl* ExecImpl::migrate(simgrid::s4u::Host* to) this->surf_action_ = new_action; } - on_migration(this, to); + on_migration(*this, to); return this; } /************* * Callbacks * *************/ -xbt::signal ExecImpl::on_creation; -xbt::signal ExecImpl::on_completion; -xbt::signal ExecImpl::on_migration; +xbt::signal ExecImpl::on_creation; +xbt::signal ExecImpl::on_completion; +xbt::signal ExecImpl::on_migration; } // namespace activity } // namespace kernel