MASSIVE cleanup: s/workstation/host/

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

diff --git a/src/msg/msg_global.c b/src/msg/msg_global.c
index 9429b10..bfb859b 100644 (file)
--- 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);
 
@@ -127,7 +122,7 @@ msg_error_t MSG_main(void)
   fflush(stderr);
 
   if (MC_is_active()) {
-    MC_do_the_modelcheck_for_real();
+    MC_run();
   } else {
     SIMIX_run();
   }
@@ -140,7 +135,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()");
@@ -170,17 +165,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;
 }