X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/436a2af9265f32c1310ef418c0b7a3ddad08066e..56a36758ad8874ca56616e24aad37e2eac17e998:/src/kernel/activity/ExecImpl.cpp diff --git a/src/kernel/activity/ExecImpl.cpp b/src/kernel/activity/ExecImpl.cpp index ac22116526..9cb7149ab2 100644 --- a/src/kernel/activity/ExecImpl.cpp +++ b/src/kernel/activity/ExecImpl.cpp @@ -15,51 +15,46 @@ 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, resource::Action* surf_action, resource::Action* timeout_detector, s4u::Host* host) - : host_(host) + : ActivityImpl(name), host_(host), surf_action_(surf_action), timeout_detector_(timeout_detector) { - if (name) - this->name = name; - this->state = SIMIX_RUNNING; + this->state_ = SIMIX_RUNNING; - surfAction_ = surf_action; - surfAction_->set_data(this); - if (timeout_detector != nullptr) { + surf_action_->set_data(this); + if (timeout_detector != nullptr) timeout_detector->set_data(this); - timeoutDetector = 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_->get_remains()); - if (surfAction_ != nullptr) - 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_->get_remains()); - if (surfAction_ != nullptr) - 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 (surfAction_ != nullptr) - surfAction_->cancel(); + if (surf_action_ != nullptr) + surf_action_->cancel(); } double simgrid::kernel::activity::ExecImpl::get_remaining() @@ -68,55 +63,57 @@ double simgrid::kernel::activity::ExecImpl::get_remaining() "We would need to return a vector instead of a scalar. " "Did you mean remainingRatio() instead?"); - return surfAction_ ? surfAction_->get_remains() : 0; + return surf_action_ ? surf_action_->get_remains() : 0; } 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_->get_remains(); + 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_->get_remains() / surfAction_->get_cost(); + return (surf_action_ == nullptr) ? 0 : surf_action_->get_remains() / surf_action_->get_cost(); } void simgrid::kernel::activity::ExecImpl::set_bound(double bound) { - if (surfAction_) - surfAction_->set_bound(bound); + if (surf_action_) + surf_action_->set_bound(bound); } void simgrid::kernel::activity::ExecImpl::set_priority(double priority) { - if (surfAction_) - surfAction_->set_priority(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_ && surfAction_->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 (timeoutDetector && timeoutDetector->get_state() == simgrid::kernel::resource::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); + on_completion(this); /* If there are simcalls associated with the synchro, then answer them */ - if (not simcalls.empty()) + if (not simcalls_.empty()) SIMIX_execution_finish(this); } @@ -125,28 +122,29 @@ 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->surfAction_; - 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->surfAction_ = 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_migration;