X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2d62f02c44fd56836ab5c3a6183d6a89aa01be26..70237dd480d59d0d5a686a28167267eb8e2ee8a4:/src/msg/msg_actions.cpp diff --git a/src/msg/msg_actions.cpp b/src/msg/msg_actions.cpp index 2e06c746e3..1fd0b4133a 100644 --- a/src/msg/msg_actions.cpp +++ b/src/msg/msg_actions.cpp @@ -5,15 +5,12 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "msg_private.h" -#include "xbt/str.h" #include "xbt/dynar.h" #include "xbt/replay.h" #include -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_action, msg, - "MSG actions for trace driven simulation"); - +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_action, msg, "MSG actions for trace driven simulation"); void MSG_action_init() { @@ -26,8 +23,6 @@ void MSG_action_exit() _xbt_replay_action_exit(); } - - /** \ingroup msg_trace_driven * \brief A trace loader * @@ -43,16 +38,14 @@ msg_error_t MSG_action_trace_run(char *path) xbt_action_fp=NULL; if (path) { - xbt_action_fp = fopen(path, "r"); - if (xbt_action_fp == NULL) - xbt_die("Cannot open %s: %s", path, strerror(errno)); + xbt_action_fp = fopen(path, "r"); + xbt_assert(xbt_action_fp != NULL, "Cannot open %s: %s", path, strerror(errno)); } res = MSG_main(); if (!xbt_dict_is_empty(xbt_action_queues)) { - 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_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(xbt_action_queues, cursor, name, todo) { XBT_WARN("Still %lu actions for %s", xbt_dynar_length(todo), name);