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
SMPI replay: make sure that the replay is inited even if rank 0 is not first for...
[simgrid.git]
/
src
/
xbt
/
xbt_replay.c
diff --git
a/src/xbt/xbt_replay.c
b/src/xbt/xbt_replay.c
index
dd5bda1
..
7f907db
100644
(file)
--- a/
src/xbt/xbt_replay.c
+++ b/
src/xbt/xbt_replay.c
@@
-1,4
+1,4
@@
-/* 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
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-10,6
+10,8
@@
#include "xbt/log.h"
#include "xbt/str.h"
#include "xbt/replay.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");
@@
-18,25
+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;
FILE *action_fp;
} s_xbt_replay_reader_t;
FILE *action_fp;
-xbt_dict_t action_funs;
-xbt_dict_t action_queues;
+xbt_dict_t action_funs
= NULL
;
+xbt_dict_t action_queues
= NULL
;
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 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;
}
@@
-96,7
+114,9
@@
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
@@
-106,13
+126,23
@@
void xbt_replay_action_register(const char *action_name, action_fun function)
*/
void xbt_replay_action_unregister(const char *action_name)
{
*/
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)
+/** @brief Initializes the replay mechanism, and returns true if (and only if) it was necessary
+ *
+ * It returns false if it was already done by another process.
+ */
+int _xbt_replay_action_init(void)
{
{
+ if (action_funs)
+ return 0;
+ 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);
+ return 1;
}
void _xbt_replay_action_exit(void)
}
void _xbt_replay_action_exit(void)
@@
-120,11
+150,14
@@
void _xbt_replay_action_exit(void)
xbt_dict_free(&action_queues);
xbt_dict_free(&action_funs);
free(action_line);
xbt_dict_free(&action_queues);
xbt_dict_free(&action_funs);
free(action_line);
+ action_queues = NULL;
+ action_funs = NULL;
+ action_line = NULL;
}
/**
* \ingroup XBT_replay
}
/**
* \ingroup XBT_replay
- * \brief
TODO
+ * \brief
function used internally to actually run the replay
* \param argc argc .
* \param argv argv
* \param argc argc .
* \param argv argv
@@
-132,12
+165,22
@@
void _xbt_replay_action_exit(void)
int xbt_replay_action_runner(int argc, char *argv[])
{
int i;
int xbt_replay_action_runner(int argc, char *argv[])
{
int i;
+ xbt_ex_t e;
if (action_fp) { // A unique trace file
char **evt;
while ((evt = action_get_action(argv[0]))) {
if (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 function =
- (action_fun)xbt_dict_get(action_funs, evt[1]);
- function((const char **)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);
for (i=0;evt[i]!= NULL;i++)
free(evt[i]);
free(evt);
@@
-152,8
+195,17
@@
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);
+ 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));
@@
-193,7
+245,7
@@
static 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