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
[mc] Multiple .so support for region snapshots
[simgrid.git]
/
src
/
xbt
/
xbt_replay.c
diff --git
a/src/xbt/xbt_replay.c
b/src/xbt/xbt_replay.c
index
f3a9fbc
..
47ae0ee
100644
(file)
--- a/
src/xbt/xbt_replay.c
+++ b/
src/xbt/xbt_replay.c
@@
-20,7
+20,8
@@
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;
@@
-146,7
+147,7
@@
void _xbt_replay_action_exit(void)
/**
* \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
@@
-154,6
+155,7
@@
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]))) {
@@
-161,7
+163,14
@@
int xbt_replay_action_runner(int argc, char *argv[])
action_fun function =
(action_fun)xbt_dict_get(action_funs, lowername);
xbt_free(lowername);
action_fun function =
(action_fun)xbt_dict_get(action_funs, lowername);
xbt_free(lowername);
- function((const char **)evt);
+ 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);
@@
-179,7
+188,14
@@
int xbt_replay_action_runner(int argc, char *argv[])
char* lowername = str_tolower (evt[1]);
action_fun function = (action_fun)xbt_dict_get(action_funs, lowername);
xbt_free(lowername);
char* lowername = str_tolower (evt[1]);
action_fun function = (action_fun)xbt_dict_get(action_funs, lowername);
xbt_free(lowername);
- function(evt);
+ 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));