X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/12780ec312d53404edc201ccab2e2bb0286df719..9da45f53bdedff9ac9320a7a3c2ac1d5b9184ce2:/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 1cf5920fc0..79785f5122 100644
--- a/examples/s4u/app-chainsend/s4u-app-chainsend.cpp
+++ b/examples/s4u/app-chainsend/s4u-app-chainsend.cpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2007-2010, 2012-2015, 2017. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2007-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. */
@@ -43,7 +42,7 @@ public:
   unsigned int received_pieces      = 0;
   unsigned int total_pieces         = 0;
 
-  Peer() { me = simgrid::s4u::Mailbox::byName(simgrid::s4u::Host::current()->getCname()); }
+  Peer() { me = simgrid::s4u::Mailbox::by_name(simgrid::s4u::Host::current()->get_cname()); }
   ~Peer()     = default;
 
   void joinChain()
@@ -52,8 +51,8 @@ public:
     prev              = msg->prev_;
     next              = msg->next_;
     total_pieces      = msg->num_pieces;
-    XBT_DEBUG("Peer %s got a 'BUILD_CHAIN' message (prev: %s / next: %s)", me->getCname(),
-              prev ? prev->getCname() : nullptr, next ? next->getCname() : nullptr);
+    XBT_DEBUG("Peer %s got a 'BUILD_CHAIN' message (prev: %s / next: %s)", me->get_cname(),
+              prev ? prev->get_cname() : nullptr, next ? next->get_cname() : nullptr);
     delete msg;
   }
 
@@ -69,10 +68,10 @@ public:
       int idx = simgrid::s4u::Comm::wait_any(&pending_recvs);
       if (idx != -1) {
         comm = pending_recvs.at(idx);
-        XBT_DEBUG("Peer %s got a 'SEND_DATA' message", me->getCname());
+        XBT_DEBUG("Peer %s got a 'SEND_DATA' message", me->get_cname());
         pending_recvs.erase(pending_recvs.begin() + idx);
         if (next != nullptr) {
-          XBT_DEBUG("Sending (asynchronously) from %s to %s", me->getCname(), next->getCname());
+          XBT_DEBUG("Sending (asynchronously) from %s to %s", me->get_cname(), next->get_cname());
           simgrid::s4u::CommPtr send = next->put_async(received, MESSAGE_SEND_DATA_HEADER_SIZE + PIECE_SIZE);
           pending_sends.push_back(send);
         } else
@@ -119,8 +118,8 @@ public:
           next = nullptr;
 
         XBT_DEBUG("Building chain--broadcaster:\"%s\" dest:\"%s\" prev:\"%s\" next:\"%s\"",
-                  simgrid::s4u::Host::current()->getCname(), current_mailbox->getCname(),
-                  prev ? prev->getCname() : nullptr, next ? next->getCname() : nullptr);
+                  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);
@@ -135,7 +134,7 @@ public:
     std::vector<simgrid::s4u::CommPtr> pending_sends;
     for (unsigned int current_piece = 0; current_piece < piece_count; current_piece++) {
       XBT_DEBUG("Sending (send) piece %u from %s into mailbox %s", current_piece,
-                simgrid::s4u::Host::current()->getCname(), first->getCname());
+                simgrid::s4u::Host::current()->get_cname(), first->get_cname());
       simgrid::s4u::CommPtr comm = first->put_async(new FilePiece(), MESSAGE_SEND_DATA_HEADER_SIZE + PIECE_SIZE);
       pending_sends.push_back(comm);
     }
@@ -147,7 +146,7 @@ public:
     for (int i = 1; i <= hostcount; i++) {
       std::string name = std::string("node-") + std::to_string(i) + ".acme.org";
       XBT_DEBUG("%s", name.c_str());
-      mailboxes.push_back(simgrid::s4u::Mailbox::byName(name));
+      mailboxes.push_back(simgrid::s4u::Mailbox::by_name(name));
     }
   }
 
@@ -160,12 +159,12 @@ static void peer()
 
   Peer* p = new Peer();
 
-  double start_time = simgrid::s4u::Engine::getClock();
+  double start_time = simgrid::s4u::Engine::get_clock();
   p->joinChain();
   p->forwardFile();
 
   simgrid::s4u::Comm::wait_all(&p->pending_sends);
-  double end_time = simgrid::s4u::Engine::getClock();
+  double end_time = simgrid::s4u::Engine::get_clock();
 
   XBT_INFO("### %f %llu bytes (Avg %f MB/s); copy finished (simulated).", end_time - start_time, p->received_bytes,
            p->received_bytes / 1024.0 / 1024.0 / (end_time - start_time));
@@ -188,21 +187,21 @@ int main(int argc, char* argv[])
 {
   simgrid::s4u::Engine e(&argc, argv);
 
-  e.loadPlatform(argv[1]);
+  e.load_platform(argv[1]);
 
-  simgrid::s4u::Actor::createActor("broadcaster", simgrid::s4u::Host::by_name("node-0.acme.org"), broadcaster, 8, 256);
+  simgrid::s4u::Actor::create("broadcaster", simgrid::s4u::Host::by_name("node-0.acme.org"), broadcaster, 8, 256);
 
-  simgrid::s4u::Actor::createActor("peer", simgrid::s4u::Host::by_name("node-1.acme.org"), peer);
-  simgrid::s4u::Actor::createActor("peer", simgrid::s4u::Host::by_name("node-2.acme.org"), peer);
-  simgrid::s4u::Actor::createActor("peer", simgrid::s4u::Host::by_name("node-3.acme.org"), peer);
-  simgrid::s4u::Actor::createActor("peer", simgrid::s4u::Host::by_name("node-4.acme.org"), peer);
-  simgrid::s4u::Actor::createActor("peer", simgrid::s4u::Host::by_name("node-5.acme.org"), peer);
-  simgrid::s4u::Actor::createActor("peer", simgrid::s4u::Host::by_name("node-6.acme.org"), peer);
-  simgrid::s4u::Actor::createActor("peer", simgrid::s4u::Host::by_name("node-7.acme.org"), peer);
-  simgrid::s4u::Actor::createActor("peer", simgrid::s4u::Host::by_name("node-8.acme.org"), peer);
+  simgrid::s4u::Actor::create("peer", simgrid::s4u::Host::by_name("node-1.acme.org"), peer);
+  simgrid::s4u::Actor::create("peer", simgrid::s4u::Host::by_name("node-2.acme.org"), peer);
+  simgrid::s4u::Actor::create("peer", simgrid::s4u::Host::by_name("node-3.acme.org"), peer);
+  simgrid::s4u::Actor::create("peer", simgrid::s4u::Host::by_name("node-4.acme.org"), peer);
+  simgrid::s4u::Actor::create("peer", simgrid::s4u::Host::by_name("node-5.acme.org"), peer);
+  simgrid::s4u::Actor::create("peer", simgrid::s4u::Host::by_name("node-6.acme.org"), peer);
+  simgrid::s4u::Actor::create("peer", simgrid::s4u::Host::by_name("node-7.acme.org"), peer);
+  simgrid::s4u::Actor::create("peer", simgrid::s4u::Host::by_name("node-8.acme.org"), peer);
 
   e.run();
-  XBT_INFO("Total simulation time: %e", simgrid::s4u::Engine::getClock());
+  XBT_INFO("Total simulation time: %e", simgrid::s4u::Engine::get_clock());
 
   return 0;
 }