-/* Copyright (c) 2009-2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-2019. 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. */
} else \
((void)0)
-static void log_action(simgrid::xbt::ReplayAction& action, double date)
+static void log_action(const simgrid::xbt::ReplayAction& action, double date)
{
if (XBT_LOG_ISENABLED(replay_comm, xbt_log_priority_verbose)) {
std::string s = boost::algorithm::join(action, " ");
public:
explicit Replayer(std::vector<std::string> args)
{
- int argc;
- char* argv[2];
- argv[0] = &args.at(0)[0];
- if (args.size() == 1) {
- argc = 1;
- } else {
- argc = 2;
- argv[1] = &args.at(1)[0];
- }
- simgrid::xbt::replay_runner(argc, argv);
+ const char* actor_name = args.at(0).c_str();
+ const char* trace_filename = args.size() > 1 ? args[1].c_str() : nullptr;
+ simgrid::xbt::replay_runner(actor_name, trace_filename);
}
void operator()()
double size = std::stod(action[3]);
std::string* payload = new std::string(action[3]);
double clock = simgrid::s4u::Engine::get_clock();
- simgrid::s4u::MailboxPtr to = simgrid::s4u::Mailbox::byName(simgrid::s4u::this_actor::get_name() + "_" + action[2]);
+ simgrid::s4u::Mailbox* to = simgrid::s4u::Mailbox::by_name(simgrid::s4u::this_actor::get_name() + "_" + action[2]);
ACT_DEBUG("Entering Send: %s (size: %g) -- Actor %s on mailbox %s", NAME.c_str(), size,
simgrid::s4u::this_actor::get_cname(), to->get_cname());
to->put(payload, size);
static void recv(simgrid::xbt::ReplayAction& action)
{
double clock = simgrid::s4u::Engine::get_clock();
- simgrid::s4u::MailboxPtr from =
- simgrid::s4u::Mailbox::byName(std::string(action[2]) + "_" + simgrid::s4u::this_actor::get_name());
+ simgrid::s4u::Mailbox* from =
+ simgrid::s4u::Mailbox::by_name(std::string(action[2]) + "_" + simgrid::s4u::this_actor::get_name());
ACT_DEBUG("Receiving: %s -- Actor %s on mailbox %s", NAME.c_str(), simgrid::s4u::this_actor::get_cname(),
from->get_cname());
{
simgrid::s4u::Engine e(&argc, argv);
- xbt_assert(argc > 2, "Usage: %s platform_file deployment_file [action_files]\n"
- "\t# if all actions are in the same file\n"
- "\tExample: %s msg_platform.xml msg_deployment.xml actions\n"
- "\t# if actions are in separate files, specified in deployment\n"
- "\tExample: %s msg_platform.xml msg_deployment.xml ",
+ xbt_assert(argc > 2,
+ "Usage: %s platform_file deployment_file [action_files]\n"
+ "\t# if all actions are in the same file\n"
+ "\tExample: %s platform.xml deployment.xml actions\n"
+ "\t# if actions are in separate files, specified in deployment\n"
+ "\tExample: %s platform.xml deployment.xml ",
argv[0], argv[0], argv[0]);
e.load_platform(argv[1]);
- e.register_default(&simgrid::xbt::replay_runner);
e.register_actor<Replayer>("p0");
e.register_actor<Replayer>("p1");
e.load_deployment(argv[2]);