if (state_ != State::WAITING && state_ != State::RUNNING) {
finish();
} else {
+ /* As Messages in Message Queues are virtually instantaneous, we do not need a timeout */
+ /* Or maybe we do, and will have to implement a specific way to handle them is need arises */
+ if (dynamic_cast<MessImpl*>(this) != nullptr)
+ return;
/* we need a sleep action (even when the timeout is infinite) to be notified of host failures */
/* Comms handle that a bit differently of the other activities */
if (auto* comm = dynamic_cast<CommImpl*>(this)) {
sleep_action->set_activity(comm);
if (issuer == comm->src_actor_)
- comm->src_timeout_ = sleep_action;
+ comm->src_timeout_.reset(sleep_action);
else
- comm->dst_timeout_ = sleep_action;
+ comm->dst_timeout_.reset(sleep_action);
} else {
SynchroImplPtr synchro(new SynchroImpl([this, issuer]() {
this->unregister_simcall(&issuer->simcall_);
xbt_assert(timeout <= 0.0, "Timeout not implemented for waitany in the model-checker");
if (int idx = observer->get_value(); idx != -1) {
auto* act = activities.at(idx);
- act->simcalls_.push_back(&issuer->simcall_);
+ act->register_simcall(&issuer->simcall_);
observer->set_result(idx);
act->set_state(State::DONE);
act->finish();
for (auto* act : activities) {
/* associate this simcall to the the synchro */
- act->simcalls_.push_back(&issuer->simcall_);
+ act->register_simcall(&issuer->simcall_);
/* see if the synchro is already finished */
if (act->get_state() != State::WAITING && act->get_state() != State::RUNNING) {
act->finish();
void ActivityImpl::suspend()
{
- if (model_action_ == nullptr)
- return;
XBT_VERB("This activity is suspended (remain: %f)", model_action_->get_remains());
+ get_iface()->fire_on_suspend();
+ get_iface()->fire_on_this_suspend();
model_action_->suspend();
- s4u::Activity::on_suspended(*get_iface());
}
void ActivityImpl::resume()
if (model_action_ == nullptr)
return;
XBT_VERB("This activity is resumed (remain: %f)", model_action_->get_remains());
+ get_iface()->fire_on_resume();
+ get_iface()->fire_on_this_resume();
model_action_->resume();
- s4u::Activity::on_resumed(*get_iface());
}
void ActivityImpl::cancel()
delete activity;
}
}
+
} // namespace simgrid::kernel::activity