X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/226d3997c4e356a1935b7d51b310034b4833afb9..6de9090dd8692387ae343c587b26915f9922d7bd:/src/msg/msg_global.c diff --git a/src/msg/msg_global.c b/src/msg/msg_global.c index cb06f1d970..555f8aae93 100644 --- a/src/msg/msg_global.c +++ b/src/msg/msg_global.c @@ -11,6 +11,7 @@ #include "xbt/log.h" #include "xbt/virtu.h" #include "xbt/ex.h" /* ex_backtrace_display */ +#include "xbt/replay.h" XBT_LOG_NEW_CATEGORY(msg, "All MSG categories"); XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_kernel, msg, @@ -39,6 +40,8 @@ void MSG_global_init(int *argc, char **argv) xbt_getpid = MSG_process_self_PID; if (!msg_global) { + s_msg_vm_t vm; // to compute the offset + SIMIX_global_init(argc, argv); msg_global = xbt_new0(s_MSG_Global_t, 1); @@ -50,6 +53,7 @@ void MSG_global_init(int *argc, char **argv) msg_global->sent_msg = 0; msg_global->task_copy_callback = NULL; msg_global->process_data_cleanup = NULL; + msg_global->vms = xbt_swag_new(xbt_swag_offset(vm,all_vms_hookup)); /* initialization of the action module */ _MSG_action_init(); @@ -64,6 +68,7 @@ void MSG_global_init(int *argc, char **argv) XBT_DEBUG("ADD MSG LEVELS"); MSG_HOST_LEVEL = xbt_lib_add_level(host_lib, (void_f_pvoid_t) __MSG_host_destroy); + } #ifdef MSG_USE_DEPRECATED @@ -136,14 +141,14 @@ MSG_error_t MSG_main_stateful(void) } -MSG_error_t MSG_main_liveness(xbt_automaton_t a, char *prgm) +MSG_error_t MSG_main_liveness(xbt_automaton_t a) { /* Clean IO before the run */ fflush(stdout); fflush(stderr); if (MC_IS_ENABLED) { - MC_modelcheck_liveness(a, prgm); + MC_modelcheck_liveness(a); } else { SIMIX_run(); @@ -193,6 +198,7 @@ MSG_error_t MSG_clean(void) SIMIX_clean(); + xbt_swag_free(msg_global->vms); free(msg_global); msg_global = NULL;