cosmetics do not use msg in log class names

[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 7c7c908..f23e55c 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-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2010-2019. 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. */
@@ -6,7 +6,7 @@
 /* This example shows how to block on the completion of a set of communications.
  *
  * As for the other asynchronous examples, the sender initiate all the messages it wants to send and
- * pack the resulting simgrid::s4u::CommPtr objects in a vector. All messages thus occurs concurrently.
+ * pack the resulting simgrid::s4u::CommPtr objects in a vector. All messages thus occur concurrently.
  *
  * The sender then blocks until all ongoing communication terminate, using simgrid::s4u::Comm::wait_all()
  *
@@ -17,7 +17,7 @@
 #include <iostream>
 #include <string>
 
-XBT_LOG_NEW_DEFAULT_CATEGORY(msg_async_waitall, "Messages specific for this s4u example");
+XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_async_waitall, "Messages specific for this s4u example");
 
 class Sender {
   long messages_count;  /* - number of tasks */
@@ -39,7 +39,7 @@ public:
     std::vector<simgrid::s4u::CommPtr> pending_comms;
 
     /* Make a vector of the mailboxes to use */
-    std::vector<simgrid::s4u::MailboxPtr> mboxes;
+    std::vector<simgrid::s4u::Mailbox*> mboxes;
     for (int i = 0; i < receivers_count; i++)
       mboxes.push_back(simgrid::s4u::Mailbox::by_name(std::string("receiver-") + std::to_string(i)));
     // sphinx-doc: init-end
@@ -58,7 +58,7 @@ public:
       pending_comms.push_back(comm);
     }
 
-    /* Start sending messages to let the workers know that they should stop */ // sphinx-doc: send-begin
+    /* Start sending messages to let the workers know that they should stop */ // sphinx-doc: put-begin
     for (int i = 0; i < receivers_count; i++) {
       XBT_INFO("Send 'finalize' to 'receiver-%d'", i);
       simgrid::s4u::CommPtr comm = mboxes[i]->put_async(new std::string("finalize"), 0);
@@ -68,7 +68,7 @@ public:
 
     /* Now that all message exchanges were initiated, wait for their completion in one single call */
     simgrid::s4u::Comm::wait_all(&pending_comms);
-    // sphinx-doc: send-end
+    // sphinx-doc: put-end
 
     XBT_INFO("Goodbye now!");
   }
@@ -76,7 +76,7 @@ public:
 
 /* Receiver actor expects 1 argument: its ID */
 class Receiver {
-  simgrid::s4u::MailboxPtr mbox;
+  simgrid::s4u::Mailbox* mbox;
 
 public:
   explicit Receiver(std::vector<std::string> args)