X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/12ad1e7c01058fada33cecf2d4c4cb8bf9874f9e..bdaff2753e3c9371e8122ffaf0694581b458d80d:/src/kernel/activity/ExecImpl.cpp diff --git a/src/kernel/activity/ExecImpl.cpp b/src/kernel/activity/ExecImpl.cpp index d233924b56..ebfa43b320 100644 --- a/src/kernel/activity/ExecImpl.cpp +++ b/src/kernel/activity/ExecImpl.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2018. 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. */ @@ -11,84 +11,114 @@ #include "src/surf/surf_interface.hpp" #include "src/surf/cpu_interface.hpp" - #include "simgrid/s4u/Host.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_process); -simgrid::kernel::activity::ExecImpl::ExecImpl(const char* name, sg_host_t host) : host_(host) +simgrid::kernel::activity::ExecImpl::ExecImpl(const char* name, resource::Action* surf_action, + resource::Action* timeout_detector, s4u::Host* host) + : host_(host) { if (name) - this->name = name; - this->state = SIMIX_RUNNING; + this->name_ = name; + this->state_ = SIMIX_RUNNING; + + surf_action_ = surf_action; + surf_action_->set_data(this); + if (timeout_detector != nullptr) { + timeout_detector->set_data(this); + timeout_detector_ = timeout_detector; + } + XBT_DEBUG("Create exec %p", this); } simgrid::kernel::activity::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() { - XBT_VERB("This exec is suspended (remain: %f)", surfAction_->getRemains()); - if (surfAction_) - surfAction_->suspend(); + XBT_VERB("This exec is suspended (remain: %f)", surf_action_->get_remains()); + if (surf_action_ != nullptr) + surf_action_->suspend(); } void simgrid::kernel::activity::ExecImpl::resume() { - XBT_VERB("This exec is resumed (remain: %f)", surfAction_->getRemains()); - if (surfAction_) - surfAction_->resume(); + XBT_VERB("This exec is resumed (remain: %f)", surf_action_->get_remains()); + if (surf_action_ != nullptr) + surf_action_->resume(); +} +void simgrid::kernel::activity::ExecImpl::cancel() +{ + XBT_VERB("This exec %p is canceled", this); + if (surf_action_ != nullptr) + surf_action_->cancel(); } -double simgrid::kernel::activity::ExecImpl::remains() +double simgrid::kernel::activity::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 meant remainingRatio() instead?"); + "Did you mean remainingRatio() instead?"); - return surfAction_ ? surfAction_->getRemains() : 0; + return surf_action_ ? surf_action_->get_remains() : 0; } -double simgrid::kernel::activity::ExecImpl::remainingRatio() + +double simgrid::kernel::activity::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_->get_remains(); else // Actually compute the ratio for sequential tasks - return surfAction_->getRemains() / surfAction_->getCost(); + return surf_action_->get_remains() / surf_action_->get_cost(); +} + +void simgrid::kernel::activity::ExecImpl::set_bound(double bound) +{ + if (surf_action_) + surf_action_->set_bound(bound); +} +void simgrid::kernel::activity::ExecImpl::set_priority(double priority) +{ + if (surf_action_) + surf_action_->set_priority(priority); } void simgrid::kernel::activity::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_ && host_->is_off()) { /* 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) { /* 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() == simgrid::kernel::resource::Action::State::FINISHED) { + state_ = SIMIX_TIMEOUT; } else { - state = SIMIX_DONE; + state_ = SIMIX_DONE; } - if (surfAction_) { - surfAction_->unref(); - surfAction_ = nullptr; + if (surf_action_) { + surf_action_->unref(); + surf_action_ = nullptr; } - if (timeoutDetector) { - timeoutDetector->unref(); - timeoutDetector = nullptr; + if (timeout_detector_) { + timeout_detector_->unref(); + timeout_detector_ = nullptr; } onCompletion(this); /* If there are simcalls associated with the synchro, then answer them */ - if (not simcalls.empty()) + if (not simcalls_.empty()) SIMIX_execution_finish(this); } @@ -97,26 +127,25 @@ simgrid::kernel::activity::ExecImpl::migrate(simgrid::s4u::Host* to) { if (not MC_is_active() && not MC_record_replay_is_active()) { - surf_action_t oldAction = this->surfAction_; - surf_action_t newAction = to->pimpl_cpu->execution_start(oldAction->getCost()); - newAction->setRemains(oldAction->getRemains()); - newAction->setData(this); - newAction->setSharingWeight(oldAction->getPriority()); + simgrid::kernel::resource::Action* old_action = this->surf_action_; + simgrid::kernel::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. - oldAction->setData(nullptr); - oldAction->cancel(); - oldAction->unref(); - this->surfAction_ = newAction; + old_action->set_data(nullptr); + old_action->cancel(); + old_action->unref(); + this->surf_action_ = new_action; } onMigration(this, to); return this; } - /************* * Callbacks * *************/