X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/353e4c084db3c0a55663e4121ca20112b44de6d4..97a1cccb092b83949ea84b98625aa8754c397364:/examples/s4u/app-chainsend/s4u-app-chainsend.cpp

diff --git a/examples/s4u/app-chainsend/s4u-app-chainsend.cpp b/examples/s4u/app-chainsend/s4u-app-chainsend.cpp
index aff5692070..dc1abf59f9 100644
--- a/examples/s4u/app-chainsend/s4u-app-chainsend.cpp
+++ b/examples/s4u/app-chainsend/s4u-app-chainsend.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-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,18 +6,18 @@
 #include "simgrid/s4u.hpp"
 #include <vector>
 
-#define PIECE_SIZE 65536
-#define MESSAGE_BUILD_CHAIN_SIZE 40
-#define MESSAGE_SEND_DATA_HEADER_SIZE 1
+constexpr unsigned PIECE_SIZE                    = 65536;
+constexpr unsigned MESSAGE_BUILD_CHAIN_SIZE      = 40;
+constexpr unsigned MESSAGE_SEND_DATA_HEADER_SIZE = 1;
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_chainsend, "Messages specific for chainsend");
 
 class ChainMessage {
 public:
-  simgrid::s4u::MailboxPtr prev_ = nullptr;
-  simgrid::s4u::MailboxPtr next_ = nullptr;
+  simgrid::s4u::Mailbox* prev_   = nullptr;
+  simgrid::s4u::Mailbox* next_   = nullptr;
   unsigned int num_pieces        = 0;
-  explicit ChainMessage(simgrid::s4u::MailboxPtr prev, simgrid::s4u::MailboxPtr next, const unsigned int num_pieces)
+  explicit ChainMessage(simgrid::s4u::Mailbox* prev, simgrid::s4u::Mailbox* next, const unsigned int num_pieces)
       : prev_(prev), next_(next), num_pieces(num_pieces)
   {
   }
@@ -32,9 +32,9 @@ public:
 
 class Peer {
 public:
-  simgrid::s4u::MailboxPtr prev = nullptr;
-  simgrid::s4u::MailboxPtr next = nullptr;
-  simgrid::s4u::MailboxPtr me   = nullptr;
+  simgrid::s4u::Mailbox* prev = nullptr;
+  simgrid::s4u::Mailbox* next = nullptr;
+  simgrid::s4u::Mailbox* me   = nullptr;
   std::vector<simgrid::s4u::CommPtr> pending_recvs;
   std::vector<simgrid::s4u::CommPtr> pending_sends;
 
@@ -90,42 +90,24 @@ public:
 
 class Broadcaster {
 public:
-  simgrid::s4u::MailboxPtr first = nullptr;
-  std::vector<simgrid::s4u::MailboxPtr> mailboxes;
+  simgrid::s4u::Mailbox* first = nullptr;
+  std::vector<simgrid::s4u::Mailbox*> mailboxes;
   unsigned int piece_count;
 
   void buildChain()
   {
-    auto cur                      = mailboxes.begin();
-    simgrid::s4u::MailboxPtr prev = nullptr;
-    simgrid::s4u::MailboxPtr last = nullptr;
-
     /* Build the chain if there's at least one peer */
-    if (cur != mailboxes.end()) {
-      /* init: prev=NULL, host=current cur, next=next cur */
-      simgrid::s4u::MailboxPtr next = *cur;
-      first                         = next;
-
-      /* This iterator iterates one step ahead: cur is current iterated element, but is actually next in the chain */
-      do {
-        /* following steps: prev=last, host=next, next=cur */
-        ++cur;
-        prev                                     = last;
-        simgrid::s4u::MailboxPtr current_mailbox = next;
-        if (cur != mailboxes.end())
-          next = *cur;
-        else
-          next = nullptr;
-
-        XBT_DEBUG("Building chain--broadcaster:\"%s\" dest:\"%s\" prev:\"%s\" next:\"%s\"",
-                  simgrid::s4u::Host::current()->get_cname(), current_mailbox->get_cname(),
-                  prev ? prev->get_cname() : nullptr, next ? next->get_cname() : nullptr);
-
-        /* Send message to current peer */
-        current_mailbox->put(new ChainMessage(prev, next, piece_count), MESSAGE_BUILD_CHAIN_SIZE);
-
-        last = current_mailbox;
-      } while (cur != mailboxes.end());
+    if (not mailboxes.empty())
+      first = mailboxes.front();
+
+    for (unsigned i = 0; i < mailboxes.size(); i++) {
+      simgrid::s4u::Mailbox* prev = i > 0 ? mailboxes[i - 1] : nullptr;
+      simgrid::s4u::Mailbox* next = i < mailboxes.size() - 1 ? mailboxes[i + 1] : nullptr;
+      XBT_DEBUG("Building chain--broadcaster:\"%s\" dest:\"%s\" prev:\"%s\" next:\"%s\"",
+                simgrid::s4u::Host::current()->get_cname(), mailboxes[i]->get_cname(),
+                prev ? prev->get_cname() : nullptr, next ? next->get_cname() : nullptr);
+      /* Send message to current peer */
+      mailboxes[i]->put(new ChainMessage(prev, next, piece_count), MESSAGE_BUILD_CHAIN_SIZE);
     }
   }