Use Mailbox::get_unique<>(), and save a few delete.

[simgrid.git] / 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 e33ce15..8b4ed86 100644 (file)
--- a/examples/s4u/app-pingpong/s4u-app-pingpong.cpp
+++ b/examples/s4u/app-pingpong/s4u-app-pingpong.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-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. */
@@ -7,39 +7,35 @@
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_app_pingpong, "Messages specific for this s4u example");
 
-static void pinger(simgrid::s4u::MailboxPtr mailbox_in, simgrid::s4u::MailboxPtr mailbox_out)
+static void pinger(simgrid::s4u::Mailbox* mailbox_in, simgrid::s4u::Mailbox* mailbox_out)
 {
   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::get_clock();
+  /* - Do the ping with a 1-Byte payload (latency bound) ... */
+  auto* payload = new double(simgrid::s4u::Engine::get_clock());
 
   mailbox_out->put(payload, 1);
   /* - ... then wait for the (large) pong */
-  double* sender_time = static_cast<double*>(mailbox_in->get());
+  auto sender_time = mailbox_in->get_unique<double>();
 
   double communication_time = simgrid::s4u::Engine::get_clock() - *sender_time;
-  XBT_INFO("Task received : large communication (bandwidth bound)");
+  XBT_INFO("Payload received : large communication (bandwidth bound)");
   XBT_INFO("Pong time (bandwidth bound): %.3f", communication_time);
-  delete sender_time;
 }
 
-static void ponger(simgrid::s4u::MailboxPtr mailbox_in, simgrid::s4u::MailboxPtr mailbox_out)
+static void ponger(simgrid::s4u::Mailbox* mailbox_in, simgrid::s4u::Mailbox* mailbox_out)
 {
   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*>(mailbox_in->get());
+  auto sender_time          = mailbox_in->get_unique<double>();
   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;
+  XBT_INFO("Payload received : small communication (latency bound)");
+  XBT_INFO("Ping time (latency bound) %f", communication_time);
 
   /*  - ... Then send a 1GB pong back (bandwidth bound) */
-  double* payload = new double();
-  *payload        = simgrid::s4u::Engine::get_clock();
-  XBT_INFO("task_bw->data = %.3f", *payload);
+  auto* payload = new double(simgrid::s4u::Engine::get_clock());
+  XBT_INFO("payload = %.3f", *payload);
 
   mailbox_out->put(payload, 1e9);
 }
@@ -49,8 +45,8 @@ int main(int argc, char* argv[])
   simgrid::s4u::Engine e(&argc, argv);
   e.load_platform(argv[1]);
 
-  simgrid::s4u::MailboxPtr mb1 = simgrid::s4u::Mailbox::by_name("Mailbox 1");
-  simgrid::s4u::MailboxPtr mb2 = simgrid::s4u::Mailbox::by_name("Mailbox 2");
+  simgrid::s4u::Mailbox* mb1 = simgrid::s4u::Mailbox::by_name("Mailbox 1");
+  simgrid::s4u::Mailbox* mb2 = simgrid::s4u::Mailbox::by_name("Mailbox 2");
 
   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);