Cosmetics.

diff --git a/src/kernel/actor/ActorImpl.cpp b/src/kernel/actor/ActorImpl.cpp
index 5f5bb59..1d2d122 100644 (file)
--- a/src/kernel/actor/ActorImpl.cpp
+++ b/src/kernel/actor/ActorImpl.cpp
@@ -277,7 +277,6 @@ void ActorImpl::yield()
 
   if (context_->iwannadie) {
     XBT_DEBUG("Actor %s@%s is dead", get_cname(), host_->get_cname());
 
   if (context_->iwannadie) {
     XBT_DEBUG("Actor %s@%s is dead", get_cname(), host_->get_cname());

-    // throw simgrid::kernel::context::ForcefulKillException(); Does not seem to properly kill the actor

     context_->stop();
     THROW_IMPOSSIBLE;
   }
     context_->stop();
     THROW_IMPOSSIBLE;
   }

diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp
index 04673e2..1bebfe7 100644 (file)
--- a/src/simix/smx_global.cpp
+++ b/src/simix/smx_global.cpp
@@ -288,7 +288,7 @@ void SIMIX_clean()
 
   /* Kill all processes (but maestro) */
   simix_global->maestro_process->kill_all();
 
   /* Kill all processes (but maestro) */
   simix_global->maestro_process->kill_all();

-  simix_global->context_factory->run_all();
+  simix_global->run_all_actors();

   simix_global->empty_trash();
 
   /* Exit the SIMIX network module */
   simix_global->empty_trash();
 
   /* Exit the SIMIX network module */