Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

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

diff --git a/src/msg/msg_actions.c b/src/msg/msg_actions.c
index d994c3f..434b254 100644 (file)
--- a/src/msg/msg_actions.c
+++ b/src/msg/msg_actions.c
@@ -1,27 +1,27 @@
-/* Copyright (c) 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2009-2014. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* 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.h"
 
+#include <errno.h>
+
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_action, msg,
                                 "MSG actions for trace driven simulation");
 
 
-void _MSG_action_init()
+void MSG_action_init()
 {
   _xbt_replay_action_init();
   MSG_function_register_default(xbt_replay_action_runner);
 }
 
-void _MSG_action_exit()
+void MSG_action_exit()
 {
   _xbt_replay_action_exit();
 }
@@ -34,9 +34,9 @@ void _MSG_action_exit()
  *  If path!=NULL, 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)
+msg_error_t MSG_action_trace_run(char *path)
 {
-  MSG_error_t res;
+  msg_error_t res;
   char *name;
   xbt_dynar_t todo;
   xbt_dict_cursor_t cursor;
@@ -44,8 +44,8 @@ MSG_error_t MSG_action_trace_run(char *path)
   action_fp=NULL;  
   if (path) {
     action_fp = fopen(path, "r");
-    xbt_assert(action_fp != NULL, "Cannot open %s: %s", path,
-                strerror(errno));
+    if (action_fp == NULL)
+      xbt_die("Cannot open %s: %s", path, strerror(errno));
   }
   res = MSG_main();