let the actor clean for itself

diff --git a/src/kernel/actor/ActorImpl.cpp b/src/kernel/actor/ActorImpl.cpp
index 728f23d..37c1d13 100644 (file)
--- a/src/kernel/actor/ActorImpl.cpp
+++ b/src/kernel/actor/ActorImpl.cpp
@@ -138,6 +138,12 @@ void ActorImpl::cleanup()
 
   XBT_DEBUG("Cleanup actor %s (%p), waiting synchro %p", get_cname(), this, waiting_synchro.get());
 
+  /* Unregister from the kill timer if any */
+  if (kill_timer != nullptr) {
+    kill_timer->remove();
+    kill_timer = nullptr;
+  }
+
   simix_global->mutex.lock();
 
   simix_global->process_list.erase(pid_);

diff --git a/src/kernel/context/Context.cpp b/src/kernel/context/Context.cpp
index dc182b9..bbbf5eb 100644 (file)
--- a/src/kernel/context/Context.cpp
+++ b/src/kernel/context/Context.cpp
@@ -99,12 +99,6 @@ void Context::stop()
   simgrid::simix::simcall([this] {
     simgrid::s4u::Actor::on_destruction(actor_->iface());
 
-    /* Unregister from the kill timer if any */
-    if (actor_->kill_timer != nullptr) {
-      actor_->kill_timer->remove();
-      actor_->kill_timer = nullptr;
-    }
-
     actor_->cleanup();
   });
   this->iwannadie = true;