/* 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/kernel/routing/NetPoint.hpp"
-#include "simgrid/modelchecker.h"
-#include "simgrid/s4u/Exec.hpp"
+#include "src/kernel/actor/ActorImpl.hpp"
#include "src/kernel/actor/SimcallObserver.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);
ExecImpl& ExecImpl::set_timeout(double timeout)
{
if (timeout >= 0 && not MC_is_active() && not MC_record_replay_is_active()) {
- timeout_detector_.reset(hosts_.front()->pimpl_cpu->sleep(timeout));
+ timeout_detector_.reset(hosts_.front()->get_cpu()->sleep(timeout));
timeout_detector_->set_activity(this);
}
return *this;
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_ = hosts_.front()->get_cpu()->execution_start(flops_amounts_.front(), bound_);
surf_action_->set_sharing_penalty(sharing_penalty_);
surf_action_->set_category(get_tracing_category());
-
- if (bound_ > 0) {
- surf_action_->set_bound(bound_);
- surf_action_->set_user_bound(bound_);
- }
} else {
- // FIXME[donassolo]: verify if all hosts belongs to the same netZone?
+ // 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);
+ start_time_ = surf_action_->get_start_time();
}
XBT_DEBUG("Create execute synchro %p: %s", this, get_cname());
state_ = State::DONE;
}
- get_iface()->set_finish_time(surf_action_->get_finish_time());
+ finish_time_ = surf_action_->get_finish_time();
clean_action();
timeout_detector_.reset();
actor_->activities_.remove(this);
actor_ = nullptr;
}
+ if (state_ != State::FAILED && cb_id_ >= 0)
+ s4u::Host::on_state_change.disconnect(cb_id_);
/* Answer all simcalls associated with the synchro */
finish();
}
continue; // if process handling comm is killed
if (auto* observer =
dynamic_cast<kernel::actor::ExecutionWaitanySimcall*>(simcall->observer_)) { // simcall is a wait_any?
- const auto* execs = observer->get_execs();
+ const auto& execs = observer->get_execs();
- for (auto* exec : *execs) {
+ for (auto* exec : execs) {
exec->unregister_simcall(simcall);
if (simcall->timeout_cb_) {
}
if (not MC_is_active() && not MC_record_replay_is_active()) {
- auto element = std::find(execs->begin(), execs->end(), this);
- int rank = element != execs->end() ? static_cast<int>(std::distance(execs->begin(), element)) : -1;
+ auto element = std::find(execs.begin(), execs.end(), this);
+ int rank = element != execs.end() ? static_cast<int>(std::distance(execs.begin(), element)) : -1;
observer->set_result(rank);
}
}
switch (state_) {
case State::FAILED:
- simcall->issuer_->context_->set_wannadie();
+ piface_->complete(s4u::Activity::State::FAILED);
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 */
+ simcall->issuer_->exception_ = std::make_exception_ptr(HostFailureException(XBT_THROW_POINT, "Host failed"));
+ else /* else, the actor will be killed with no possibility to survive */
+ simcall->issuer_->context_->set_wannadie();
break;
case State::CANCELED:
- simcall->issuer_->exception_ =
- std::make_exception_ptr(simgrid::CancelException(XBT_THROW_POINT, "Execution Canceled"));
+ simcall->issuer_->exception_ = std::make_exception_ptr(CancelException(XBT_THROW_POINT, "Execution Canceled"));
break;
case State::TIMEOUT:
- simcall->issuer_->exception_ = std::make_exception_ptr(simgrid::TimeoutException(XBT_THROW_POINT, "Timeouted"));
+ simcall->issuer_->exception_ = std::make_exception_ptr(TimeoutException(XBT_THROW_POINT, "Timeouted"));
break;
default:
{
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_sharing_penalty(old_action->get_sharing_penalty());
return this;
}
-void ExecImpl::wait_any_for(actor::ActorImpl* issuer, const std::vector<ExecImpl*>* execs, double timeout)
+void ExecImpl::wait_any_for(actor::ActorImpl* issuer, const std::vector<ExecImpl*>& execs, double timeout)
{
if (timeout < 0.0) {
issuer->simcall_.timeout_cb_ = nullptr;
} else {
- issuer->simcall_.timeout_cb_ = simgrid::simix::Timer::set(SIMIX_get_clock() + timeout, [issuer, execs]() {
+ issuer->simcall_.timeout_cb_ = timer::Timer::set(s4u::Engine::get_clock() + timeout, [issuer, &execs]() {
issuer->simcall_.timeout_cb_ = nullptr;
- for (auto* exec : *execs)
+ for (auto* exec : execs)
exec->unregister_simcall(&issuer->simcall_);
- // default result (-1) is set in mc::ExecutionWaitanySimcall
+ // default result (-1) is set in actor::ExecutionWaitanySimcall
issuer->simcall_answer();
});
}
- for (auto* exec : *execs) {
+ for (auto* exec : execs) {
/* associate this simcall to the the synchro */
exec->simcalls_.push_back(&issuer->simcall_);
-
/* see if the synchro is already finished */
- if (exec->state_ != simgrid::kernel::activity::State::WAITING &&
- exec->state_ != simgrid::kernel::activity::State::RUNNING) {
+ if (exec->state_ != State::WAITING && exec->state_ != State::RUNNING) {
exec->finish();
break;
}
