X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/143a28bbbc8b35fc3fc1098e57f827fe95b8fb31..6229ff3a39c8fb195846ea9eb67cf071654de597:/src/msg/msg_actions.c diff --git a/src/msg/msg_actions.c b/src/msg/msg_actions.c index 933cf3e18d..5ac10d13da 100644 --- a/src/msg/msg_actions.c +++ b/src/msg/msg_actions.c @@ -4,11 +4,12 @@ /* 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" //For getline, keep that include first + #include "msg/private.h" #include "xbt/str.h" #include "xbt/dynar.h" #include "xbt/replay_trace_reader.h" -#include "simgrid_config.h" //For getline XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_action, msg, "MSG actions for trace driven simulation"); @@ -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] @@ -170,7 +171,7 @@ 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();