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 github.com:simgrid/simgrid
[simgrid.git]
/
examples
/
s4u
/
actions-comm
/
s4u_actions-comm.cpp
diff --git
a/examples/s4u/actions-comm/s4u_actions-comm.cpp
b/examples/s4u/actions-comm/s4u_actions-comm.cpp
index
28d94f2
..
44b42d1
100644
(file)
--- a/
examples/s4u/actions-comm/s4u_actions-comm.cpp
+++ b/
examples/s4u/actions-comm/s4u_actions-comm.cpp
@@
-31,17
+31,20
@@
public:
{
int argc;
char* argv[2];
- argv[0] =
(char*)(args.at(0).c_str())
;
+ argv[0] =
&args.at(0)[0]
;
if (args.size() == 1) {
argc = 1;
} else {
argc = 2;
- argv[1] =
(char*)(args.at(1).c_str())
;
+ argv[1] =
&args.at(1)[0]
;
}
-
xbt_replay_action
_runner(argc, argv);
+
simgrid::xbt::replay
_runner(argc, argv);
}
- void operator()() {}
+ void operator()()
+ {
+ // Nothing to do here
+ }
/* My actions */
static void compute(const char* const* action)
@@
-82,8
+85,6
@@
public:
int main(int argc, char *argv[])
{
simgrid::s4u::Engine* e = new simgrid::s4u::Engine(&argc, argv);
- /* Explicit initialization of the action module is required now*/
- _xbt_replay_action_init();
xbt_assert(argc > 2, "Usage: %s platform_file deployment_file [action_files]\n"
"\t# if all actions are in the same file\n"
@@
-93,7
+94,7
@@
int main(int argc, char *argv[])
argv[0], argv[0], argv[0]);
e->loadPlatform(argv[1]);
- e->registerDefault(&
xbt_replay_action
_runner);
+ e->registerDefault(&
simgrid::xbt::replay
_runner);
e->registerFunction<Replayer>("p0");
e->registerFunction<Replayer>("p1");
e->loadDeployment(argv[2]);
@@
-103,7
+104,6
@@
int main(int argc, char *argv[])
xbt_replay_action_register("send", Replayer::send);
xbt_replay_action_register("recv", Replayer::recv);
- /* Actually do the simulation using MSG_action_trace_run */
if (argv[3]) {
simgrid::xbt::action_fs = new std::ifstream(argv[3], std::ifstream::in);
}
@@
-117,7
+117,5
@@
int main(int argc, char *argv[])
XBT_INFO("Simulation time %g", e->getClock());
- _xbt_replay_action_exit(); /* Explicit finalization of the action module */
-
return 0;
}