X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d4b84bf7c2cc1ffe1c73852ce1b6664930bc5f3a..4e7df12e1e81b2ff9212175628873d6d880b6630:/src/simix/smx_global.cpp?ds=sidebyside diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp index c84c5b77b7..04673e2276 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 */ @@ -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; }