X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6847a26d9973030337f6ef9f18464b1f04ce7452..3b8ba6fc975d0238e449e299eb57e41ce0db92ee:/examples/s4u/app-pingpong/s4u-app-pingpong.cpp

diff --git a/examples/s4u/app-pingpong/s4u-app-pingpong.cpp b/examples/s4u/app-pingpong/s4u-app-pingpong.cpp
index e09f35ea5e..e33ce15a47 100644
--- a/examples/s4u/app-pingpong/s4u-app-pingpong.cpp
+++ b/examples/s4u/app-pingpong/s4u-app-pingpong.cpp
@@ -3,72 +3,61 @@
 /* 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/s4u.hpp"
+#include <simgrid/s4u.hpp>
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_app_pingpong, "Messages specific for this s4u example");
 
-static void pinger(std::vector<std::string> args)
+static void pinger(simgrid::s4u::MailboxPtr mailbox_in, simgrid::s4u::MailboxPtr mailbox_out)
 {
-  xbt_assert(args.size() == 1, "The pinger function one argument from the XML deployment file");
-  XBT_INFO("Ping -> %s", args[0].c_str());
-  xbt_assert(simgrid::s4u::Host::by_name_or_null(args[0]) != nullptr, "Unknown host %s. Stopping Now! ",
-             args[0].c_str());
+  XBT_INFO("Ping from mailbox %s to mailbox %s", mailbox_in->get_name().c_str(), mailbox_out->get_name().c_str());
 
   /* - Do the ping with a 1-Byte task (latency bound) ... */
   double* payload = new double();
-  *payload        = simgrid::s4u::Engine::getClock();
+  *payload        = simgrid::s4u::Engine::get_clock();
 
-  simgrid::s4u::Mailbox::byName(args[0])->put(payload, 1);
+  mailbox_out->put(payload, 1);
   /* - ... then wait for the (large) pong */
-  double* sender_time =
-      static_cast<double*>(simgrid::s4u::Mailbox::byName(simgrid::s4u::this_actor::get_host()->get_name())->get());
+  double* sender_time = static_cast<double*>(mailbox_in->get());
 
-  double communication_time = simgrid::s4u::Engine::getClock() - *sender_time;
+  double communication_time = simgrid::s4u::Engine::get_clock() - *sender_time;
   XBT_INFO("Task received : large communication (bandwidth bound)");
   XBT_INFO("Pong time (bandwidth bound): %.3f", communication_time);
   delete sender_time;
 }
 
-static void ponger(std::vector<std::string> args)
+static void ponger(simgrid::s4u::MailboxPtr mailbox_in, simgrid::s4u::MailboxPtr mailbox_out)
 {
-  xbt_assert(args.size() == 1, "The ponger function one argument from the XML deployment file");
-  XBT_INFO("Pong -> %s", args[0].c_str());
-  xbt_assert(simgrid::s4u::Host::by_name_or_null(args[0]) != nullptr, "Unknown host %s. Stopping Now! ",
-             args[0].c_str());
+  XBT_INFO("Pong from mailbox %s to mailbox %s", mailbox_in->get_name().c_str(), mailbox_out->get_name().c_str());
 
   /* - Receive the (small) ping first ....*/
-  double* sender_time =
-      static_cast<double*>(simgrid::s4u::Mailbox::byName(simgrid::s4u::this_actor::get_host()->get_name())->get());
-  double communication_time = simgrid::s4u::Engine::getClock() - *sender_time;
+  double* sender_time       = static_cast<double*>(mailbox_in->get());
+  double communication_time = simgrid::s4u::Engine::get_clock() - *sender_time;
   XBT_INFO("Task received : small communication (latency bound)");
   XBT_INFO(" Ping time (latency bound) %f", communication_time);
   delete sender_time;
 
   /*  - ... Then send a 1GB pong back (bandwidth bound) */
   double* payload = new double();
-  *payload        = simgrid::s4u::Engine::getClock();
+  *payload        = simgrid::s4u::Engine::get_clock();
   XBT_INFO("task_bw->data = %.3f", *payload);
 
-  simgrid::s4u::Mailbox::byName(args[0])->put(payload, 1e9);
+  mailbox_out->put(payload, 1e9);
 }
 
 int main(int argc, char* argv[])
 {
   simgrid::s4u::Engine e(&argc, argv);
+  e.load_platform(argv[1]);
 
-  e.loadPlatform(argv[1]);
-  std::vector<std::string> args;
-  args.push_back("Jupiter");
-  simgrid::s4u::Actor::create("pinger", simgrid::s4u::Host::by_name("Tremblay"), pinger, args);
+  simgrid::s4u::MailboxPtr mb1 = simgrid::s4u::Mailbox::by_name("Mailbox 1");
+  simgrid::s4u::MailboxPtr mb2 = simgrid::s4u::Mailbox::by_name("Mailbox 2");
 
-  args.pop_back();
-  args.push_back("Tremblay");
-
-  simgrid::s4u::Actor::create("ponger", simgrid::s4u::Host::by_name("Jupiter"), ponger, args);
+  simgrid::s4u::Actor::create("pinger", simgrid::s4u::Host::by_name("Tremblay"), pinger, mb1, mb2);
+  simgrid::s4u::Actor::create("ponger", simgrid::s4u::Host::by_name("Jupiter"), ponger, mb2, mb1);
 
   e.run();
 
-  XBT_INFO("Total simulation time: %.3f", e.getClock());
+  XBT_INFO("Total simulation time: %.3f", e.get_clock());
 
   return 0;
 }