X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ec1ff601331bbc2a69a3d7501f468e2238be2a5e..d7bc120608a7dff0e936300bc7fc0367ee26b16d:/src/simix/smx_global.cpp diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp index 856ccc8c49..bc31f711af 100644 --- a/src/simix/smx_global.cpp +++ b/src/simix/smx_global.cpp @@ -4,6 +4,8 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ +#include + #include /* Signal handling */ #include #include "src/internal_config.h" @@ -12,13 +14,18 @@ #include "src/surf/storage_interface.hpp" #include "src/surf/xml/platf.hpp" #include "smx_private.h" -#include "smx_private.hpp" #include "xbt/str.h" #include "xbt/ex.h" /* ex_backtrace_display */ #include "mc/mc.h" #include "src/mc/mc_replay.h" #include "simgrid/sg_config.h" +#include "src/simix/SynchroExec.hpp" +#include "src/simix/SynchroComm.hpp" +#include "src/simix/SynchroSleep.hpp" +#include "src/simix/SynchroIo.hpp" +#include "src/simix/SynchroRaw.hpp" + #if HAVE_MC #include "src/mc/mc_private.h" #include "src/mc/mc_protocol.h" @@ -42,18 +49,16 @@ static xbt_heap_t simix_timers = NULL; /** @brief Timer datatype */ typedef struct s_smx_timer { - double date; - void(* func)(void*); - void* args; + double date = 0.0; + std::function callback; + + s_smx_timer() {} + s_smx_timer(double date, std::function callback) + : date(date), callback(std::move(callback)) {} } 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); - - int _sg_do_verbose_exit = 1; static void inthandler(int ignored) { @@ -188,11 +193,10 @@ void SIMIX_global_init(int *argc, char **argv) simgrid::mc::Client::initialize(); #endif - s_smx_process_t proc; - if (!simix_global) { simix_global = xbt_new0(s_smx_global_t, 1); + 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_list = xbt_swag_new(xbt_swag_offset(proc, process_hookup)); @@ -204,9 +208,6 @@ void SIMIX_global_init(int *argc, char **argv) simix_global->create_process_function = SIMIX_process_create; simix_global->kill_process_function = kill_process; simix_global->cleanup_process_function = SIMIX_process_cleanup; - 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->mutex = xbt_os_mutex_init(); surf_init(argc, argv); /* Initialize SURF structures */ @@ -245,9 +246,10 @@ void SIMIX_global_init(int *argc, char **argv) SIMIX_STORAGE_LEVEL = xbt_lib_add_level(storage_lib, SIMIX_storage_destroy); } - if (!simix_timers) { - simix_timers = xbt_heap_new(8, &free); - } + if (!simix_timers) + simix_timers = xbt_heap_new(8, [](void* p) { + delete static_cast(p); + }); if (xbt_cfg_get_boolean("clean-atexit")) atexit(SIMIX_clean); @@ -295,7 +297,7 @@ void SIMIX_clean(void) simix_global->mutex = NULL; /* Let's free maestro now */ - SIMIX_context_free(simix_global->maestro_process->context); + 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; @@ -309,7 +311,6 @@ void SIMIX_clean(void) surf_exit(); - xbt_mallocator_free(simix_global->synchro_mallocator); xbt_free(simix_global); simix_global = NULL; @@ -469,9 +470,15 @@ 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->func) - timer->func(timer->args); - xbt_free(timer); + if (timer->callback) { + try { + timer->callback(); + } + catch(...) { + xbt_die("Exception throwed ouf of timer callback"); + } + } + delete timer; } /* Wake up all processes waiting for a Surf action to finish */ @@ -528,14 +535,18 @@ void SIMIX_run(void) */ smx_timer_t SIMIX_timer_set(double date, void (*function)(void*), void *arg) { - smx_timer_t timer = xbt_new0(s_smx_timer_t, 1); + smx_timer_t timer = new s_smx_timer_t(date, std::bind(function, arg)); + xbt_heap_push(simix_timers, timer, date); + return timer; +} - timer->date = date; - timer->func = function; - timer->args = arg; +smx_timer_t SIMIX_timer_set(double date, std::function callback) +{ + smx_timer_t timer = new s_smx_timer_t(date, std::move(callback)); xbt_heap_push(simix_timers, timer, date); return timer; } + /** @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); @@ -554,8 +565,7 @@ double SIMIX_timer_get_date(smx_timer_t timer) { * to call SIMIX_process_create(). * \param function create process function */ -void SIMIX_function_register_process_create(smx_creation_func_t - function) +void SIMIX_function_register_process_create(smx_creation_func_t function) { simix_global->create_process_function = function; } @@ -607,67 +617,45 @@ void SIMIX_display_process_status(void) if (process->waiting_synchro) { const char* synchro_description = "unknown"; - switch (process->waiting_synchro->type) { - case SIMIX_SYNC_EXECUTE: + if (dynamic_cast(process->waiting_synchro) != nullptr) synchro_description = "execution"; - break; - - case SIMIX_SYNC_PARALLEL_EXECUTE: - synchro_description = "parallel execution"; - break; - case SIMIX_SYNC_COMMUNICATE: + if (dynamic_cast(process->waiting_synchro) != nullptr) synchro_description = "communication"; - break; - case SIMIX_SYNC_SLEEP: + if (dynamic_cast(process->waiting_synchro) != nullptr) synchro_description = "sleeping"; + + if (dynamic_cast(process->waiting_synchro) != nullptr) + synchro_description = "synchronization"; + + if (dynamic_cast(process->waiting_synchro) != nullptr) + synchro_description = "I/O"; + + + /* + switch (process->waiting_synchro->type) { + case SIMIX_SYNC_PARALLEL_EXECUTE: + synchro_description = "parallel execution"; break; case SIMIX_SYNC_JOIN: synchro_description = "joining"; break; +*/ - case SIMIX_SYNC_SYNCHRO: - synchro_description = "synchronization"; - break; - - case SIMIX_SYNC_IO: - synchro_description = "I/O"; - break; - } XBT_INFO("Process %lu (%s@%s): waiting for %s synchro %p (%s) in state %d to finish", - process->pid, process->name, sg_host_get_name(process->host), + 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); } else { - XBT_INFO("Process %lu (%s@%s)", process->pid, process->name, sg_host_get_name(process->host)); + XBT_INFO("Process %lu (%s@%s)", process->pid, process->name.c_str(), sg_host_get_name(process->host)); } } } -static void* SIMIX_synchro_mallocator_new_f(void) { - smx_synchro_t synchro = xbt_new(s_smx_synchro_t, 1); - synchro->simcalls = xbt_fifo_new(); - return synchro; -} - -static void SIMIX_synchro_mallocator_free_f(void* synchro) { - xbt_fifo_free(((smx_synchro_t) synchro)->simcalls); - xbt_free(synchro); -} - -static void SIMIX_synchro_mallocator_reset_f(void* synchro) { - - // we also recycle the simcall list - xbt_fifo_t fifo = ((smx_synchro_t) synchro)->simcalls; - xbt_fifo_reset(fifo); - memset(synchro, 0, sizeof(s_smx_synchro_t)); - ((smx_synchro_t) synchro)->simcalls = fifo; -} - xbt_dict_t simcall_HANDLER_asr_get_properties(smx_simcall_t simcall, const char *name){ return SIMIX_asr_get_properties(name); }