X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f1664c170760cbfce0ab2698557424304d22e63e..6443d4868c5974225d792156daf319775234b087:/src/msg/msg_actions.c

diff --git a/src/msg/msg_actions.c b/src/msg/msg_actions.c
index 022ffb1257..5ac10d13da 100644
--- a/src/msg/msg_actions.c
+++ b/src/msg/msg_actions.c
@@ -4,7 +4,8 @@
 /* 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 "simgrid_config.h"     /* getline */
+#include "simgrid_config.h" //For getline, keep that include first
+
 #include "msg/private.h"
 #include "xbt/str.h"
 #include "xbt/dynar.h"
@@ -60,7 +61,7 @@ static int MSG_action_runner(int argc, char *argv[])
       free(evt);
     }
   } else {                      // Should have got my trace file in argument
-    xbt_assert1(argc >= 2,
+    xbt_assert(argc >= 2,
                 "No '%s' agent function provided, no simulation-wide trace file provided to MSG_action_trace_run(), "
                 "and no process-wide trace file provided in deployment file. Aborting.",
                 argv[0]
@@ -72,7 +73,7 @@ static int MSG_action_runner(int argc, char *argv[])
         (*function) (evt);
         free(evt);
       } else {
-        WARN1("%s: Ignore trace element not for me",
+        XBT_WARN("%s: Ignore trace element not for me",
               xbt_replay_trace_reader_position(reader));
       }
     }
@@ -170,18 +171,18 @@ MSG_error_t MSG_action_trace_run(char *path)
 
   if (path) {
     action_fp = fopen(path, "r");
-    xbt_assert2(action_fp != NULL, "Cannot open %s: %s", path,
+    xbt_assert(action_fp != NULL, "Cannot open %s: %s", path,
                 strerror(errno));
   }
   res = MSG_main();
 
   if (xbt_dict_size(action_queues)) {
-    WARN0
+    XBT_WARN
         ("Not all actions got consumed. If the simulation ended successfully (without deadlock), you may want to add new processes to your deployment file.");
 
 
     xbt_dict_foreach(action_queues, cursor, name, todo) {
-      WARN2("Still %lu actions for %s", xbt_dynar_length(todo), name);
+      XBT_WARN("Still %lu actions for %s", xbt_dynar_length(todo), name);
     }
   }