X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/aef8ad40dbb075883c0b147319cd73ed813f8cb9..4c506a1e81412766b68c4a2ab989790562ec1ff0:/src/msg/global.c

diff --git a/src/msg/global.c b/src/msg/global.c
index 431996b89d..f49fac8e50 100644
--- a/src/msg/global.c
+++ b/src/msg/global.c
@@ -81,14 +81,6 @@ void MSG_global_init(int *argc, char **argv)
   return;
 }
 
-/** \ingroup msg_easier_life
- * \brief Traces MSG events in the Paje format.
- */
-
-void MSG_paje_output(const char *filename)
-{
-}
-
 /** \defgroup m_channel_management    Understanding channels
  *  \brief This section briefly describes the channel notion of MSG
  *  (#m_channel_t).
@@ -146,32 +138,13 @@ int MSG_get_channel_number(void)
  */
 MSG_error_t MSG_main(void)
 {
-  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 **", SIMIX_action_get_name(smx_action));
-      SIMIX_action_signal_all(smx_action);
-    }
-
-    while ((smx_action = xbt_fifo_pop(actions_done))) {
-      DEBUG1("** %s done **", SIMIX_action_get_name(smx_action));
-      SIMIX_action_signal_all(smx_action);      
-    }
-  }
-  xbt_fifo_free(actions_failed);
-  xbt_fifo_free(actions_done);
+  while (SIMIX_solve(NULL, NULL) != -1.0);
+  
   return MSG_OK;
 }
 
@@ -210,6 +183,9 @@ MSG_error_t MSG_clean(void)
   m_host_t h = NULL;
   m_process_t p = NULL;
 
+#ifdef HAVE_TRACING
+  TRACE_msg_clean ();
+#endif
 
   while ((p = xbt_fifo_pop(msg_global->process_list))) {
     MSG_process_kill(p);
@@ -227,9 +203,10 @@ MSG_error_t MSG_clean(void)
   /* cleanup all resources in the mailbox module */
   MSG_mailbox_mod_exit();
 
-  SIMIX_clean();
-
+  /* initialization of the action module */
+  _MSG_action_exit();
 
+  SIMIX_clean();
 
   return MSG_OK;
 }