From: Arnaud Giersch Date: Fri, 1 Nov 2019 22:59:48 +0000 (+0100) Subject: Cosmetics. X-Git-Tag: v3.25~463 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/281f68d5bc7f7e1ae7686348352c65eb6e0fcbf6?ds=sidebyside Cosmetics. --- diff --git a/src/kernel/actor/ActorImpl.cpp b/src/kernel/actor/ActorImpl.cpp index 5f5bb5958e..1d2d122d7a 100644 --- 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()); - // throw simgrid::kernel::context::ForcefulKillException(); Does not seem to properly kill the actor context_->stop(); THROW_IMPOSSIBLE; } diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp index 04673e2276..1bebfe788c 100644 --- 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(); - simix_global->context_factory->run_all(); + simix_global->run_all_actors(); simix_global->empty_trash(); /* Exit the SIMIX network module */