X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dff9e15c44ab6340d27215957c56fa72fad246a2..96e88da53587bca891dce3ddb7772eff544e96be:/src/msg/global.c

diff --git a/src/msg/global.c b/src/msg/global.c
index d5de0ca9d6..46f25b58a2 100644
--- a/src/msg/global.c
+++ b/src/msg/global.c
@@ -1,13 +1,11 @@
-/*     $Id$      */
-
-/* Copyright (c) 2002-2007 Arnaud Legrand.                                  */
-/* Copyright (c) 2007 Bruno Donassolo.                                      */
-/* All rights reserved.                                                     */
+/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+ * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "msg/private.h"
+#include "mc/mc.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
 #include "xbt/virtu.h"
@@ -50,6 +48,10 @@ XBT_LOG_EXTERNAL_CATEGORY(msg_process);
  */
 void MSG_global_init(int *argc, char **argv)
 {
+#ifdef HAVE_TRACING
+  TRACE_global_init(argc, argv);
+#endif
+
   xbt_getpid = MSG_process_self_PID;
   if (!msg_global) {
     /* Connect our log channels: that must be done manually under windows */
@@ -68,9 +70,6 @@ void MSG_global_init(int *argc, char **argv)
     msg_global->PID = 1;
     msg_global->sent_msg = 0;
 
-    /* initialization of the mailbox module */
-    MSG_mailbox_mod_init();
-
     /* initialization of the action module */
     _MSG_action_init();
 
@@ -78,15 +77,9 @@ void MSG_global_init(int *argc, char **argv)
     SIMIX_function_register_process_cleanup(__MSG_process_cleanup);
     SIMIX_function_register_process_kill(_MSG_process_kill_from_SIMIX);
   }
-  return;
-}
-
-/** \ingroup msg_easier_life
- * \brief Traces MSG events in the Paje format.
- */
-
-void MSG_paje_output(const char *filename)
-{
+#ifdef HAVE_TRACING
+  TRACE_start();
+#endif
 }
 
 /** \defgroup m_channel_management    Understanding channels
@@ -146,40 +139,16 @@ int MSG_get_channel_number(void)
  */
 MSG_error_t MSG_main(void)
 {
-  smx_cond_t cond = NULL;
-  smx_action_t smx_action;
-  xbt_fifo_t actions_done = xbt_fifo_new();
-  xbt_fifo_t actions_failed = xbt_fifo_new();
-
   /* Clean IO before the run */
   fflush(stdout);
   fflush(stderr);
-  SIMIX_init();
 
-  //surf_solve(); /* Takes traces into account. Returns 0.0 */
-  /* xbt_fifo_size(msg_global->process_to_run) */
-
-  while (SIMIX_solve(actions_done, actions_failed) != -1.0) {
-
-    while ((smx_action = xbt_fifo_pop(actions_failed))) {
-
-
-      DEBUG1("** %s failed **", smx_action->name);
-      while ((cond = xbt_fifo_pop(smx_action->cond_list))) {
-        SIMIX_cond_broadcast(cond);
-      }
-    }
-
-    while ((smx_action = xbt_fifo_pop(actions_done))) {
-
-      DEBUG1("** %s done **", smx_action->name);
-      while ((cond = xbt_fifo_pop(smx_action->cond_list))) {
-        SIMIX_cond_broadcast(cond);
-      }
-    }
+  if (MC_IS_ENABLED) {
+    MC_modelcheck();
+  }
+  else {
+    SIMIX_run();
   }
-  xbt_fifo_free(actions_failed);
-  xbt_fifo_free(actions_done);
   return MSG_OK;
 }
 
@@ -218,6 +187,9 @@ MSG_error_t MSG_clean(void)
   m_host_t h = NULL;
   m_process_t p = NULL;
 
+#ifdef HAVE_TRACING
+  TRACE_surf_release();
+#endif
 
   while ((p = xbt_fifo_pop(msg_global->process_list))) {
     MSG_process_kill(p);
@@ -232,12 +204,14 @@ MSG_error_t MSG_clean(void)
   free(msg_global);
   msg_global = NULL;
 
-  /* cleanup all resources in the mailbox module */
-  MSG_mailbox_mod_exit();
-
-  SIMIX_clean();
+  /* initialization of the action module */
+  _MSG_action_exit();
 
+#ifdef HAVE_TRACING
+  TRACE_end();
+#endif
 
+  SIMIX_clean();
 
   return MSG_OK;
 }
@@ -246,7 +220,7 @@ MSG_error_t MSG_clean(void)
 /** \ingroup msg_easier_life
  * \brief A clock (in second).
  */
-double MSG_get_clock(void)
+XBT_INLINE double MSG_get_clock(void)
 {
   return SIMIX_get_clock();
 }