watched_hosts.insert(actor_->host_->get_cname());
}
- actor_->finished_ = true;
-
// Execute the termination callbacks
- simgrid::s4u::Actor::on_destruction(actor_->iface());
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();
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;
}