X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d4b84bf7c2cc1ffe1c73852ce1b6664930bc5f3a..281f68d5bc7f7e1ae7686348352c65eb6e0fcbf6:/src/simix/smx_global.cpp

diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp
index c84c5b77b7..1bebfe788c 100644
--- a/src/simix/smx_global.cpp
+++ b/src/simix/smx_global.cpp
@@ -231,7 +231,7 @@ void SIMIX_global_init(int *argc, char **argv)
     SIMIX_context_mod_init();
 
     // Either create a new context with maestro or create
-    // a context object with the current context mestro):
+    // a context object with the current context maestro):
     simgrid::kernel::actor::create_maestro(maestro_code);
 
     /* Prepare to display some more info when dying on Ctrl-C pressing */
@@ -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 */
@@ -600,6 +600,8 @@ void SIMIX_display_process_status()
 
 int SIMIX_is_maestro()
 {
-  smx_actor_t self = SIMIX_process_self();
-  return simix_global == nullptr /*SimDag*/ || self == nullptr || self == simix_global->maestro_process;
+  if (simix_global == nullptr) // SimDag
+    return true;
+  simgrid::kernel::actor::ActorImpl* self = SIMIX_process_self();
+  return self == nullptr || self == simix_global->maestro_process;
 }