synchro->simcalls_.push_back(simcall);
synchro->finish();
} else {
- SIMIX_simcall_answer(simcall);
+ simcall->issuer_->simcall_answer();
}
simcall_execution_test__set__result(simcall, res);
}
size_t count, double timeout)
{
if (timeout < 0.0) {
- simcall->timer = nullptr;
+ simcall->timeout_cb_ = nullptr;
} else {
- simcall->timer = simgrid::simix::Timer::set(SIMIX_get_clock() + timeout, [simcall, execs, count]() {
+ simcall->timeout_cb_ = simgrid::simix::Timer::set(SIMIX_get_clock() + timeout, [simcall, execs, count]() {
for (size_t i = 0; i < count; i++) {
// Remove the first occurence of simcall:
auto* exec = execs[i];
exec->simcalls_.erase(j);
}
simcall_execution_waitany_for__set__result(simcall, -1);
- SIMIX_simcall_answer(simcall);
+ simcall->issuer_->simcall_answer();
});
}
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_);
+ surf_action_->set_sharing_penalty(sharing_penalty_);
surf_action_->set_category(get_tracing_category());
if (bound_ > 0)
}
XBT_DEBUG("Create execute synchro %p: %s", this, get_cname());
- ExecImpl::on_creation(*this);
return this;
}
return *this;
}
-ExecImpl& ExecImpl::set_priority(double priority)
+ExecImpl& ExecImpl::set_sharing_penalty(double sharing_penalty)
{
- priority_ = priority;
+ sharing_penalty_ = sharing_penalty;
return *this;
}
state_ = SIMIX_DONE;
}
- on_completion(*this);
-
clean_action();
if (timeout_detector_) {
timeout_detector_ = nullptr;
}
- /* If there are simcalls associated with the synchro, then answer them */
- if (not simcalls_.empty())
- finish();
+ /* Answer all simcalls associated with the synchro */
+ finish();
}
void ExecImpl::finish()
* list. Afterwards, get the position of the actual synchro in the waitany list and return it as the result of the
* simcall */
- if (simcall->call == SIMCALL_NONE) // FIXME: maybe a better way to handle this case
+ if (simcall->call_ == SIMCALL_NONE) // FIXME: maybe a better way to handle this case
continue; // if process handling comm is killed
- if (simcall->call == SIMCALL_EXECUTION_WAITANY_FOR) {
+ if (simcall->call_ == SIMCALL_EXECUTION_WAITANY_FOR) {
simgrid::kernel::activity::ExecImpl** execs = simcall_execution_waitany_for__get__execs(simcall);
size_t count = simcall_execution_waitany_for__get__count(simcall);
if (j != exec->simcalls_.end())
exec->simcalls_.erase(j);
- if (simcall->timer) {
- simcall->timer->remove();
- simcall->timer = nullptr;
+ if (simcall->timeout_cb_) {
+ simcall->timeout_cb_->remove();
+ simcall->timeout_cb_ = nullptr;
}
}
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_ =
+ 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_ =
+ 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"));
+ simcall->issuer_->exception_ = std::make_exception_ptr(simgrid::TimeoutException(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->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_->context_->iwannadie = true;
}
}
resource::Action* new_action = to->pimpl_cpu->execution_start(old_action->get_cost());
new_action->set_remains(old_action->get_remains());
new_action->set_activity(this);
- new_action->set_priority(old_action->get_priority());
+ new_action->set_sharing_penalty(old_action->get_sharing_penalty());
// 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.
/*************
* 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