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
Restarting or killing maestro does not seem to be a cleaver idea
[simgrid.git]
/
src
/
xbt
/
xbt_replay.cpp
diff --git
a/src/xbt/xbt_replay.cpp
b/src/xbt/xbt_replay.cpp
index
af68627
..
25d6d2c
100644
(file)
--- a/
src/xbt/xbt_replay.cpp
+++ b/
src/xbt/xbt_replay.cpp
@@
-1,9
+1,9
@@
-/* Copyright (c) 2010-201
8
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2010-201
9
. 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. */
/* 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 "
xbt/ex
.hpp"
+#include "
simgrid/Exception
.hpp"
#include "xbt/log.h"
#include "xbt/replay.hpp"
#include "xbt/log.h"
#include "xbt/replay.hpp"
@@
-55,7
+55,7
@@
bool ReplayReader::get(ReplayAction* action)
return not fs->eof();
}
return not fs->eof();
}
-static ReplayAction* get_action(char* name)
+static ReplayAction* get_action(c
onst c
har* name)
{
ReplayAction* action;
{
ReplayAction* action;
@@
-117,32
+117,31
@@
static void handle_action(ReplayAction& action)
* @ingroup XBT_replay
* @brief function used internally to actually run the replay
*/
* @ingroup XBT_replay
* @brief function used internally to actually run the replay
*/
-int replay_runner(
int argc, char* argv[]
)
+int replay_runner(
const char* actor_name, const char* trace_filename
)
{
{
- if (simgrid::xbt::action_fs) { // A unique trace file
+ std::string actor_name_string(actor_name);
+ if (simgrid::xbt::action_fs) { // <A unique trace file
while (true) {
while (true) {
- simgrid::xbt::ReplayAction* evt = simgrid::xbt::get_action(a
rgv[0]
);
+ simgrid::xbt::ReplayAction* evt = simgrid::xbt::get_action(a
ctor_name
);
if (!evt)
break;
simgrid::xbt::handle_action(*evt);
delete evt;
}
if (!evt)
break;
simgrid::xbt::handle_action(*evt);
delete evt;
}
- if (action_queues.find(
std::string(argv[0])
) != action_queues.end()) {
- std::queue<ReplayAction*>* myqueue = action_queues.at(
std::string(argv[0])
);
+ if (action_queues.find(
actor_name_string
) != action_queues.end()) {
+ std::queue<ReplayAction*>* myqueue = action_queues.at(
actor_name_string
);
delete myqueue;
delete myqueue;
- action_queues.erase(
std::string(argv[0])
);
+ action_queues.erase(
actor_name_string
);
}
} else { // Should have got my trace file in argument
}
} else { // Should have got my trace file in argument
+ xbt_assert(trace_filename != nullptr);
simgrid::xbt::ReplayAction evt;
simgrid::xbt::ReplayAction 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.",
- argv[0]);
- simgrid::xbt::ReplayReader reader(argv[1]);
+ simgrid::xbt::ReplayReader reader(trace_filename);
while (reader.get(&evt)) {
while (reader.get(&evt)) {
- if (evt.front().compare(a
rgv[0]
) == 0) {
+ if (evt.front().compare(a
ctor_name
) == 0) {
simgrid::xbt::handle_action(evt);
} else {
simgrid::xbt::handle_action(evt);
} else {
- XBT_WARN("Ignore trace element not for me
"
);
+ XBT_WARN("Ignore trace element not for me
(target='%s', I am '%s')", evt.front().c_str(), actor_name
);
}
evt.clear();
}
}
evt.clear();
}
@@
-164,7
+163,7
@@
int replay_runner(int argc, char* argv[])
* @param action_name the reference name of the action.
* @param function prototype given by the type: void...(const char** action)
*/
* @param action_name the reference name of the action.
* @param function prototype given by the type: void...(const char** action)
*/
-void xbt_replay_action_register(const char* action_name,
action_fun
function)
+void xbt_replay_action_register(const char* action_name,
const action_fun&
function)
{
simgrid::xbt::action_funs[std::string(action_name)] = function;
}
{
simgrid::xbt::action_funs[std::string(action_name)] = function;
}