X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ea55b530facfb04b499b016152f739e024445aa4..ff97d969d88e178cfa7167c05786ef09d9ac290c:/src/simix/smx_global.cpp diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp index 0f00476f6e..c2bc81b01f 100644 --- a/src/simix/smx_global.cpp +++ b/src/simix/smx_global.cpp @@ -11,7 +11,9 @@ # include #endif +#include "src/surf/surf_interface.hpp" #include "smx_private.h" +#include "smx_private.hpp" #include "xbt/heap.h" #include "xbt/sysdep.h" #include "xbt/log.h" @@ -35,6 +37,7 @@ #endif #include "src/mc/mc_record.h" +#include "src/surf/platform.hpp" #ifdef HAVE_SMPI #include "src/smpi/private.h" @@ -54,6 +57,8 @@ typedef struct s_smx_timer { void* args; } s_smx_timer_t; +void (*SMPI_switch_data_segment)(int) = NULL; + static void* SIMIX_synchro_mallocator_new_f(void); static void SIMIX_synchro_mallocator_free_f(void* synchro); static void SIMIX_synchro_mallocator_reset_f(void* synchro); @@ -96,8 +101,13 @@ static void _XBT_CALL segvhandler(int signum, siginfo_t *siginfo, void *context) fprintf(stderr, "Segmentation fault.\n"); #ifdef HAVE_SMPI if (smpi_enabled() && !smpi_privatize_global_variables) { +#ifdef HAVE_PRIVATIZATION fprintf(stderr, "Try to enable SMPI variable privatization with --cfg=smpi/privatize_global_variables:yes.\n"); +#else + fprintf(stderr, + "Sadly, your system does not support --cfg=smpi/privatize_global_variables:yes (yet).\n"); +#endif } #endif } @@ -165,6 +175,24 @@ static void SIMIX_storage_create_(smx_storage_t storage) SIMIX_storage_create(key, storage, NULL); } +static std::function maestro_code; + +namespace simgrid { +namespace simix { + +XBT_PUBLIC(void) set_maestro(std::function code) +{ + maestro_code = std::move(code); +} + +} +} + +void SIMIX_set_maestro(void (*code)(void*), void* data) +{ + maestro_code = std::bind(code, data); +} + /** * \ingroup SIMIX_API * \brief Initialize SIMIX internal data. @@ -204,12 +232,14 @@ void SIMIX_global_init(int *argc, char **argv) simix_global->synchro_mallocator = xbt_mallocator_new(65536, SIMIX_synchro_mallocator_new_f, SIMIX_synchro_mallocator_free_f, SIMIX_synchro_mallocator_reset_f); - simix_global->autorestart = SIMIX_host_restart_processes; simix_global->mutex = xbt_os_mutex_init(); surf_init(argc, argv); /* Initialize SURF structures */ SIMIX_context_mod_init(); - SIMIX_create_maestro_process(); + + // Either create a new context with maestro or create + // a context object with the current context mestro): + simgrid::simix::create_maestro(maestro_code); /* context exception handlers */ __xbt_running_ctx_fetch = SIMIX_process_get_running_context; @@ -221,13 +251,14 @@ void SIMIX_global_init(int *argc, char **argv) signal(SIGINT, inthandler); #ifndef WIN32 - /* Install SEGV handler */ install_segvhandler(); #endif /* register a function to be called by SURF after the environment creation */ sg_platf_init(); - sg_platf_postparse_add_cb(SIMIX_post_create_environment); - surf_on_host_created(SIMIX_host_create); + simgrid::surf::on_postparse.connect(SIMIX_post_create_environment); + simgrid::s4u::Host::onCreation.connect([](simgrid::s4u::Host& host) { + SIMIX_host_create(&host); + }); surf_on_storage_created(SIMIX_storage_create_); } @@ -266,10 +297,10 @@ void SIMIX_clean(void) smx_cleaned = 1; XBT_DEBUG("SIMIX_clean called. Simulation's over."); if (!xbt_dynar_is_empty(simix_global->process_to_run) && SIMIX_get_clock() == 0.0) { - XBT_CRITICAL(" "); - XBT_CRITICAL("The time is still 0, and you still have processes ready to run."); - XBT_CRITICAL("It seems that you forgot to run the simulation that you setup."); - xbt_die("Bailing out to avoid that stop-before-start madness. Please fix your code."); + XBT_CRITICAL(" "); + XBT_CRITICAL("The time is still 0, and you still have processes ready to run."); + XBT_CRITICAL("It seems that you forgot to run the simulation that you setup."); + xbt_die("Bailing out to avoid that stop-before-start madness. Please fix your code."); } /* Kill all processes (but maestro) */ SIMIX_process_killall(simix_global->maestro_process, 1); @@ -459,15 +490,15 @@ void SIMIX_run(void) XBT_DEBUG("Handling process whose action failed"); while ((action = surf_model_extract_failed_action_set(model))) { XBT_DEBUG(" Handling Action %p",action); - SIMIX_simcall_exit((smx_synchro_t) surf_action_get_data(action)); + SIMIX_simcall_exit((smx_synchro_t) action->getData()); } XBT_DEBUG("Handling process whose action terminated normally"); while ((action = surf_model_extract_done_action_set(model))) { XBT_DEBUG(" Handling Action %p",action); - if (surf_action_get_data(action) == NULL) + if (action->getData() == NULL) XBT_DEBUG("probably vcpu's action %p, skip", action); else - SIMIX_simcall_exit((smx_synchro_t) surf_action_get_data(action)); + SIMIX_simcall_exit((smx_synchro_t) action->getData()); } } } @@ -497,27 +528,25 @@ void SIMIX_run(void) XBT_DEBUG("Handling process whose action failed"); while ((action = surf_model_extract_failed_action_set(model))) { XBT_DEBUG(" Handling Action %p",action); - SIMIX_simcall_exit((smx_synchro_t) surf_action_get_data(action)); + SIMIX_simcall_exit((smx_synchro_t) action->getData()); } XBT_DEBUG("Handling process whose action terminated normally"); while ((action = surf_model_extract_done_action_set(model))) { XBT_DEBUG(" Handling Action %p",action); - if (surf_action_get_data(action) == NULL) + if (action->getData() == NULL) XBT_DEBUG("probably vcpu's action %p, skip", action); else - SIMIX_simcall_exit((smx_synchro_t) surf_action_get_data(action)); + SIMIX_simcall_exit((smx_synchro_t) action->getData()); } } /* Autorestart all process */ - if(host_that_restart) { - char *hostname = NULL; - xbt_dynar_foreach(host_that_restart,iter,hostname) { - XBT_INFO("Restart processes on host: %s",hostname); - SIMIX_host_autorestart(sg_host_by_name(hostname)); - } - xbt_dynar_reset(host_that_restart); + char *hostname = NULL; + xbt_dynar_foreach(host_that_restart,iter,hostname) { + XBT_INFO("Restart processes on host: %s",hostname); + SIMIX_host_autorestart(sg_host_by_name(hostname)); } + xbt_dynar_reset(host_that_restart); /* Clean processes to destroy */ SIMIX_process_empty_trash(); @@ -529,7 +558,7 @@ void SIMIX_run(void) if (xbt_swag_size(simix_global->process_list) != 0) { - TRACE_end(); + TRACE_end(); XBT_CRITICAL("Oops ! Deadlock or code not perfectly clean."); SIMIX_display_process_status(); @@ -558,12 +587,12 @@ smx_timer_t SIMIX_timer_set(double date, void (*function)(void*), void *arg) } /** @brief cancels a timer that was added earlier */ void SIMIX_timer_remove(smx_timer_t timer) { - xbt_heap_rm_elm(simix_timers, timer, timer->date); + xbt_heap_rm_elm(simix_timers, timer, timer->date); } /** @brief Returns the date at which the timer will trigger (or 0 if NULL timer) */ double SIMIX_timer_get_date(smx_timer_t timer) { - return timer?timer->date:0; + return timer?timer->date:0; } /** @@ -695,3 +724,8 @@ xbt_dict_t SIMIX_asr_get_properties(const char *name) { return (xbt_dict_t) xbt_lib_get_or_null(as_router_lib, name, ROUTING_PROP_ASR_LEVEL); } + +int SIMIX_is_maestro() +{ + return simix_global==NULL /*SimDag*/|| SIMIX_process_self() == simix_global->maestro_process; +}