X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/89047acf6125582321f8e86f9765b0f57e350e2c..6daf179640c4438bb442671e641d304acefe263e:/src/kernel/activity/ExecImpl.cpp diff --git a/src/kernel/activity/ExecImpl.cpp b/src/kernel/activity/ExecImpl.cpp index 20c99682d6..3cd26b0bbb 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. */ @@ -15,20 +15,15 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_process); -simgrid::kernel::activity::ExecImpl::ExecImpl(const char* name, resource::Action* surf_action, +simgrid::kernel::activity::ExecImpl::ExecImpl(std::string name, std::string tracing_category, resource::Action* timeout_detector, s4u::Host* host) - : host_(host) + : ActivityImpl(name), host_(host), timeout_detector_(timeout_detector) { - if (name) - this->name_ = name; this->state_ = SIMIX_RUNNING; + this->set_category(tracing_category); - surf_action_ = surf_action; - surf_action_->set_data(this); - if (timeout_detector != nullptr) { - timeout_detector->set_data(this); - timeout_detector_ = timeout_detector; - } + if (timeout_detector != nullptr) + timeout_detector_->set_data(this); XBT_DEBUG("Create exec %p", this); } @@ -42,11 +37,26 @@ simgrid::kernel::activity::ExecImpl::~ExecImpl() XBT_DEBUG("Destroy exec %p", this); } +void simgrid::kernel::activity::ExecImpl::start(double flops_amount, double priority, double bound) +{ + 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, name_.c_str()); + simgrid::kernel::activity::ExecImpl::on_creation(this); +} + void simgrid::kernel::activity::ExecImpl::suspend() { XBT_VERB("This exec is suspended (remain: %f)", surf_action_->get_remains()); if (surf_action_ != nullptr) surf_action_->suspend(); + on_suspended(this); } void simgrid::kernel::activity::ExecImpl::resume() @@ -54,6 +64,7 @@ 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(); + on_resumed(this); } void simgrid::kernel::activity::ExecImpl::cancel() { @@ -75,9 +86,9 @@ 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::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) @@ -91,21 +102,30 @@ void simgrid::kernel::activity::ExecImpl::set_priority(double priority) surf_action_->set_priority(priority); } +void simgrid::kernel::activity::ExecImpl::set_category(std::string category) +{ + if (surf_action_) + surf_action_->set_category(category); +} + 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 (surf_action_ && surf_action_->get_state() == simgrid::kernel::resource::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 (timeout_detector_ && timeout_detector_->get_state() == simgrid::kernel::resource::Action::State::done) { + } else if (timeout_detector_ && + timeout_detector_->get_state() == simgrid::kernel::resource::Action::State::FINISHED) { state_ = SIMIX_TIMEOUT; } else { state_ = SIMIX_DONE; } + on_completion(this); + if (surf_action_) { surf_action_->unref(); surf_action_ = nullptr; @@ -115,7 +135,6 @@ void simgrid::kernel::activity::ExecImpl::post() timeout_detector_ = nullptr; } - onCompletion(this); /* If there are simcalls associated with the synchro, then answer them */ if (not simcalls_.empty()) SIMIX_execution_finish(this); @@ -126,28 +145,31 @@ simgrid::kernel::activity::ExecImpl::migrate(simgrid::s4u::Host* to) { if (not MC_is_active() && not MC_record_replay_is_active()) { - simgrid::kernel::resource::Action* oldAction = this->surf_action_; - simgrid::kernel::resource::Action* newAction = to->pimpl_cpu->execution_start(oldAction->get_cost()); - newAction->set_remains(oldAction->get_remains()); - newAction->set_data(this); - newAction->set_priority(oldAction->get_priority()); + 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->set_data(nullptr); - oldAction->cancel(); - oldAction->unref(); - this->surf_action_ = newAction; + old_action->set_data(nullptr); + old_action->cancel(); + old_action->unref(); + this->surf_action_ = new_action; } - onMigration(this, to); + on_migration(this, to); return this; } /************* * Callbacks * *************/ -simgrid::xbt::signal simgrid::kernel::activity::ExecImpl::onCreation; -simgrid::xbt::signal simgrid::kernel::activity::ExecImpl::onCompletion; -simgrid::xbt::signal simgrid::kernel::activity::ExecImpl::onMigration; +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_resumed; +simgrid::xbt::signal simgrid::kernel::activity::ExecImpl::on_suspended; +simgrid::xbt::signal + simgrid::kernel::activity::ExecImpl::on_migration;