X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/37b15fce0a7ba8d484fadc21bc115d4b62197dda..cbf0d34a2d64218c08c993b864d41e53a1b5424f:/examples/s4u/replay-comm/s4u-replay-comm.cpp diff --git a/examples/s4u/replay-comm/s4u-replay-comm.cpp b/examples/s4u/replay-comm/s4u-replay-comm.cpp index 223fb290db..5f3071c803 100644 --- a/examples/s4u/replay-comm/s4u-replay-comm.cpp +++ b/examples/s4u/replay-comm/s4u-replay-comm.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2009-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2009-2020. 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. */ @@ -18,7 +18,7 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(replay_comm, "Messages specific for this msg exampl } 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, " "); @@ -55,8 +55,7 @@ public: 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::by_name(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); @@ -68,7 +67,7 @@ public: static void recv(simgrid::xbt::ReplayAction& action) { double clock = simgrid::s4u::Engine::get_clock(); - simgrid::s4u::MailboxPtr from = + 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(), @@ -82,11 +81,12 @@ int main(int argc, char* argv[]) { 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]);