snake_case s4u::Mailbox

[simgrid.git] / examples / s4u / async-waitall / s4u-async-waitall.cpp

diff --git a/examples/s4u/async-waitall/s4u-async-waitall.cpp b/examples/s4u/async-waitall/s4u-async-waitall.cpp
index 405e049..6ac940d 100644 (file)
--- a/examples/s4u/async-waitall/s4u-async-waitall.cpp
+++ b/examples/s4u/async-waitall/s4u-async-waitall.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2010-2018. 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. */
@@ -13,9 +13,9 @@
  */
 
 #include "simgrid/s4u.hpp"
-#include "xbt/str.h"
 #include <cstdlib>
 #include <iostream>
+#include <string>
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_async_waitall, "Messages specific for this s4u example");
 
@@ -40,13 +40,13 @@ public:
     for (int i = 0; i < messages_count; i++) {
 
       std::string mboxName          = std::string("receiver-") + std::to_string(i % receivers_count);
-      simgrid::s4u::MailboxPtr mbox = simgrid::s4u::Mailbox::byName(mboxName);
+      simgrid::s4u::MailboxPtr mbox = simgrid::s4u::Mailbox::by_name(mboxName);
       std::string msgName           = std::string("Message ") + std::to_string(i);
-      char* payload = xbt_strdup(msgName.c_str()); // copy the data we send: 'msgName' is not a stable storage location
-
+      std::string* 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 */
-      simgrid::s4u::CommPtr comm = mbox->put_async((void*)payload, msg_size);
+      simgrid::s4u::CommPtr comm = mbox->put_async(payload, msg_size);
       /* Add this comm to the vector of all known comms */
       pending_comms.push_back(comm);
     }
@@ -54,10 +54,10 @@ public:
     /* Start sending messages to let the workers know that they should stop */
     for (int i = 0; i < receivers_count; i++) {
       std::string mboxName          = std::string("receiver-") + std::to_string(i % receivers_count);
-      simgrid::s4u::MailboxPtr mbox = simgrid::s4u::Mailbox::byName(mboxName);
-      char* payload                 = xbt_strdup("finalize"); // Make a copy of the data we will send
+      simgrid::s4u::MailboxPtr mbox = simgrid::s4u::Mailbox::by_name(mboxName);
+      std::string* payload          = new std::string("finalize"); // Make a copy of the data we will send
 
-      simgrid::s4u::CommPtr comm = mbox->put_async((void*)payload, 0);
+      simgrid::s4u::CommPtr comm = mbox->put_async(payload, 0);
       pending_comms.push_back(comm);
       XBT_INFO("Send 'finalize' to 'receiver-%ld'", i % receivers_count);
     }
@@ -79,20 +79,17 @@ public:
   {
     xbt_assert(args.size() == 2, "Expecting one parameter from the XML deployment file but got %zu", args.size());
     std::string mboxName = std::string("receiver-") + args[1];
-    mbox                 = simgrid::s4u::Mailbox::byName(mboxName);
+    mbox                 = simgrid::s4u::Mailbox::by_name(mboxName);
   }
   void operator()()
   {
     XBT_INFO("Wait for my first message");
-    while (1) {
-      char* received = static_cast<char*>(mbox->get());
-      XBT_INFO("I got a '%s'.", received);
-      if (std::strcmp(received, "finalize") == 0) { /* If it's a finalize message, we're done */
-        xbt_free(received);
-        break;
-      }
-      /* Otherwise receiving the message was all we were supposed to do */
-      xbt_free(received);
+    for (bool cont = true; cont;) {
+      std::string* received = static_cast<std::string*>(mbox->get());
+      XBT_INFO("I got a '%s'.", received->c_str());
+      cont = (*received != "finalize"); // If it's a finalize message, we're done
+      // Receiving the message was all we were supposed to do
+      delete received;
     }
   }
 };
@@ -102,11 +99,11 @@ int main(int argc, char *argv[])
   xbt_assert(argc > 2, "Usage: %s platform_file deployment_file\n", argv[0]);
 
   simgrid::s4u::Engine e(&argc, argv);
-  e.registerFunction<Sender>("sender");
-  e.registerFunction<Receiver>("receiver");
+  e.register_actor<Sender>("sender");
+  e.register_actor<Receiver>("receiver");
 
-  e.loadPlatform(argv[1]);
-  e.loadDeployment(argv[2]);
+  e.load_platform(argv[1]);
+  e.load_deployment(argv[2]);
   e.run();
 
   return 0;