Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
please sonar, get_clock is a static method
[simgrid.git] / examples / cpp / app-chainsend / s4u-app-chainsend.cpp
index 2a380697147e1c60f4445aa4a7a247c0b6c2b7a2..47525dd27f2f48e88f3f40c2f1a41f81c5d033ca 100644 (file)
@@ -61,7 +61,7 @@ public:
       simgrid::s4u::CommPtr comm = me->get_async<FilePiece>(&received);
       pending_recvs.push_back(comm);
 
-      int idx = simgrid::s4u::Comm::wait_any(&pending_recvs);
+      ssize_t 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->get_cname());
@@ -116,7 +116,7 @@ public:
       simgrid::s4u::CommPtr comm = first->put_async(new FilePiece(), MESSAGE_SEND_DATA_HEADER_SIZE + PIECE_SIZE);
       pending_sends.push_back(comm);
     }
-    simgrid::s4u::Comm::wait_all(&pending_sends);
+    simgrid::s4u::Comm::wait_all(pending_sends);
   }
 
   Broadcaster(int hostcount, unsigned int piece_count) : piece_count(piece_count)
@@ -139,7 +139,7 @@ static void peer()
   p.joinChain();
   p.forwardFile();
 
-  simgrid::s4u::Comm::wait_all(&p.pending_sends);
+  simgrid::s4u::Comm::wait_all(p.pending_sends);
   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,
@@ -161,16 +161,16 @@ int main(int argc, char* argv[])
 
   e.load_platform(argv[1]);
 
-  simgrid::s4u::Actor::create("broadcaster", simgrid::s4u::Host::by_name("node-0.simgrid.org"), broadcaster, 8, 256);
+  simgrid::s4u::Actor::create("broadcaster", e.host_by_name("node-0.simgrid.org"), broadcaster, 8, 256);
 
-  simgrid::s4u::Actor::create("peer", simgrid::s4u::Host::by_name("node-1.simgrid.org"), peer);
-  simgrid::s4u::Actor::create("peer", simgrid::s4u::Host::by_name("node-2.simgrid.org"), peer);
-  simgrid::s4u::Actor::create("peer", simgrid::s4u::Host::by_name("node-3.simgrid.org"), peer);
-  simgrid::s4u::Actor::create("peer", simgrid::s4u::Host::by_name("node-4.simgrid.org"), peer);
-  simgrid::s4u::Actor::create("peer", simgrid::s4u::Host::by_name("node-5.simgrid.org"), peer);
-  simgrid::s4u::Actor::create("peer", simgrid::s4u::Host::by_name("node-6.simgrid.org"), peer);
-  simgrid::s4u::Actor::create("peer", simgrid::s4u::Host::by_name("node-7.simgrid.org"), peer);
-  simgrid::s4u::Actor::create("peer", simgrid::s4u::Host::by_name("node-8.simgrid.org"), peer);
+  simgrid::s4u::Actor::create("peer", e.host_by_name("node-1.simgrid.org"), peer);
+  simgrid::s4u::Actor::create("peer", e.host_by_name("node-2.simgrid.org"), peer);
+  simgrid::s4u::Actor::create("peer", e.host_by_name("node-3.simgrid.org"), peer);
+  simgrid::s4u::Actor::create("peer", e.host_by_name("node-4.simgrid.org"), peer);
+  simgrid::s4u::Actor::create("peer", e.host_by_name("node-5.simgrid.org"), peer);
+  simgrid::s4u::Actor::create("peer", e.host_by_name("node-6.simgrid.org"), peer);
+  simgrid::s4u::Actor::create("peer", e.host_by_name("node-7.simgrid.org"), peer);
+  simgrid::s4u::Actor::create("peer", e.host_by_name("node-8.simgrid.org"), peer);
 
   e.run();
   XBT_INFO("Total simulation time: %e", simgrid::s4u::Engine::get_clock());