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

[simgrid.git] / examples / s4u / comm-ready / s4u-comm-ready.cpp

diff --git a/examples/s4u/comm-ready/s4u-comm-ready.cpp b/examples/s4u/comm-ready/s4u-comm-ready.cpp
index 85867a6..6aced3a 100644 (file)
--- a/examples/s4u/comm-ready/s4u-comm-ready.cpp
+++ b/examples/s4u/comm-ready/s4u-comm-ready.cpp
@@ -48,7 +48,7 @@ static void peer(int argc, char** argv)
         simgrid::s4u::Mailbox* mbox = simgrid::s4u::Mailbox::by_name(mboxName);
         std::string msgName =
             std::string("Message ") + std::to_string(i) + std::string(" from peer ") + std::to_string(my_id);
-        std::string* payload = new std::string(msgName); // copy the data we send:
+        auto* payload = new std::string(msgName); // copy the data we send:
         // 'msgName' is not a stable storage location
         XBT_INFO("Send '%s' to '%s'", msgName.c_str(), mboxName.c_str());
         /* Create a communication representing the ongoing communication */
@@ -62,7 +62,7 @@ static void peer(int argc, char** argv)
     if (peer_id != my_id) {
       std::string mboxName        = std::string("peer-") + std::to_string(peer_id);
       simgrid::s4u::Mailbox* mbox = simgrid::s4u::Mailbox::by_name(mboxName);
-      std::string* payload        = new std::string("finalize"); // Make a copy of the data we will send
+      auto* payload               = new std::string("finalize"); // Make a copy of the data we will send
       pending_comms.push_back(mbox->put_async(payload, msg_size));
       XBT_INFO("Send 'finalize' to 'peer-%d'", peer_id);
     }
@@ -74,9 +74,9 @@ static void peer(int argc, char** argv)
   long pending_finalize_messages = peers_count - 1;
   while (pending_finalize_messages > 0) {
     if (my_mbox->ready()) {
-      double start                = simgrid::s4u::Engine::get_clock();
-      const std::string* received = static_cast<std::string*>(my_mbox->get());
-      double waiting_time         = simgrid::s4u::Engine::get_clock() - start;
+      double start        = simgrid::s4u::Engine::get_clock();
+      auto received       = my_mbox->get_unique<std::string>();
+      double waiting_time = simgrid::s4u::Engine::get_clock() - start;
       xbt_assert(
           waiting_time == 0,
           "Expecting the waiting time to be 0 because the communication was supposedly ready, but got %f instead",
@@ -85,7 +85,6 @@ static void peer(int argc, char** argv)
       if (*received == "finalize") {
         pending_finalize_messages--;
       }
-      delete received;
     } else {
       XBT_INFO("Nothing ready to consume yet, I better sleep for a while");
       simgrid::s4u::this_actor::sleep_for(.01);