X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7f4f03348bd07609e258eb3b545bdafc2c881847..0eead244337fde8f0508629f8f8473f946c19f88:/src/msg/msg_actions.cpp

diff --git a/src/msg/msg_actions.cpp b/src/msg/msg_actions.cpp
index 2e06c746e3..85f009f5a9 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 <errno.h>
 
-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,12 +23,10 @@ void MSG_action_exit()
   _xbt_replay_action_exit();
 }
 
-
-
 /** \ingroup msg_trace_driven
  * \brief A trace loader
  *
- *  If path!=NULL, load a trace file containing actions, and execute them.
+ *  If path!=nullptr, load a trace file containing actions, and execute them.
  *  Else, assume that each process gets the path in its deployment file
  */
 msg_error_t MSG_action_trace_run(char *path)
@@ -41,18 +36,16 @@ msg_error_t MSG_action_trace_run(char *path)
   xbt_dynar_t todo;
   xbt_dict_cursor_t cursor;
 
-  xbt_action_fp=NULL;
+  xbt_action_fp=nullptr;
   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 != nullptr, "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);
@@ -62,7 +55,7 @@ msg_error_t MSG_action_trace_run(char *path)
   if (path)
     fclose(xbt_action_fp);
   xbt_dict_free(&xbt_action_queues);
-  xbt_action_queues = xbt_dict_new_homogeneous(NULL);
+  xbt_action_queues = xbt_dict_new_homogeneous(nullptr);
 
   return res;
 }