-/* Copyright (c) 2010, 2012-2014. The SimGrid Team.
+/* Copyright (c) 2010, 2012-2015. 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 "internal_config.h"
-#include <errno.h>
+#include "src/internal_config.h"
#include "xbt/sysdep.h"
#include "xbt/log.h"
#include "xbt/str.h"
+#include "xbt/file.h"
#include "xbt/replay.h"
+
+#include <errno.h>
#include <ctype.h>
#include <wchar.h>
int linenum;
} s_xbt_replay_reader_t;
-FILE *action_fp;
+FILE *xbt_action_fp;
-xbt_dict_t action_funs;
-xbt_dict_t action_queues;
+xbt_dict_t xbt_action_funs = NULL;
+xbt_dict_t xbt_action_queues = NULL;
static char *action_line = NULL;
static size_t action_len = 0;
{
xbt_replay_reader_t res = xbt_new0(s_xbt_replay_reader_t,1);
res->fp = fopen(filename, "r");
- if (res->fp == NULL)
- xbt_die("Cannot open %s: %s", filename, strerror(errno));
+ xbt_assert(res->fp != NULL, "Cannot open %s: %s", filename, strerror(errno));
res->filename = xbt_strdup(filename);
return res;
}
-const char *xbt_replay_reader_position(xbt_replay_reader_t reader)
-{
- free(reader->position);
- reader->position = bprintf("%s:%d",reader->filename,reader->linenum);
- return reader->position;
-}
-
const char **xbt_replay_reader_get(xbt_replay_reader_t reader)
{
ssize_t read;
void xbt_replay_action_register(const char *action_name, action_fun function)
{
char* lowername = str_tolower (action_name);
- xbt_dict_set(action_funs, lowername, function, NULL);
+ xbt_dict_set(xbt_action_funs, lowername, function, NULL);
xbt_free(lowername);
}
-/** \ingroup XBT_replay
- * \brief Unregisters a function, which handled a kind of action
+/** @brief Initializes the replay mechanism, and returns true if (and only if) it was necessary
*
- * \param action_name the reference name of the action.
+ * It returns false if it was already done by another process.
*/
-void xbt_replay_action_unregister(const char *action_name)
-{
- char* lowername = str_tolower (action_name);
- xbt_dict_remove(action_funs, lowername);
- xbt_free(lowername);
-}
-
-void _xbt_replay_action_init(void)
+int _xbt_replay_action_init(void)
{
+ if (xbt_action_funs)
+ return 0;
is_replay_active = 1;
- action_funs = xbt_dict_new_homogeneous(NULL);
- action_queues = xbt_dict_new_homogeneous(NULL);
+ xbt_action_funs = xbt_dict_new_homogeneous(NULL);
+ xbt_action_queues = xbt_dict_new_homogeneous(NULL);
+ return 1;
}
void _xbt_replay_action_exit(void)
{
- xbt_dict_free(&action_queues);
- xbt_dict_free(&action_funs);
+ xbt_dict_free(&xbt_action_queues);
+ xbt_dict_free(&xbt_action_funs);
free(action_line);
+ xbt_action_queues = NULL;
+ xbt_action_funs = NULL;
+ action_line = NULL;
}
/**
{
int i;
xbt_ex_t e;
- if (action_fp) { // A unique trace file
+ if (xbt_action_fp) { // A unique trace file
char **evt;
while ((evt = action_get_action(argv[0]))) {
char* lowername = str_tolower (evt[1]);
- action_fun function =
- (action_fun)xbt_dict_get(action_funs, lowername);
+ action_fun function = (action_fun)xbt_dict_get(xbt_action_funs, lowername);
xbt_free(lowername);
TRY{
function((const char **)evt);
- }
- CATCH(e) {
- XBT_ERROR("Replay error :\n %s"
- , e.msg);
- xbt_ex_free(e);
- RETHROW;
+ } CATCH(e) {
+ free(evt);
+ xbt_die("Replay error :\n %s", e.msg);
}
for (i=0;evt[i]!= NULL;i++)
free(evt[i]);
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.",
- argv[0]
+ "and no process-wide trace file provided in deployment file. Aborting.", argv[0]
);
xbt_replay_reader_t reader = xbt_replay_reader_new(argv[1]);
while ((evt=xbt_replay_reader_get(reader))) {
if (!strcmp(argv[0],evt[0])) {
char* lowername = str_tolower (evt[1]);
- action_fun function = (action_fun)xbt_dict_get(action_funs, lowername);
+ action_fun function = (action_fun)xbt_dict_get(xbt_action_funs, lowername);
xbt_free(lowername);
TRY{
function(evt);
- }
- CATCH(e) {
+ } CATCH(e) {
free(evt);
- xbt_die("Replay error on line %d of file %s :\n %s"
- , reader->linenum,reader->filename, e.msg);
+ xbt_die("Replay error on line %d of file %s :\n %s" , reader->linenum,reader->filename, e.msg);
}
} else {
- XBT_WARN("%s: Ignore trace element not for me",
- xbt_replay_reader_position(reader));
+ XBT_WARN("%s:%d: Ignore trace element not for me", reader->filename, reader->linenum);
}
free(evt);
}
return 0;
}
-
static char **action_get_action(char *name)
{
xbt_dynar_t evt = NULL;
char *evtname = NULL;
- xbt_dynar_t myqueue = xbt_dict_get_or_null(action_queues, name);
+ xbt_dynar_t myqueue = xbt_dict_get_or_null(xbt_action_queues, name);
if (myqueue == NULL || xbt_dynar_is_empty(myqueue)) { // nothing stored for me. Read the file further
-
- if (action_fp == NULL) { // File closed now. There's nothing more to read. I'm out of here
+ if (xbt_action_fp == NULL) { // File closed now. There's nothing more to read. I'm out of here
goto todo_done;
}
// Read lines until I reach something for me (which breaks in loop body)
// or end of file reached
- while (xbt_getline(&action_line, &action_len, action_fp) != -1) {
+ while (xbt_getline(&action_line, &action_len, xbt_action_fp) != -1) {
// cleanup and split the string I just read
char *comment = strchr(action_line, '#');
if (comment != NULL)
} else {
// Else, I have to store it for the relevant colleague
xbt_dynar_t otherqueue =
- xbt_dict_get_or_null(action_queues, evtname);
+ xbt_dict_get_or_null(xbt_action_queues, evtname);
if (otherqueue == NULL) { // Damn. Create the queue of that guy
- otherqueue =
- xbt_dynar_new(sizeof(xbt_dynar_t), xbt_dynar_free_voidp);
- xbt_dict_set(action_queues, evtname, otherqueue, NULL);
+ otherqueue = xbt_dynar_new(sizeof(xbt_dynar_t), xbt_dynar_free_voidp);
+ xbt_dict_set(xbt_action_queues, evtname, otherqueue, NULL);
}
xbt_dynar_push(otherqueue, &evt);
}
return xbt_dynar_to_array(evt);
}
-
// I did all my actions for me in the file (either I closed the file, or a colleague did)
// Let's cleanup before leaving
todo_done:
if (myqueue != NULL) {
xbt_dynar_free(&myqueue);
- xbt_dict_remove(action_queues, name);
+ xbt_dict_remove(xbt_action_queues, name);
}
return NULL;
}
