-/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-2022. 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/Exception.hpp>
+#include <simgrid/kernel/routing/NetPoint.hpp>
+#include <simgrid/modelchecker.h>
+#include <simgrid/s4u/Engine.hpp>
+
#include "src/kernel/activity/ExecImpl.hpp"
-#include "simgrid/Exception.hpp"
-#include "simgrid/modelchecker.h"
+#include "src/kernel/actor/ActorImpl.hpp"
+#include "src/kernel/actor/SimcallObserver.hpp"
+#include "src/kernel/resource/CpuImpl.hpp"
#include "src/mc/mc_replay.hpp"
#include "src/surf/HostImpl.hpp"
-#include "src/surf/cpu_interface.hpp"
-#include "src/surf/surf_interface.hpp"
-
-#include "simgrid/s4u/Host.hpp"
-
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_process);
-void simcall_HANDLER_execution_wait(smx_simcall_t simcall, simgrid::kernel::activity::ExecImpl* synchro)
-{
- XBT_DEBUG("Wait for execution of synchro %p, state %d", synchro, (int)synchro->state_);
-
- /* Associate this simcall to the synchro */
- synchro->register_simcall(simcall);
-
- /* set surf's synchro */
- if (MC_is_active() || MC_record_replay_is_active()) {
- synchro->state_ = SIMIX_DONE;
- synchro->finish();
- return;
- }
-
- /* If the synchro is already finished then perform the error handling */
- if (synchro->state_ != SIMIX_RUNNING)
- synchro->finish();
-}
-
-void simcall_HANDLER_execution_test(smx_simcall_t simcall, simgrid::kernel::activity::ExecImpl* synchro)
-{
- bool res = (synchro->state_ != SIMIX_WAITING && synchro->state_ != SIMIX_RUNNING);
- if (res) {
- synchro->simcalls_.push_back(simcall);
- synchro->finish();
- } else {
- SIMIX_simcall_answer(simcall);
- }
- simcall_execution_test__set__result(simcall, res);
-}
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_cpu, kernel, "Kernel cpu-related synchronization");
namespace simgrid {
namespace kernel {
namespace activity {
-ExecImpl::~ExecImpl()
+ExecImpl::ExecImpl()
{
- if (timeout_detector_)
- timeout_detector_->unref();
- XBT_DEBUG("Destroy exec %p", this);
+ piface_ = new s4u::Exec(this);
+ actor::ActorImpl* self = actor::ActorImpl::self();
+ if (self) {
+ set_actor(self);
+ self->activities_.emplace_back(this);
+ }
}
ExecImpl& ExecImpl::set_host(s4u::Host* host)
{
- if (not hosts_.empty())
- hosts_.clear();
- hosts_.push_back(host);
+ hosts_.assign(1, host);
return *this;
}
ExecImpl& ExecImpl::set_timeout(double timeout)
{
- if (timeout > 0 && not MC_is_active() && not MC_record_replay_is_active()) {
- timeout_detector_ = hosts_.front()->pimpl_cpu->sleep(timeout);
+ if (timeout >= 0 && not MC_is_active() && not MC_record_replay_is_active()) {
+ timeout_detector_.reset(hosts_.front()->get_cpu()->sleep(timeout));
timeout_detector_->set_activity(this);
}
return *this;
ExecImpl& ExecImpl::set_flops_amount(double flops_amount)
{
- if (not flops_amounts_.empty())
- flops_amounts_.clear();
- flops_amounts_.push_back(flops_amount);
+ flops_amounts_.assign(1, flops_amount);
return *this;
}
return *this;
}
+ExecImpl& ExecImpl::set_thread_count(int thread_count)
+{
+ thread_count_ = thread_count;
+
+ return *this;
+}
ExecImpl* ExecImpl::start()
{
- state_ = SIMIX_RUNNING;
+ set_state(State::RUNNING);
if (not MC_is_active() && not MC_record_replay_is_active()) {
if (hosts_.size() == 1) {
- surf_action_ = hosts_.front()->pimpl_cpu->execution_start(flops_amounts_.front());
- surf_action_->set_priority(priority_);
+ if (thread_count_ == 1) {
+ surf_action_ = hosts_.front()->get_cpu()->execution_start(flops_amounts_.front(), bound_);
+ surf_action_->set_sharing_penalty(sharing_penalty_);
+ } else {
+ auto host_model = hosts_.front()->get_netpoint()->get_englobing_zone()->get_host_model();
+ surf_action_ = host_model->execute_thread(hosts_.front(), flops_amounts_.front(), thread_count_);
+ }
surf_action_->set_category(get_tracing_category());
-
- if (bound_ > 0)
- surf_action_->set_bound(bound_);
} else {
- surf_action_ = surf_host_model->execute_parallel(hosts_, flops_amounts_.data(), bytes_amounts_.data(), -1);
+ // get the model from first host since we have only 1 by now
+ auto host_model = hosts_.front()->get_netpoint()->get_englobing_zone()->get_host_model();
+ surf_action_ = host_model->execute_parallel(hosts_, flops_amounts_.data(), bytes_amounts_.data(), -1);
}
surf_action_->set_activity(this);
+ set_start_time(surf_action_->get_start_time());
}
XBT_DEBUG("Create execute synchro %p: %s", this, get_cname());
- ExecImpl::on_creation(*this);
return this;
}
+double ExecImpl::get_remaining() const
+{
+ if (get_state() == State::WAITING || get_state() == State::FAILED)
+ return flops_amounts_.front();
+ return ActivityImpl::get_remaining();
+}
+
double ExecImpl::get_seq_remaining_ratio()
{
+ if (get_state() == State::WAITING)
+ return 1;
return (surf_action_ == nullptr) ? 0 : surf_action_->get_remains() / surf_action_->get_cost();
}
double ExecImpl::get_par_remaining_ratio()
{
// parallel task: their remain is already between 0 and 1
+ if (get_state() == State::WAITING)
+ return 1;
return (surf_action_ == nullptr) ? 0 : surf_action_->get_remains();
}
return *this;
}
-ExecImpl& ExecImpl::set_priority(double priority)
+ExecImpl& ExecImpl::set_sharing_penalty(double sharing_penalty)
+{
+ sharing_penalty_ = sharing_penalty;
+ return *this;
+}
+
+ExecImpl& ExecImpl::update_sharing_penalty(double sharing_penalty)
{
- priority_ = priority;
+ sharing_penalty_ = sharing_penalty;
+ surf_action_->set_sharing_penalty(sharing_penalty);
return *this;
}
void ExecImpl::post()
{
- if (hosts_.size() == 1 && not hosts_.front()->is_on()) { /* FIXME: handle resource failure for parallel tasks too */
- /* If the host running the synchro failed, notice it. This way, the asking
+ xbt_assert(surf_action_ != nullptr);
+ if (std::any_of(hosts_.begin(), hosts_.end(), [](const s4u::Host* host) { return not host->is_on(); })) {
+ /* If one of the hosts 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;
+ set_state(State::FAILED);
+ } else if (surf_action_->get_state() == resource::Action::State::FAILED) {
+ /* If all the hosts are running the synchro didn't fail, then the synchro was canceled */
+ set_state(State::CANCELED);
} else if (timeout_detector_ && timeout_detector_->get_state() == resource::Action::State::FINISHED) {
- state_ = SIMIX_TIMEOUT;
+ if (surf_action_->get_remains() > 0.0) {
+ surf_action_->set_state(resource::Action::State::FAILED);
+ set_state(State::TIMEOUT);
+ } else {
+ set_state(State::DONE);
+ }
} else {
- state_ = SIMIX_DONE;
+ set_state(State::DONE);
}
- on_completion(*this);
-
clean_action();
-
- if (timeout_detector_) {
- timeout_detector_->unref();
- timeout_detector_ = nullptr;
+ timeout_detector_.reset();
+ if (get_actor() != nullptr) {
+ get_actor()->activities_.remove(this);
}
-
- /* If there are simcalls associated with the synchro, then answer them */
- if (not simcalls_.empty())
- finish();
+ if (get_state() != State::FAILED && cb_id_ >= 0)
+ s4u::Host::on_state_change.disconnect(cb_id_);
+ /* Answer all simcalls associated with the synchro */
+ finish();
}
+void ExecImpl::set_exception(actor::ActorImpl* issuer)
+{
+ switch (get_state()) {
+ case State::FAILED:
+ static_cast<s4u::Exec*>(get_iface())->complete(s4u::Activity::State::FAILED);
+ if (issuer->get_host()->is_on())
+ issuer->exception_ = std::make_exception_ptr(HostFailureException(XBT_THROW_POINT, "Host failed"));
+ else /* else, the actor will be killed with no possibility to survive */
+ issuer->set_wannadie();
+ break;
+
+ case State::CANCELED:
+ issuer->exception_ = std::make_exception_ptr(CancelException(XBT_THROW_POINT, "Execution Canceled"));
+ break;
+
+ case State::TIMEOUT:
+ issuer->exception_ = std::make_exception_ptr(TimeoutException(XBT_THROW_POINT, "Timeouted"));
+ break;
+
+ default:
+ xbt_assert(get_state() == State::DONE, "Internal error in ExecImpl::finish(): unexpected synchro state %s",
+ get_state_str());
+ }
+}
void ExecImpl::finish()
{
+ XBT_DEBUG("ExecImpl::finish() in state %s", get_state_str());
while (not simcalls_.empty()) {
- smx_simcall_t simcall = simcalls_.front();
+ actor::Simcall* simcall = simcalls_.front();
simcalls_.pop_front();
- switch (state_) {
-
- case SIMIX_DONE:
- /* do nothing, synchro done */
- XBT_DEBUG("ExecImpl::finish(): execution successful");
- break;
-
- case SIMIX_FAILED:
- XBT_DEBUG("ExecImpl::finish(): host '%s' failed", simcall->issuer->get_host()->get_cname());
- simcall->issuer->context_->iwannadie = true;
- if (simcall->issuer->get_host()->is_on())
- simcall->issuer->exception_ =
- std::make_exception_ptr(simgrid::HostFailureException(XBT_THROW_POINT, "Host failed"));
- /* else, the actor will be killed with no possibility to survive */
- break;
-
- case SIMIX_CANCELED:
- XBT_DEBUG("ExecImpl::finish(): execution canceled");
- simcall->issuer->exception_ =
- std::make_exception_ptr(simgrid::CancelException(XBT_THROW_POINT, "Execution Canceled"));
- break;
-
- case SIMIX_TIMEOUT:
- XBT_DEBUG("ExecImpl::finish(): execution timeouted");
- simcall->issuer->exception_ = std::make_exception_ptr(simgrid::TimeoutError(XBT_THROW_POINT, "Timeouted"));
- break;
-
- default:
- xbt_die("Internal error in ExecImpl::finish(): unexpected synchro state %d", static_cast<int>(state_));
- }
- simcall->issuer->waiting_synchro = nullptr;
- simcall_execution_wait__set__result(simcall, state_);
+ if (simcall->call_ == actor::Simcall::Type::NONE) // FIXME: maybe a better way to handle this case
+ continue; // if process handling comm is killed
+
+ handle_activity_waitany(simcall);
+ set_exception(simcall->issuer_);
+
+ simcall->issuer_->waiting_synchro_ = nullptr;
/* Fail the process if the host is down */
- if (simcall->issuer->get_host()->is_on())
- SIMIX_simcall_answer(simcall);
+ if (simcall->issuer_->get_host()->is_on())
+ simcall->issuer_->simcall_answer();
else
- simcall->issuer->context_->iwannadie = true;
+ simcall->issuer_->set_wannadie();
}
}
+void ExecImpl::reset()
+{
+ hosts_.clear();
+ bytes_amounts_.clear();
+ flops_amounts_.clear();
+ set_start_time(-1.0);
+}
+
ActivityImpl* ExecImpl::migrate(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());
+ resource::Action* new_action = to->get_cpu()->execution_start(old_action->get_cost(), old_action->get_user_bound());
new_action->set_remains(old_action->get_remains());
new_action->set_activity(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.
+ new_action->set_sharing_penalty(old_action->get_sharing_penalty());
+ new_action->set_user_bound(old_action->get_user_bound());
old_action->set_activity(nullptr);
old_action->cancel();
/*************
* Callbacks *
*************/
-xbt::signal<void(ExecImpl&)> ExecImpl::on_creation;
-xbt::signal<void(ExecImpl const&)> ExecImpl::on_completion;
xbt::signal<void(ExecImpl const&, s4u::Host*)> ExecImpl::on_migration;
} // namespace activity