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
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
msg
/
msg_actions.c
diff --git
a/src/msg/msg_actions.c
b/src/msg/msg_actions.c
index
9b5fe16
..
434b254
100644
(file)
--- a/
src/msg/msg_actions.c
+++ b/
src/msg/msg_actions.c
@@
-1,4
+1,4
@@
-/* Copyright (c) 2009-201
3
. The SimGrid Team.
+/* Copyright (c) 2009-201
4
. 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
@@
-15,13
+15,13
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_action, msg,
"MSG actions for trace driven simulation");
"MSG actions for trace driven simulation");
-void
_
MSG_action_init()
+void MSG_action_init()
{
_xbt_replay_action_init();
MSG_function_register_default(xbt_replay_action_runner);
}
{
_xbt_replay_action_init();
MSG_function_register_default(xbt_replay_action_runner);
}
-void
_
MSG_action_exit()
+void MSG_action_exit()
{
_xbt_replay_action_exit();
}
{
_xbt_replay_action_exit();
}
@@
-44,8
+44,8
@@
msg_error_t MSG_action_trace_run(char *path)
action_fp=NULL;
if (path) {
action_fp = fopen(path, "r");
action_fp=NULL;
if (path) {
action_fp = fopen(path, "r");
- xbt_assert(action_fp != NULL, "Cannot open %s: %s", path,
-
strerror(errno));
+ if (action_fp == NULL)
+
xbt_die("Cannot open %s: %s", path,
strerror(errno));
}
res = MSG_main();
}
res = MSG_main();