Sanitize channel naming.

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

diff --git a/src/msg/global.c b/src/msg/global.c
index 0bd5c6c..35c31c1 100644 (file)
--- a/src/msg/global.c
+++ b/src/msg/global.c
@@ -8,8 +8,8 @@
 #include "private.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(global, msg,
-                               "Logging specific to MSG (global)");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_kernel, msg,
+                               "Logging specific to MSG (kernel)");
 
 int __stop_at_time = -1.0 ;
 
@@ -22,6 +22,7 @@ MSG_Global_t msg_global = NULL;
  *  \brief This section describes the functions you need to know to
  *  set up a simulation. You should have a look at \ref MSG_examples 
  *  to have an overview of their usage.
+ *    \htmlonly <!-- DOXYGEN_NAVBAR_LABEL="Simulation functions" --> \endhtmlonly
  */
 
 /********************************* MSG **************************************/
@@ -142,6 +143,7 @@ void MSG_paje_output(const char *filename)
     "% EntityType      string\n"
     "% Container       string\n"
     "% Value   string\n"
+    "% TaskName        string\n"
     "%EndEventDef\n"
     "%EventDef PajePopState    12\n"
     "% Time    date\n"
@@ -205,7 +207,7 @@ void MSG_paje_output(const char *filename)
 
   len = strlen(filename);
   if((len<ext_len) || (strncmp(filename+len-ext_len,ext,ext_len))) {
-    CRITICAL2("%s does not end by \"%s\". It may cause troubles when using Paje\n",
+    CRITICAL2("The name of the Paje trace file \"%s\" does not end by \"%s\". Paje will cause difficulties to read it.\n",
              filename,ext);
   }
 
@@ -236,6 +238,8 @@ 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).
+ *    \htmlonly <!-- DOXYGEN_NAVBAR_LABEL="Channels" --> \endhtmlonly
+ * 
  *
  *  For convenience, the simulator provides the notion of channel
  *  that is close to the tag notion in MPI. A channel is not a
@@ -326,9 +330,9 @@ MSG_error_t MSG_main(void)
       }
       
       if(!state_modifications) {
-       DEBUG1("%g : Calling surf_solve",MSG_get_clock());
+       DEBUG1("%f : Calling surf_solve",MSG_get_clock());
        elapsed_time = surf_solve();
-       DEBUG1("Elapsed_time %g",elapsed_time);
+       DEBUG1("Elapsed_time %f",elapsed_time);
        
        if (elapsed_time<0.0) {
          /*       fprintf(stderr, "We're done %g\n",elapsed_time); */
@@ -466,7 +470,7 @@ int MSG_process_killall(int reset_PIDs)
   m_process_t p = NULL;
   m_process_t self = MSG_process_self();
 
-  while((p=xbt_fifo_shift(msg_global->process_list))) {
+  while((p=xbt_fifo_pop(msg_global->process_list))) {
     if(p!=self) MSG_process_kill(p);
   }
 
@@ -494,7 +498,7 @@ MSG_error_t MSG_clean(void)
   m_process_t p = NULL;
 
 
-  while((p=xbt_fifo_shift(msg_global->process_list))) {
+  while((p=xbt_fifo_pop(msg_global->process_list))) {
     MSG_process_kill(p);
   }
   xbt_context_exit();