Merge pull request #17 from mpoquet/master

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

diff --git a/src/msg/msg_actions.c b/src/msg/msg_actions.c
index 885661e..5988740 100644 (file)
--- a/src/msg/msg_actions.c
+++ b/src/msg/msg_actions.c
@@ -1,4 +1,4 @@
-/* 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
@@ -15,13 +15,13 @@ 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();
 }
@@ -41,28 +41,28 @@ msg_error_t MSG_action_trace_run(char *path)
   xbt_dynar_t todo;
   xbt_dict_cursor_t cursor;
 
-  action_fp=NULL;  
+  xbt_action_fp=NULL;
   if (path) {
-    action_fp = fopen(path, "r");
-    xbt_assert(action_fp != NULL, "Cannot open %s: %s", path,
-                strerror(errno));
+         xbt_action_fp = fopen(path, "r");
+    if (xbt_action_fp == NULL)
+      xbt_die("Cannot open %s: %s", path, strerror(errno));
   }
   res = MSG_main();
 
-  if (!xbt_dict_is_empty(action_queues)) {
+  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_dict_foreach(action_queues, cursor, name, todo) {
+    xbt_dict_foreach(xbt_action_queues, cursor, name, todo) {
       XBT_WARN("Still %lu actions for %s", xbt_dynar_length(todo), name);
     }
   }
 
   if (path)
-    fclose(action_fp);
-  xbt_dict_free(&action_queues);
-  action_queues = xbt_dict_new_homogeneous(NULL);
+    fclose(xbt_action_fp);
+  xbt_dict_free(&xbt_action_queues);
+  xbt_action_queues = xbt_dict_new_homogeneous(NULL);
 
   return res;
 }