}
actor_->finished_ = true;
- SIMIX_process_on_exit_runall(actor_);
- /* cancel non-blocking activities */
- while (not actor_->comms.empty()) {
- smx_activity_t synchro = actor_->comms.front();
- actor_->comms.pop_front();
- simgrid::kernel::activity::CommImplPtr comm =
- boost::static_pointer_cast<simgrid::kernel::activity::CommImpl>(synchro);
-
- /* make sure no one will finish the comm after this process is destroyed,
- * because src_proc or dst_proc would be an invalid pointer */
-
- if (comm->src_proc == actor_) {
- XBT_DEBUG("Found an unfinished send comm %p (detached = %d), state %d, src = %p, dst = %p", comm.get(),
- comm->detached, (int)comm->state_, comm->src_proc.get(), comm->dst_proc.get());
- comm->src_proc = nullptr;
-
- } else if (comm->dst_proc == actor_) {
- XBT_DEBUG("Found an unfinished recv comm %p, state %d, src = %p, dst = %p", comm.get(), (int)comm->state_,
- comm->src_proc.get(), comm->dst_proc.get());
- comm->dst_proc = nullptr;
-
- if (comm->detached && comm->src_proc != nullptr) {
- /* the comm will be freed right now, remove it from the sender */
- comm->src_proc->comms.remove(comm);
- }
- } else {
- xbt_die("Communication synchro %p is in my list but I'm not the sender nor the receiver", synchro.get());
- }
- comm->cancel();
+ // Execute the termination callbacks
+ smx_process_exit_status_t exit_status = (actor_->context_->iwannadie) ? SMX_EXIT_FAILURE : SMX_EXIT_SUCCESS;
+ while (not actor_->on_exit.empty()) {
+ s_smx_process_exit_fun_t exit_fun = actor_->on_exit.back();
+ actor_->on_exit.pop_back();
+ (exit_fun.fun)(exit_status, exit_fun.arg);
}
+ /* cancel non-blocking activities */
+ for (auto activity : actor_->comms)
+ boost::static_pointer_cast<activity::CommImpl>(activity)->cancel();
+ actor_->comms.clear();
+
XBT_DEBUG("%s@%s(%ld) should not run anymore", actor_->get_cname(), actor_->iface()->get_host()->get_cname(),
actor_->pid_);
this->cleanup_func_(this->actor_);
this->iwannadie = false; // don't let the simcall's yield() do a Context::stop(), because that's me
- simgrid::simix::simcall([this] { SIMIX_process_cleanup(this->actor_); });
+ simgrid::simix::simcall([this] {
+ simgrid::s4u::Actor::on_destruction(actor_->iface());
+
+ /* Unregister from the kill timer if any */
+ if (actor_->kill_timer != nullptr) {
+ SIMIX_timer_remove(actor_->kill_timer);
+ actor_->kill_timer = nullptr;
+ }
+
+ SIMIX_process_cleanup(actor_);
+ });
this->iwannadie = true;
}