X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/79328778c30dcf5d6a2bffefd8c32821c9550f7a..b784c77ac5599c578f0ff00d6102222b286b0833:/src/xbt/xbt_replay.c?ds=sidebyside

diff --git a/src/xbt/xbt_replay.c b/src/xbt/xbt_replay.c
index ded2f58bfd..f539ed1426 100644
--- a/src/xbt/xbt_replay.c
+++ b/src/xbt/xbt_replay.c
@@ -1,11 +1,10 @@
-/* Copyright (c) 2010. The SimGrid Team.
+/* Copyright (c) 2010, 2012-2013. 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 "gras_config.h"
+#include "internal_config.h"
 #include <errno.h>
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
@@ -22,11 +21,15 @@ typedef struct s_replay_reader {
   char *filename; int linenum;
 } s_xbt_replay_reader_t;
 
+FILE *action_fp;
+
+xbt_dict_t action_funs;
+xbt_dict_t action_queues;
+
 static char *action_line = NULL;
 static size_t action_len = 0;
 
-
-static const char **action_get_action(char *name);
+static char **action_get_action(char *name);
 
 xbt_replay_reader_t xbt_replay_reader_new(const char *filename)
 {
@@ -49,7 +52,7 @@ const char **xbt_replay_reader_get(xbt_replay_reader_t reader)
 {
   ssize_t read;
   xbt_dynar_t d;
-  read = getline(&reader->line, &reader->line_len, reader->fp);
+  read = xbt_getline(&reader->line, &reader->line_len, reader->fp);
   //XBT_INFO("got from trace: %s",reader->line);
   reader->linenum++;
   if (read==-1)
@@ -79,11 +82,12 @@ void xbt_replay_reader_free(xbt_replay_reader_t *reader)
   *reader=NULL;
 }
 
-/** \ingroup xbt_replay
+/**
+ * \ingroup XBT_replay
  * \brief Registers a function to handle a kind of action
  *
  * Registers a function to handle a kind of action
- * This table is then used by #xbt_replay_action_run
+ * This table is then used by \ref xbt_replay_action_runner
  *
  * The argument of the function is the line describing the action, splitted on spaces with xbt_str_split_quoted()
  *
@@ -95,7 +99,7 @@ void xbt_replay_action_register(const char *action_name, action_fun function)
   xbt_dict_set(action_funs, action_name, function, NULL);
 }
 
-/** \ingroup xbt_replay
+/** \ingroup XBT_replay
  * \brief Unregisters a function, which handled a kind of action
  *
  * \param action_name the reference name of the action.
@@ -118,18 +122,28 @@ void _xbt_replay_action_exit(void)
   free(action_line);
 }
 
+/**
+ * \ingroup XBT_replay
+ * \brief TODO
+
+ * \param argc argc .
+ * \param argv argv
+ */
 int xbt_replay_action_runner(int argc, char *argv[])
 {
-  const char **evt;
+  int i;
   if (action_fp) {              // A unique trace file
-
+    char **evt;
     while ((evt = action_get_action(argv[0]))) {
       action_fun function =
         (action_fun)xbt_dict_get(action_funs, evt[1]);
-      function(evt);
+      function((const char **)evt);
+      for (i=0;evt[i]!= NULL;i++)
+        free(evt[i]);
       free(evt);
     }
   } else {                      // Should have got my trace file in argument
+    const char **evt;
     xbt_assert(argc >= 2,
                 "No '%s' agent function provided, no simulation-wide trace file provided, "
                 "and no process-wide trace file provided in deployment file. Aborting.",
@@ -138,14 +152,13 @@ int xbt_replay_action_runner(int argc, char *argv[])
     xbt_replay_reader_t reader = xbt_replay_reader_new(argv[1]);
     while ((evt=xbt_replay_reader_get(reader))) {
       if (!strcmp(argv[0],evt[0])) {
-        action_fun function =
-          (action_fun)xbt_dict_get(action_funs, evt[1]);
+        action_fun function = (action_fun)xbt_dict_get(action_funs, evt[1]);
         function(evt);
-        free(evt);
       } else {
         XBT_WARN("%s: Ignore trace element not for me",
               xbt_replay_reader_position(reader));
       }
+      free(evt);
     }
     xbt_replay_reader_free(&reader);
   }
@@ -153,7 +166,7 @@ int xbt_replay_action_runner(int argc, char *argv[])
 }
 
 
-static const char **action_get_action(char *name)
+static char **action_get_action(char *name)
 {
   xbt_dynar_t evt = NULL;
   char *evtname = NULL;
@@ -166,7 +179,7 @@ static const char **action_get_action(char *name)
     }
     // Read lines until I reach something for me (which breaks in loop body)
     // or end of file reached
-    while (getline(&action_line, &action_len, action_fp) != -1) {
+    while (xbt_getline(&action_line, &action_len, action_fp) != -1) {
       // cleanup and split the string I just read
       char *comment = strchr(action_line, '#');
       if (comment != NULL)