X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9b605c24eb28349bfb6d61da080733e19a7cb9a2..1c6ecd7825422241dd932318a4ba03c3df1de985:/src/msg/msg_global.c diff --git a/src/msg/msg_global.c b/src/msg/msg_global.c index 99240fd137..404d8bf446 100644 --- a/src/msg/msg_global.c +++ b/src/msg/msg_global.c @@ -67,6 +67,7 @@ void MSG_global_init(int *argc, char **argv) msg_global->max_channel = 0; msg_global->PID = 1; msg_global->sent_msg = 0; + msg_global->task_copy_callback = NULL; /* initialization of the action module */ _MSG_action_init(); @@ -74,6 +75,7 @@ void MSG_global_init(int *argc, char **argv) SIMIX_function_register_process_create(MSG_process_create_from_SIMIX); SIMIX_function_register_process_cleanup(MSG_process_cleanup_from_SIMIX); SIMIX_function_register_process_kill(MSG_process_kill_from_SIMIX); + SIMIX_comm_set_copy_data_callback(MSG_comm_copy_data_from_SIMIX); } #ifdef HAVE_TRACING TRACE_start(); @@ -168,29 +170,15 @@ MSG_error_t MSG_main_stateful(void) return MSG_OK; } -MSG_error_t MSG_main_liveness_stateful(xbt_automaton_t a) -{ - /* Clean IO before the run */ - fflush(stdout); - fflush(stderr); - - if (MC_IS_ENABLED) { - MC_modelcheck_liveness_stateful(a); - } - else { - SIMIX_run(); - } - return MSG_OK; -} -MSG_error_t MSG_main_liveness_stateless(xbt_automaton_t a, char *prgm) +MSG_error_t MSG_main_liveness(xbt_automaton_t a, char *prgm) { /* Clean IO before the run */ fflush(stdout); fflush(stderr); if (MC_IS_ENABLED) { - MC_modelcheck_liveness_stateless(a, prgm); + MC_modelcheck_liveness(a, prgm); } else { SIMIX_run();