A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replaced check for GNU compiler with CMAKE variable. ...
[simgrid.git]
/
src
/
xbt
/
xbt_replay.c
diff --git
a/src/xbt/xbt_replay.c
b/src/xbt/xbt_replay.c
index
ded2f58
..
47ae0ee
100644
(file)
--- a/
src/xbt/xbt_replay.c
+++ b/
src/xbt/xbt_replay.c
@@
-1,16
+1,17
@@
-/* Copyright (c) 2010. The SimGrid Team.
+/* Copyright (c) 2010
, 2012-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. */
* 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"
#include "xbt/str.h"
#include "xbt/replay.h"
#include <errno.h>
#include "xbt/sysdep.h"
#include "xbt/log.h"
#include "xbt/str.h"
#include "xbt/replay.h"
+#include <ctype.h>
+#include <wchar.h>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(replay,xbt,"Replay trace reader");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(replay,xbt,"Replay trace reader");
@@
-19,21
+20,41
@@
typedef struct s_replay_reader {
char *line;
size_t line_len;
char *position; /* stable storage */
char *line;
size_t line_len;
char *position; /* stable storage */
- char *filename; int linenum;
+ char *filename;
+ int linenum;
} s_xbt_replay_reader_t;
} 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 char *action_line = NULL;
static size_t action_len = 0;
+int is_replay_active = 0 ;
+
+static char **action_get_action(char *name);
-static const char **action_get_action(char *name);
+static char *str_tolower (const char *str)
+{
+ char *ret = xbt_strdup (str);
+ int i, n = strlen (ret);
+ for (i = 0; i < n; i++)
+ ret[i] = tolower (str[i]);
+ return ret;
+}
+
+int _xbt_replay_is_active(void){
+ return is_replay_active;
+}
xbt_replay_reader_t xbt_replay_reader_new(const char *filename)
{
xbt_replay_reader_t res = xbt_new0(s_xbt_replay_reader_t,1);
res->fp = fopen(filename, "r");
xbt_replay_reader_t xbt_replay_reader_new(const char *filename)
{
xbt_replay_reader_t res = xbt_new0(s_xbt_replay_reader_t,1);
res->fp = fopen(filename, "r");
- xbt_assert(res->fp != NULL, "Cannot open %s: %s", filename,
-
strerror(errno));
+ if (res->fp == NULL)
+
xbt_die("Cannot open %s: %s", filename,
strerror(errno));
res->filename = xbt_strdup(filename);
return res;
}
res->filename = xbt_strdup(filename);
return res;
}
@@
-49,7
+70,7
@@
const char **xbt_replay_reader_get(xbt_replay_reader_t reader)
{
ssize_t read;
xbt_dynar_t d;
{
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)
//XBT_INFO("got from trace: %s",reader->line);
reader->linenum++;
if (read==-1)
@@
-79,11
+100,12
@@
void xbt_replay_reader_free(xbt_replay_reader_t *reader)
*reader=NULL;
}
*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
* \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()
*
*
* The argument of the function is the line describing the action, splitted on spaces with xbt_str_split_quoted()
*
@@
-92,21
+114,26
@@
void xbt_replay_reader_free(xbt_replay_reader_t *reader)
*/
void xbt_replay_action_register(const char *action_name, action_fun function)
{
*/
void xbt_replay_action_register(const char *action_name, action_fun function)
{
- xbt_dict_set(action_funs, action_name, function, NULL);
+ char* lowername = str_tolower (action_name);
+ xbt_dict_set(action_funs, lowername, function, NULL);
+ xbt_free(lowername);
}
}
-/** \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.
*/
void xbt_replay_action_unregister(const char *action_name)
{
* \brief Unregisters a function, which handled a kind of action
*
* \param action_name the reference name of the action.
*/
void xbt_replay_action_unregister(const char *action_name)
{
- xbt_dict_remove(action_funs, action_name);
+ char* lowername = str_tolower (action_name);
+ xbt_dict_remove(action_funs, lowername);
+ xbt_free(lowername);
}
void _xbt_replay_action_init(void)
{
}
void _xbt_replay_action_init(void)
{
+ is_replay_active = 1;
action_funs = xbt_dict_new_homogeneous(NULL);
action_queues = xbt_dict_new_homogeneous(NULL);
}
action_funs = xbt_dict_new_homogeneous(NULL);
action_queues = xbt_dict_new_homogeneous(NULL);
}
@@
-118,18
+145,38
@@
void _xbt_replay_action_exit(void)
free(action_line);
}
free(action_line);
}
+/**
+ * \ingroup XBT_replay
+ * \brief function used internally to actually run the replay
+
+ * \param argc argc .
+ * \param argv argv
+ */
int xbt_replay_action_runner(int argc, char *argv[])
{
int xbt_replay_action_runner(int argc, char *argv[])
{
- const char **evt;
+ int i;
+ xbt_ex_t e;
if (action_fp) { // A unique trace file
if (action_fp) { // A unique trace file
-
+ char **evt;
while ((evt = action_get_action(argv[0]))) {
while ((evt = action_get_action(argv[0]))) {
+ char* lowername = str_tolower (evt[1]);
action_fun function =
action_fun function =
- (action_fun)xbt_dict_get(action_funs, evt[1]);
- function(evt);
+ (action_fun)xbt_dict_get(action_funs, lowername);
+ xbt_free(lowername);
+ TRY{
+ function((const char **)evt);
+ }
+ CATCH(e) {
+ free(evt);
+ xbt_die("Replay error :\n %s"
+ , e.msg);
+ }
+ for (i=0;evt[i]!= NULL;i++)
+ free(evt[i]);
free(evt);
}
} else { // Should have got my trace file in argument
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.",
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
+185,22
@@
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])) {
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]);
- function(evt);
- free(evt);
+ char* lowername = str_tolower (evt[1]);
+ action_fun function = (action_fun)xbt_dict_get(action_funs, lowername);
+ xbt_free(lowername);
+ TRY{
+ function(evt);
+ }
+ CATCH(e) {
+ free(evt);
+ 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));
}
} else {
XBT_WARN("%s: Ignore trace element not for me",
xbt_replay_reader_position(reader));
}
+ free(evt);
}
xbt_replay_reader_free(&reader);
}
}
xbt_replay_reader_free(&reader);
}
@@
-153,7
+208,7
@@
int xbt_replay_action_runner(int argc, char *argv[])
}
}
-static c
onst c
har **action_get_action(char *name)
+static char **action_get_action(char *name)
{
xbt_dynar_t evt = NULL;
char *evtname = NULL;
{
xbt_dynar_t evt = NULL;
char *evtname = NULL;
@@
-166,7
+221,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
}
// 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)
// cleanup and split the string I just read
char *comment = strchr(action_line, '#');
if (comment != NULL)
@@
-180,7
+235,7
@@
static const char **action_get_action(char *name)
// if it's for me, I'm done
evtname = xbt_dynar_get_as(evt, 0, char *);
// if it's for me, I'm done
evtname = xbt_dynar_get_as(evt, 0, char *);
- if (!strcmp(name, evtname)) {
+ if (!strc
asec
mp(name, evtname)) {
return xbt_dynar_to_array(evt);
} else {
// Else, I have to store it for the relevant colleague
return xbt_dynar_to_array(evt);
} else {
// Else, I have to store it for the relevant colleague