CommImpl& CommImpl::detach()
{
detached_ = true;
- EngineImpl::get_instance()->get_maestro()->activities_.emplace_back(this);
+ EngineImpl::get_instance()->get_maestro()->activities_.insert(this);
return *this;
}
* routes and later create the respective surf actions */
auto net_model = from_->get_netpoint()->get_englobing_zone()->get_network_model();
- surf_action_ = net_model->communicate(from_, to_, size_, rate_);
+ surf_action_ = net_model->communicate(from_, to_, size_, rate_, false);
surf_action_->set_activity(this);
surf_action_->set_category(get_tracing_category());
set_start_time(surf_action_->get_start_time());
} else if ((src_actor_ != nullptr && src_actor_->is_suspended()) ||
(dst_actor_ != nullptr && dst_actor_->is_suspended())) {
/* If any of the actor is suspended, create the synchro but stop its execution,
- it will be restarted when the sender actor resume */
+ it will be restarted when the sender actor resumes */
if (src_actor_->is_suspended())
XBT_DEBUG("The communication is suspended on startup because src (%s@%s) was suspended since it initiated the "
"communication",
other_comm->clean_fun = observer->get_clean_fun();
} else {
other_comm->clean_fun = nullptr;
- observer->get_issuer()->activities_.emplace_back(other_comm);
+ observer->get_issuer()->activities_.insert(other_comm);
}
/* Setup the communication synchro */
other_comm = std::move(this_synchro);
mbox->push(other_comm);
}
- observer->get_issuer()->activities_.emplace_back(other_comm);
+ observer->get_issuer()->activities_.insert(other_comm);
}
} else {
/* Prepare a comm describing us, so that it gets passed to the user-provided filter of other side */
other_comm->set_state(simgrid::kernel::activity::State::READY);
}
- observer->get_issuer()->activities_.emplace_back(other_comm);
+ observer->get_issuer()->activities_.insert(other_comm);
}
observer->set_comm(other_comm.get());
copy_data();
if (detached_)
- EngineImpl::get_instance()->get_maestro()->activities_.remove(this);
+ EngineImpl::get_instance()->get_maestro()->activities_.erase(this);
while (not simcalls_.empty()) {
actor::Simcall* simcall = simcalls_.front();
}
simcall->issuer_->waiting_synchro_ = nullptr;
- simcall->issuer_->activities_.remove(this);
+ simcall->issuer_->activities_.erase(this);
if (detached_) {
if (simcall->issuer_ != dst_actor_ && dst_actor_ != nullptr)
- dst_actor_->activities_.remove(this);
+ dst_actor_->activities_.erase(this);
if (simcall->issuer_ != src_actor_ && src_actor_ != nullptr)
- src_actor_->activities_.remove(this);
+ src_actor_->activities_.erase(this);
}
}
}