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
Update copyright notices
[simgrid.git]
/
src
/
msg
/
msg_actions.c
diff --git
a/src/msg/msg_actions.c
b/src/msg/msg_actions.c
index
d8f2a72
..
2e06c74
100644
(file)
--- a/
src/msg/msg_actions.c
+++ b/
src/msg/msg_actions.c
@@
-1,11
+1,9
@@
-/* Copyright (c) 2009
, 2010
. The SimGrid Team.
+/* Copyright (c) 2009
-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. */
* 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 "msg_private.h"
#include "xbt/str.h"
#include "xbt/dynar.h"
#include "msg_private.h"
#include "xbt/str.h"
#include "xbt/dynar.h"
@@
-17,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();
}
@@
-43,28
+41,28
@@
msg_error_t MSG_action_trace_run(char *path)
xbt_dynar_t todo;
xbt_dict_cursor_t cursor;
xbt_dynar_t todo;
xbt_dict_cursor_t cursor;
- action_fp=NULL;
+ xbt_action_fp=NULL;
if (path) {
if (path) {
- action_fp = fopen(path, "r");
- xbt_assert(action_fp != NULL, "Cannot open %s: %s", path,
-
strerror(errno));
+
xbt_
action_fp = fopen(path, "r");
+ if (xbt_action_fp == NULL)
+
xbt_die("Cannot open %s: %s", path,
strerror(errno));
}
res = MSG_main();
}
res = MSG_main();
- if (!xbt_dict_is_empty(action_queues)) {
+ if (!xbt_dict_is_empty(
xbt_
action_queues)) {
XBT_WARN
("Not all actions got consumed. If the simulation ended successfully (without deadlock), you may want to add new processes to your deployment file.");
XBT_WARN
("Not all actions got consumed. If the simulation ended successfully (without deadlock), you may want to add new processes to your deployment file.");
- xbt_dict_foreach(action_queues, cursor, name, todo) {
+ xbt_dict_foreach(
xbt_
action_queues, cursor, name, todo) {
XBT_WARN("Still %lu actions for %s", xbt_dynar_length(todo), name);
}
}
if (path)
XBT_WARN("Still %lu actions for %s", xbt_dynar_length(todo), name);
}
}
if (path)
- fclose(action_fp);
- xbt_dict_free(&action_queues);
- action_queues = xbt_dict_new_homogeneous(NULL);
+ fclose(
xbt_
action_fp);
+ xbt_dict_free(&
xbt_
action_queues);
+
xbt_
action_queues = xbt_dict_new_homogeneous(NULL);
return res;
}
return res;
}