Methods and renaming in simix::Global

[simgrid.git] / src / kernel / context / Context.cpp

diff --git a/src/kernel/context/Context.cpp b/src/kernel/context/Context.cpp
index 6bb6e89..0cca7b8 100644 (file)
--- a/src/kernel/context/Context.cpp
+++ b/src/kernel/context/Context.cpp
@@ -86,16 +86,13 @@ void Context::stop()
 {
   actor_->finished_ = true;
 
-  if (actor_->auto_restart_ && actor_->host_->is_off()) {
+  if (actor_->auto_restart_ && not actor_->host_->is_on()) {
     XBT_DEBUG("Insert host %s to watched_hosts because it's off and %s needs to restart", actor_->host_->get_cname(),
               actor_->get_cname());
-    watched_hosts.insert(actor_->host_->get_cname());
+    watched_hosts.insert(actor_->host_->get_name());
   }
 
-  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();
@@ -115,7 +112,17 @@ void Context::stop()
     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;
 }