X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/249e66b5d20dc77cef37e44f81eb07fc8f8ba293..d8748b89381091cabc8ed76c93d26c3e3b4b8cf4:/src/kernel/activity/ExecImpl.cpp diff --git a/src/kernel/activity/ExecImpl.cpp b/src/kernel/activity/ExecImpl.cpp index 5ecdf6a168..83e7e88da5 100644 --- a/src/kernel/activity/ExecImpl.cpp +++ b/src/kernel/activity/ExecImpl.cpp @@ -1,90 +1,154 @@ -/* Copyright (c) 2007-2017. 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. */ -#include "simgrid/s4u/Host.hpp" +#include "simgrid/modelchecker.h" +#include "src/mc/mc_replay.hpp" #include "src/kernel/activity/ExecImpl.hpp" #include "src/simix/smx_host_private.hpp" #include "src/surf/surf_interface.hpp" +#include "src/surf/cpu_interface.hpp" + +#include "simgrid/s4u/Host.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_process); +namespace simgrid { +namespace kernel { +namespace activity { -simgrid::kernel::activity::ExecImpl::ExecImpl(const char* name, sg_host_t host) : host_(host) +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) { - if (name) - this->name = name; - this->state = SIMIX_RUNNING; + this->state_ = SIMIX_RUNNING; + this->set_category(std::move(tracing_category)); + + if (timeout_detector != nullptr) + timeout_detector_->set_data(this); + XBT_DEBUG("Create exec %p", this); } -simgrid::kernel::activity::ExecImpl::~ExecImpl() +ExecImpl::~ExecImpl() { - if (surfAction_) - surfAction_->unref(); - if (timeoutDetector) - timeoutDetector->unref(); + if (surf_action_) + surf_action_->unref(); + if (timeout_detector_) + timeout_detector_->unref(); 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)", surfAction_->getRemains()); - if (surfAction_) - surfAction_->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); + } + + XBT_DEBUG("Create execute synchro %p: %s", this, get_cname()); + ExecImpl::on_creation(this); + return this; } -void simgrid::kernel::activity::ExecImpl::resume() +void ExecImpl::cancel() { - XBT_VERB("This exec is resumed (remain: %f)", surfAction_->getRemains()); - if (surfAction_) - surfAction_->resume(); + XBT_VERB("This exec %p is canceled", this); + if (surf_action_ != nullptr) + surf_action_->cancel(); } -double simgrid::kernel::activity::ExecImpl::remains() +double ExecImpl::get_remaining() { - if (host_ == nullptr) // parallel task: their remain is not in flops (we'd need a vector to express it this way - // instead of a scalar), but between 0 and 1 - throw new std::logic_error( - "The remaining work on parallel tasks cannot be defined as a scalar amount of flops (it's a vector). " - "So parallel_task->remains() is not defined. " - "You are probably looking for parallel_task->remainingRatio()."); - else // sequential task: everything's fine - return surfAction_->getRemains(); + 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::remainingRatio() + +double ExecImpl::get_remaining_ratio() { - if (host_ == nullptr) // parallel task: their remain is already between 0 and 1 (see comment in ExecImpl::remains()) - return surfAction_->getRemains(); + 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 surfAction_->getRemains() / surfAction_->getCost(); + return (surf_action_ == nullptr) ? 0 : surf_action_->get_remains() / surf_action_->get_cost(); +} + +void ExecImpl::set_bound(double bound) +{ + if (surf_action_) + surf_action_->set_bound(bound); +} +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_->isOff()) { /* 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 (surfAction_->getState() == simgrid::surf::Action::State::failed) { + 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() == resource::Action::State::FAILED) { /* If the host running the synchro didn't fail, then the synchro was canceled */ - state = SIMIX_CANCELED; - } else if (timeoutDetector && timeoutDetector->getState() == simgrid::surf::Action::State::done) { - state = SIMIX_TIMEOUT; + state_ = SIMIX_CANCELED; + } else if (timeout_detector_ && timeout_detector_->get_state() == resource::Action::State::FINISHED) { + state_ = SIMIX_TIMEOUT; } else { - state = SIMIX_DONE; + state_ = SIMIX_DONE; } - if (surfAction_) { - surfAction_->unref(); - surfAction_ = nullptr; + on_completion(this); + + if (surf_action_) { + surf_action_->unref(); + surf_action_ = nullptr; } - if (timeoutDetector) { - timeoutDetector->unref(); - timeoutDetector = nullptr; + if (timeout_detector_) { + timeout_detector_->unref(); + timeout_detector_ = nullptr; } /* If there are simcalls associated with the synchro, then answer them */ - if (not simcalls.empty()) + if (not simcalls_.empty()) SIMIX_execution_finish(this); } + +ActivityImpl* ExecImpl::migrate(simgrid::s4u::Host* to) +{ + if (not MC_is_active() && not MC_record_replay_is_active()) { + 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()); + + // FIXME: the user-defined bound seem to not be kept by LMM, that seem to overwrite it for the multi-core modeling. + // I hope that the user did not provide any. + + old_action->set_data(nullptr); + old_action->cancel(); + old_action->unref(); + this->surf_action_ = new_action; + } + + on_migration(this, to); + return this; +} + +/************* + * Callbacks * + *************/ +xbt::signal ExecImpl::on_creation; +xbt::signal ExecImpl::on_completion; +xbt::signal ExecImpl::on_migration; + +} // namespace activity +} // namespace kernel +} // namespace simgrid