-/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-2020. 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. */
void simcall_HANDLER_execution_wait(smx_simcall_t simcall, simgrid::kernel::activity::ExecImpl* synchro, double timeout)
{
- XBT_DEBUG("Wait for execution of synchro %p, state %d", synchro, (int)synchro->state_);
- xbt_assert(std::isfinite(timeout), "timeout is not finite!");
-
- /* Associate this simcall to the synchro */
- synchro->register_simcall(simcall);
-
- /* set surf's synchro */
- if (MC_is_active() || MC_record_replay_is_active()) {
- int idx = SIMCALL_GET_MC_VALUE(*simcall);
- if (idx == 0) {
- synchro->state_ = simgrid::kernel::activity::State::DONE;
- } else {
- /* If we reached this point, the wait simcall must have a timeout */
- /* Otherwise it shouldn't be enabled and executed by the MC */
- if (timeout < 0.0)
- THROW_IMPOSSIBLE;
- synchro->state_ = simgrid::kernel::activity::State::TIMEOUT;
- }
- synchro->finish();
- return;
- }
-
- /* If the synchro is already finished then perform the error handling */
- if (synchro->state_ != simgrid::kernel::activity::State::RUNNING) {
- synchro->finish();
- } else { /* we need a sleep action (even when there is no timeout) to be notified of host failures */
- synchro->set_timeout(timeout);
- }
-}
-
-void simcall_HANDLER_execution_test(smx_simcall_t simcall, simgrid::kernel::activity::ExecImpl* synchro)
-{
- bool res = (synchro->state_ != simgrid::kernel::activity::State::WAITING &&
- synchro->state_ != simgrid::kernel::activity::State::RUNNING);
- if (res) {
- synchro->simcalls_.push_back(simcall);
- synchro->finish();
- } else {
- simcall->issuer_->simcall_answer();
- }
- simcall_execution_test__set__result(simcall, res);
+ synchro->wait_for(simcall->issuer_, timeout);
}
void simcall_HANDLER_execution_waitany_for(smx_simcall_t simcall, simgrid::kernel::activity::ExecImpl* execs[],
namespace kernel {
namespace activity {
-ExecImpl::~ExecImpl()
-{
- if (timeout_detector_)
- timeout_detector_->unref();
- XBT_DEBUG("Destroy exec %p", 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);
+ timeout_detector_.reset(hosts_.front()->pimpl_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;
}
+void ExecImpl::wait_for(actor::ActorImpl* issuer, double timeout)
+{
+ XBT_DEBUG("Wait for execution of synchro %p, state %d", this, (int)state_);
+ xbt_assert(std::isfinite(timeout), "timeout is not finite!");
+
+ /* Associate this simcall to the synchro */
+ register_simcall(&issuer->simcall);
+
+ if (MC_is_active() || MC_record_replay_is_active()) {
+ int idx = SIMCALL_GET_MC_VALUE(issuer->simcall);
+ if (idx == 0) {
+ state_ = simgrid::kernel::activity::State::DONE;
+ } else {
+ /* If we reached this point, the wait simcall must have a timeout */
+ /* Otherwise it shouldn't be enabled and executed by the MC */
+ if (timeout < 0.0)
+ THROW_IMPOSSIBLE;
+ state_ = simgrid::kernel::activity::State::TIMEOUT;
+ }
+ finish();
+ return;
+ }
+
+ /* If the synchro is already finished then perform the error handling */
+ if (state_ != simgrid::kernel::activity::State::RUNNING) {
+ finish();
+ } else { /* we need a sleep action (even when there is no timeout) to be notified of host failures */
+ set_timeout(timeout);
+ }
+}
+
double ExecImpl::get_seq_remaining_ratio()
{
return (surf_action_ == nullptr) ? 0 : surf_action_->get_remains() / surf_action_->get_cost();
}
clean_action();
-
- if (timeout_detector_) {
- timeout_detector_->unref();
- timeout_detector_ = nullptr;
- }
-
+ timeout_detector_.reset();
/* Answer all simcalls associated with the synchro */
finish();
}
}
switch (state_) {
-
case State::DONE:
/* do nothing, synchro done */
XBT_DEBUG("ExecImpl::finish(): execution successful");
case State::FAILED:
XBT_DEBUG("ExecImpl::finish(): host '%s' failed", simcall->issuer_->get_host()->get_cname());
- simcall->issuer_->context_->iwannadie = true;
+ simcall->issuer_->context_->set_wannadie();
if (simcall->issuer_->get_host()->is_on())
simcall->issuer_->exception_ =
std::make_exception_ptr(simgrid::HostFailureException(XBT_THROW_POINT, "Host failed"));
if (simcall->issuer_->get_host()->is_on())
simcall->issuer_->simcall_answer();
else
- simcall->issuer_->context_->iwannadie = true;
+ simcall->issuer_->context_->set_wannadie();
}
}