Remove MSG_process_kill_from_SIMIX

[simgrid.git] / src / msg / msg_global.c

diff --git a/src/msg/msg_global.c b/src/msg/msg_global.c
index 879461f..47e8570 100644 (file)
--- a/src/msg/msg_global.c
+++ b/src/msg/msg_global.c
@@ -53,7 +53,7 @@ void MSG_init_nocheck(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_function_register_process_kill(MSG_process_kill);
   }
 #ifdef HAVE_TRACING
   TRACE_start();
@@ -109,25 +109,8 @@ MSG_error_t MSG_main(void)
   fflush(stderr);
 
   if (MC_IS_ENABLED) {
-    MC_modelcheck();
-  }
-  else {
-    SIMIX_run();
-  }
-  return MSG_OK;
-}
-
-
-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);
-  }
-  else {
+    MC_do_the_modelcheck_for_real();
+  } else {
     SIMIX_run();
   }
   return MSG_OK;