X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dab3029067ba2677a42fb2f4f2c3b3b2f71e33c2..b9684d3607aa558c95b7185ddf147b478a7e367f:/src/simix/smx_global.cpp diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp index 3001ca036a..6549bdba26 100644 --- a/src/simix/smx_global.cpp +++ b/src/simix/smx_global.cpp @@ -44,20 +44,20 @@ XBT_LOG_NEW_CATEGORY(simix, "All SIMIX categories"); XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_kernel, simix, "Logging specific to SIMIX (kernel)"); -smx_global_t simix_global = NULL; -static xbt_heap_t simix_timers = NULL; +std::unique_ptr simix_global; +static xbt_heap_t simix_timers = nullptr; /** @brief Timer datatype */ typedef struct s_smx_timer { double date = 0.0; - std::function callback; + std::packaged_task callback; s_smx_timer() {} - s_smx_timer(double date, std::function callback) + s_smx_timer(double date, std::packaged_task callback) : date(date), callback(std::move(callback)) {} } s_smx_timer_t; -void (*SMPI_switch_data_segment)(int) = NULL; +void (*SMPI_switch_data_segment)(int) = nullptr; int _sg_do_verbose_exit = 1; static void inthandler(int ignored) @@ -127,7 +127,7 @@ static void install_segvhandler(void) if (!(old_stack.ss_flags & SS_DISABLE)) { XBT_DEBUG("An alternate stack was already installed (sp=%p, size=%zd, flags=%x). Restore it.", old_stack.ss_sp, old_stack.ss_size, old_stack.ss_flags); - sigaltstack(&old_stack, NULL); + sigaltstack(&old_stack, nullptr); } struct sigaction action, old_action; @@ -143,7 +143,7 @@ static void install_segvhandler(void) XBT_DEBUG("A signal handler was already installed for SIGSEGV (%p). Restore it.", (old_action.sa_flags & SA_SIGINFO) ? (void*)old_action.sa_sigaction : (void*)old_action.sa_handler); - sigaction(SIGSEGV, &old_action, NULL); + sigaction(SIGSEGV, &old_action, nullptr); } } @@ -157,7 +157,7 @@ double SIMIX_timer_next(void) static void kill_process(smx_process_t process) { - SIMIX_process_kill(process, NULL); + SIMIX_process_kill(process, nullptr); } static std::function maestro_code; @@ -194,17 +194,14 @@ void SIMIX_global_init(int *argc, char **argv) #endif if (!simix_global) { - simix_global = xbt_new0(s_smx_global_t, 1); + simix_global = std::unique_ptr(new simgrid::simix::Global()); simgrid::simix::Process proc; - simix_global->process_to_run = xbt_dynar_new(sizeof(smx_process_t), NULL); - simix_global->process_that_ran = xbt_dynar_new(sizeof(smx_process_t), NULL); + simix_global->process_to_run = xbt_dynar_new(sizeof(smx_process_t), nullptr); + simix_global->process_that_ran = xbt_dynar_new(sizeof(smx_process_t), nullptr); simix_global->process_list = xbt_swag_new(xbt_swag_offset(proc, process_hookup)); simix_global->process_to_destroy = xbt_swag_new(xbt_swag_offset(proc, destroy_hookup)); - - simix_global->maestro_process = NULL; - simix_global->registered_functions = xbt_dict_new_homogeneous(NULL); - + simix_global->maestro_process = nullptr; simix_global->create_process_function = &SIMIX_process_create; simix_global->kill_process_function = &kill_process; simix_global->cleanup_process_function = &SIMIX_process_cleanup; @@ -217,10 +214,6 @@ void SIMIX_global_init(int *argc, char **argv) // 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; - __xbt_ex_terminate = &SIMIX_process_exception_terminate; - /* Prepare to display some more info when dying on Ctrl-C pressing */ signal(SIGINT, inthandler); @@ -239,9 +232,9 @@ void SIMIX_global_init(int *argc, char **argv) const char* name = storage->getName(); // TODO, create sg_storage_by_name sg_storage_t s = xbt_lib_get_elm_or_null(storage_lib, name); - xbt_assert(s != NULL, "Storage not found for name %s", name); + xbt_assert(s != nullptr, "Storage not found for name %s", name); - SIMIX_storage_create(name, s, NULL); + SIMIX_storage_create(name, s, nullptr); }); SIMIX_STORAGE_LEVEL = xbt_lib_add_level(storage_lib, SIMIX_storage_destroy); @@ -268,6 +261,18 @@ int smx_cleaned = 0; void SIMIX_clean(void) { if (smx_cleaned) return; // to avoid double cleaning by java and C + +#if HAVE_SMPI + if (SIMIX_process_count()>0){ + if(smpi_process_initialized()){ + xbt_die("Process exited without calling MPI_Finalize - Killing simulation"); + }else{ + XBT_WARN("Process called exit when leaving - Skipping cleanups"); + return; + } + } +#endif + 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) { @@ -283,37 +288,30 @@ void SIMIX_clean(void) SIMIX_mailbox_exit(); xbt_heap_free(simix_timers); - simix_timers = NULL; + simix_timers = nullptr; /* Free the remaining data structures */ xbt_dynar_free(&simix_global->process_to_run); xbt_dynar_free(&simix_global->process_that_ran); xbt_swag_free(simix_global->process_to_destroy); xbt_swag_free(simix_global->process_list); - simix_global->process_list = NULL; - simix_global->process_to_destroy = NULL; - xbt_dict_free(&(simix_global->registered_functions)); + simix_global->process_list = nullptr; + simix_global->process_to_destroy = nullptr; xbt_os_mutex_destroy(simix_global->mutex); - simix_global->mutex = NULL; + simix_global->mutex = nullptr; /* Let's free maestro now */ delete simix_global->maestro_process->context; - xbt_free(simix_global->maestro_process->running_ctx); - xbt_free(simix_global->maestro_process); - simix_global->maestro_process = NULL; - - /* Restore the default exception setup */ - __xbt_running_ctx_fetch = &__xbt_ex_ctx_default; - __xbt_ex_terminate = &__xbt_ex_terminate_default; + simix_global->maestro_process->context = nullptr; + delete simix_global->maestro_process; + simix_global->maestro_process = nullptr; /* Finish context module and SURF */ SIMIX_context_mod_exit(); surf_exit(); - xbt_free(simix_global); - simix_global = NULL; - + simix_global = nullptr; return; } @@ -447,7 +445,7 @@ void SIMIX_run(void) XBT_DEBUG("Handling process whose action terminated normally"); while ((action = surf_model_extract_done_action_set(model))) { XBT_DEBUG(" Handling Action %p",action); - if (action->getData() == NULL) + if (action->getData() == nullptr) XBT_DEBUG("probably vcpu's action %p, skip", action); else SIMIX_simcall_exit((smx_synchro_t) action->getData()); @@ -470,13 +468,11 @@ void SIMIX_run(void) //FIXME: make the timers being real callbacks // (i.e. provide dispatchers that read and expand the args) timer = (smx_timer_t) xbt_heap_pop(simix_timers); - if (timer->callback) { - try { - timer->callback(); - } - catch(...) { - xbt_die("Exception throwed ouf of timer callback"); - } + try { + timer->callback(); + } + catch(...) { + xbt_die("Exception throwed ouf of timer callback"); } delete timer; } @@ -491,7 +487,7 @@ void SIMIX_run(void) XBT_DEBUG("Handling process whose action terminated normally"); while ((action = surf_model_extract_done_action_set(model))) { XBT_DEBUG(" Handling Action %p",action); - if (action->getData() == NULL) + if (action->getData() == nullptr) XBT_DEBUG("probably vcpu's action %p, skip", action); else SIMIX_simcall_exit((smx_synchro_t) action->getData()); @@ -499,7 +495,7 @@ void SIMIX_run(void) } /* Autorestart all process */ - char *hostname = NULL; + char *hostname = nullptr; xbt_dynar_foreach(host_that_restart,iter,hostname) { XBT_INFO("Restart processes on host: %s",hostname); SIMIX_host_autorestart(sg_host_by_name(hostname)); @@ -535,12 +531,13 @@ void SIMIX_run(void) */ smx_timer_t SIMIX_timer_set(double date, void (*function)(void*), void *arg) { - smx_timer_t timer = new s_smx_timer_t(date, std::bind(function, arg)); + smx_timer_t timer = new s_smx_timer_t(date, + std::packaged_task(std::bind(function, arg))); xbt_heap_push(simix_timers, timer, date); return timer; } -smx_timer_t SIMIX_timer_set(double date, std::function callback) +smx_timer_t SIMIX_timer_set(double date, std::packaged_task callback) { smx_timer_t timer = new s_smx_timer_t(date, std::move(callback)); xbt_heap_push(simix_timers, timer, date); @@ -552,7 +549,7 @@ void SIMIX_timer_remove(smx_timer_t timer) { xbt_heap_rm_elm(simix_timers, timer, timer->date); } -/** @brief Returns the date at which the timer will trigger (or 0 if NULL timer) */ +/** @brief Returns the date at which the timer will trigger (or 0 if nullptr timer) */ double SIMIX_timer_get_date(smx_timer_t timer) { return timer?timer->date:0; } @@ -601,11 +598,11 @@ void SIMIX_function_register_process_cleanup(void_pfn_smxprocess_t void SIMIX_display_process_status(void) { - if (simix_global->process_list == NULL) { + if (simix_global->process_list == nullptr) { return; } - smx_process_t process = NULL; + smx_process_t process = nullptr; int nbprocess = xbt_swag_size(simix_global->process_list); XBT_INFO("%d processes are still running, waiting for something.", nbprocess); @@ -648,7 +645,7 @@ void SIMIX_display_process_status(void) XBT_INFO("Process %lu (%s@%s): waiting for %s synchro %p (%s) in state %d to finish", process->pid, process->name.c_str(), sg_host_get_name(process->host), synchro_description, process->waiting_synchro, - process->waiting_synchro->name, (int)process->waiting_synchro->state); + process->waiting_synchro->name.c_str(), (int)process->waiting_synchro->state); } else { XBT_INFO("Process %lu (%s@%s)", process->pid, process->name.c_str(), sg_host_get_name(process->host)); @@ -666,5 +663,5 @@ xbt_dict_t SIMIX_asr_get_properties(const char *name) int SIMIX_is_maestro() { - return simix_global==NULL /*SimDag*/|| SIMIX_process_self() == simix_global->maestro_process; + return simix_global==nullptr /*SimDag*/|| SIMIX_process_self() == simix_global->maestro_process; }