X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/91065b676e80a8c26a356477b018f2aae9b6eea7..e631fc4ebfccaf24508e14216a9138669a635c6a:/src/msg/msg_global.c

diff --git a/src/msg/msg_global.c b/src/msg/msg_global.c
index d1a8e5a0bd..47e85704a9 100644
--- a/src/msg/msg_global.c
+++ b/src/msg/msg_global.c
@@ -21,19 +21,12 @@ MSG_Global_t msg_global = NULL;
 
 /********************************* MSG **************************************/
 
-/** \ingroup msg_simulation
- * \brief Initialize some MSG internal data.
+/* @brief Initialize MSG with less verifications
+ *
+ * You should use the MSG_init() function instead. Failing to do so may turn into PEBKAC some day. You've been warned.
  */
-void MSG_global_init_args(int *argc, char **argv)
-{
-  MSG_global_init(argc, argv);
-}
+void MSG_init_nocheck(int *argc, char **argv) {
 
-/** \ingroup msg_simulation
- * \brief Initialize some MSG internal data.
- */
-void MSG_global_init(int *argc, char **argv)
-{
 #ifdef HAVE_TRACING
   TRACE_global_init(argc, argv);
 #endif
@@ -60,7 +53,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_function_register_process_kill(MSG_process_kill);
   }
 #ifdef HAVE_TRACING
   TRACE_start();
@@ -68,7 +61,6 @@ 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
@@ -117,40 +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_stateful(void)
-{
-  /* Clean IO before the run */
-  fflush(stdout);
-  fflush(stderr);
-
-  if (MC_IS_ENABLED) {
-    MC_modelcheck_stateful();
-  }
-  else {
-    SIMIX_run();
-  }
-  return MSG_OK;
-}
-
-
-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(a, prgm);
-  }
-  else {
+    MC_do_the_modelcheck_for_real();
+  } else {
     SIMIX_run();
   }
   return MSG_OK;