X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2ef59b0adb027b30c217be9b19ee418841aa7885..d07491b881cc0dd542507d598e1099f178b79c59:/src/kernel/activity/ExecImpl.cpp diff --git a/src/kernel/activity/ExecImpl.cpp b/src/kernel/activity/ExecImpl.cpp index 17fdf8da28..83e7e88da5 100644 --- a/src/kernel/activity/ExecImpl.cpp +++ b/src/kernel/activity/ExecImpl.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2019. 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. */ @@ -14,21 +14,23 @@ #include "simgrid/s4u/Host.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_process); +namespace simgrid { +namespace kernel { +namespace activity { -simgrid::kernel::activity::ExecImpl::ExecImpl(std::string name, resource::Action* surf_action, - resource::Action* timeout_detector, s4u::Host* host) - : ActivityImpl(name), host_(host), surf_action_(surf_action), timeout_detector_(timeout_detector) +ExecImpl::ExecImpl(std::string name, std::string tracing_category, resource::Action* timeout_detector, s4u::Host* host) + : ActivityImpl(std::move(name)), host_(host), timeout_detector_(timeout_detector) { this->state_ = SIMIX_RUNNING; + this->set_category(std::move(tracing_category)); - surf_action_->set_data(this); if (timeout_detector != nullptr) - timeout_detector->set_data(this); + timeout_detector_->set_data(this); XBT_DEBUG("Create exec %p", this); } -simgrid::kernel::activity::ExecImpl::~ExecImpl() +ExecImpl::~ExecImpl() { if (surf_action_) surf_action_->unref(); @@ -37,71 +39,73 @@ simgrid::kernel::activity::ExecImpl::~ExecImpl() XBT_DEBUG("Destroy exec %p", this); } -void simgrid::kernel::activity::ExecImpl::suspend() +ExecImpl* ExecImpl::start(double flops_amount, double priority, double bound) { - XBT_VERB("This exec is suspended (remain: %f)", surf_action_->get_remains()); - if (surf_action_ != nullptr) - surf_action_->suspend(); -} + if (not MC_is_active() && not MC_record_replay_is_active()) { + surf_action_ = host_->pimpl_cpu->execution_start(flops_amount); + surf_action_->set_data(this); + surf_action_->set_priority(priority); + if (bound > 0) + surf_action_->set_bound(bound); + } -void simgrid::kernel::activity::ExecImpl::resume() -{ - XBT_VERB("This exec is resumed (remain: %f)", surf_action_->get_remains()); - if (surf_action_ != nullptr) - surf_action_->resume(); + XBT_DEBUG("Create execute synchro %p: %s", this, get_cname()); + ExecImpl::on_creation(this); + return this; } -void simgrid::kernel::activity::ExecImpl::cancel() + +void ExecImpl::cancel() { XBT_VERB("This exec %p is canceled", this); if (surf_action_ != nullptr) surf_action_->cancel(); } -double simgrid::kernel::activity::ExecImpl::get_remaining() +double ExecImpl::get_remaining() { 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; } -double simgrid::kernel::activity::ExecImpl::get_remaining_ratio() +double ExecImpl::get_remaining_ratio() { if (host_ == nullptr) // parallel task: their remain is already between 0 and 1 (see comment in ExecImpl::get_remaining()) - return surf_action_->get_remains(); + return (surf_action_ == nullptr) ? 0 : surf_action_->get_remains(); else // Actually compute the ratio for sequential tasks - return surf_action_->get_remains() / surf_action_->get_cost(); + return (surf_action_ == nullptr) ? 0 : surf_action_->get_remains() / surf_action_->get_cost(); } -void simgrid::kernel::activity::ExecImpl::set_bound(double bound) +void ExecImpl::set_bound(double bound) { if (surf_action_) surf_action_->set_bound(bound); } -void simgrid::kernel::activity::ExecImpl::set_priority(double priority) +void ExecImpl::set_priority(double priority) { if (surf_action_) surf_action_->set_priority(priority); } -void simgrid::kernel::activity::ExecImpl::post() +void ExecImpl::post() { - if (host_ && host_->is_off()) { /* FIXME: handle resource failure for parallel tasks too */ + if (host_ && not host_->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; - } else if (surf_action_ && surf_action_->get_state() == simgrid::kernel::resource::Action::State::FAILED) { + } else if (surf_action_ && surf_action_->get_state() == resource::Action::State::FAILED) { /* If the host running the synchro didn't fail, then the synchro was canceled */ state_ = SIMIX_CANCELED; - } else if (timeout_detector_ && - timeout_detector_->get_state() == simgrid::kernel::resource::Action::State::FINISHED) { + } else if (timeout_detector_ && timeout_detector_->get_state() == resource::Action::State::FINISHED) { state_ = SIMIX_TIMEOUT; } else { state_ = SIMIX_DONE; } + on_completion(this); + if (surf_action_) { surf_action_->unref(); surf_action_ = nullptr; @@ -111,19 +115,16 @@ void simgrid::kernel::activity::ExecImpl::post() timeout_detector_ = nullptr; } - on_completion(this); /* If there are simcalls associated with the synchro, then answer them */ if (not simcalls_.empty()) SIMIX_execution_finish(this); } -simgrid::kernel::activity::ActivityImpl* -simgrid::kernel::activity::ExecImpl::migrate(simgrid::s4u::Host* to) +ActivityImpl* ExecImpl::migrate(simgrid::s4u::Host* to) { - if (not MC_is_active() && not MC_record_replay_is_active()) { - simgrid::kernel::resource::Action* old_action = this->surf_action_; - simgrid::kernel::resource::Action* new_action = to->pimpl_cpu->execution_start(old_action->get_cost()); + resource::Action* old_action = this->surf_action_; + resource::Action* new_action = to->pimpl_cpu->execution_start(old_action->get_cost()); new_action->set_remains(old_action->get_remains()); new_action->set_data(this); new_action->set_priority(old_action->get_priority()); @@ -144,7 +145,10 @@ simgrid::kernel::activity::ExecImpl::migrate(simgrid::s4u::Host* to) /************* * Callbacks * *************/ -simgrid::xbt::signal simgrid::kernel::activity::ExecImpl::on_creation; -simgrid::xbt::signal simgrid::kernel::activity::ExecImpl::on_completion; -simgrid::xbt::signal - simgrid::kernel::activity::ExecImpl::on_migration; +xbt::signal ExecImpl::on_creation; +xbt::signal ExecImpl::on_completion; +xbt::signal ExecImpl::on_migration; + +} // namespace activity +} // namespace kernel +} // namespace simgrid