X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/887298295d00eac540e0b73429e58e77fb0ee4ab..f275f02285f9b85e302886c73f418df1cfeb6a7a:/src/msg/msg_global.c

diff --git a/src/msg/msg_global.c b/src/msg/msg_global.c
index 018afcb7f5..4a39e27b04 100644
--- a/src/msg/msg_global.c
+++ b/src/msg/msg_global.c
@@ -37,9 +37,7 @@ static void _sg_cfg_cb_msg_debug_multiple_use(const char *name, int pos)
  */
 void MSG_init_nocheck(int *argc, char **argv) {
 
-#ifdef HAVE_TRACING
   TRACE_global_init(argc, argv);
-#endif
 
   xbt_getpid = MSG_process_self_PID;
   if (!msg_global) {
@@ -60,9 +58,6 @@ void MSG_init_nocheck(int *argc, char **argv) {
     msg_global->task_copy_callback = NULL;
     msg_global->process_data_cleanup = NULL;
 
-    /* initialization of the action module */
-    _MSG_action_init();
-
     SIMIX_function_register_process_create(MSG_process_create_from_SIMIX);
     SIMIX_function_register_process_cleanup(MSG_process_cleanup_from_SIMIX);
 
@@ -74,12 +69,7 @@ void MSG_init_nocheck(int *argc, char **argv) {
     MC_ignore_heap(&(msg_global->sent_msg), sizeof(msg_global->sent_msg));
   }
 
-#ifdef HAVE_TRACING
-  TRACE_start();
-#endif
-
   XBT_DEBUG("ADD MSG LEVELS");
-  MSG_HOST_LEVEL = xbt_lib_add_level(host_lib, (void_f_pvoid_t) __MSG_host_priv_free);
   MSG_STORAGE_LEVEL = xbt_lib_add_level(storage_lib, (void_f_pvoid_t) __MSG_storage_destroy);
   MSG_FILE_LEVEL = xbt_lib_add_level(file_lib, (void_f_pvoid_t) __MSG_file_destroy);
   if(sg_cfg_get_boolean("clean_atexit")) atexit(MSG_exit);
@@ -131,7 +121,7 @@ msg_error_t MSG_main(void)
   fflush(stderr);
 
   if (MC_is_active()) {
-    MC_do_the_modelcheck_for_real();
+    MC_run();
   } else {
     SIMIX_run();
   }
@@ -144,7 +134,7 @@ msg_error_t MSG_main(void)
  * Do --help on any simgrid binary to see the list of currently existing configuration variables, and see Section @ref options.
  *
  * Example:
- * MSG_config("workstation/model","ptask_L07");
+ * MSG_config("host/model","ptask_L07");
  */
 void MSG_config(const char *key, const char *value){
   xbt_assert(msg_global,"ERROR: Please call MSG_init() before using MSG_config()");
@@ -174,17 +164,8 @@ static void MSG_exit(void) {
   if (msg_global==NULL)
     return;
 
-#ifdef HAVE_TRACING
   TRACE_surf_resource_utilization_release();
-#endif
-
-  /* initialization of the action module */
-  _MSG_action_exit();
-
-#ifdef HAVE_TRACING
   TRACE_end();
-#endif
-
   free(msg_global);
   msg_global = NULL;
 }