X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ea74f5d95928a521a588737e81f1de94eef25d19..f5f38e5b9cdacbf1ba1705bb7ed592b59f8e8712:/examples/cpp/network-ns3-wifi/s4u-network-ns3-wifi.cpp?ds=sidebyside

diff --git a/examples/cpp/network-ns3-wifi/s4u-network-ns3-wifi.cpp b/examples/cpp/network-ns3-wifi/s4u-network-ns3-wifi.cpp
index 1194b2b0c4..cd1386d203 100644
--- a/examples/cpp/network-ns3-wifi/s4u-network-ns3-wifi.cpp
+++ b/examples/cpp/network-ns3-wifi/s4u-network-ns3-wifi.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2022. The SimGrid Team. LEVEL_ALL rights reserved.          */
+/* Copyright (c) 2007-2023. 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. */
@@ -8,6 +8,7 @@
 #include <iomanip>
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(ns3_wifi_example, "Messages specific for this s4u example");
+namespace sg4 = simgrid::s4u;
 
 class Message
 {
@@ -18,51 +19,48 @@ public:
   Message(const std::string& sender_, int size_) : sender(sender_), size(size_) {}
 };
 
-static void sender(const std::string& mailbox, double msg_size, unsigned sleep_time)
+static void sender(const std::string& mailbox, int msg_size, unsigned sleep_time)
 {
-  simgrid::s4u::this_actor::sleep_for(sleep_time);
-  auto* mbox = simgrid::s4u::Mailbox::by_name(mailbox);
-  auto* msg  = new Message(simgrid::s4u::this_actor::get_host()->get_name(), msg_size);
+  sg4::this_actor::sleep_for(sleep_time);
+  auto* mbox = sg4::Mailbox::by_name(mailbox);
+  auto* msg  = new Message(sg4::this_actor::get_host()->get_name(), msg_size);
   mbox->put(msg, msg_size);
 }
 
 static void receiver(const std::string& mailbox)
 {
-  auto* mbox = simgrid::s4u::Mailbox::by_name(mailbox);
+  auto* mbox = sg4::Mailbox::by_name(mailbox);
   auto msg   = mbox->get_unique<Message>();
-  XBT_INFO("[%s] %s received %d bytes from %s",
-           mailbox.c_str(),
-           simgrid::s4u::this_actor::get_host()->get_name().c_str(),
-           msg->size,
-           msg->sender.c_str());
+  XBT_INFO("[%s] %s received %d bytes from %s", mailbox.c_str(), sg4::this_actor::get_host()->get_name().c_str(),
+           msg->size, msg->sender.c_str());
 }
 
 int main(int argc, char* argv[])
 {
-  simgrid::s4u::Engine e(&argc, argv);
+  sg4::Engine e(&argc, argv);
 
   e.load_platform(argv[1]);
-  double msg_size = 1E5;
+  int msg_size = 1e5;
 
   /* Communication between STA in the same wifi zone */
-  simgrid::s4u::Actor::create("sender", e.host_by_name("STA0-0"), sender, "1", msg_size, 10);
-  simgrid::s4u::Actor::create("receiver", e.host_by_name("STA0-1"), receiver, "1");
-  simgrid::s4u::Actor::create("sender", e.host_by_name("STA0-1"), sender, "2", msg_size, 20);
-  simgrid::s4u::Actor::create("receiver", e.host_by_name("STA0-0"), receiver, "2");
-  simgrid::s4u::Actor::create("sender", e.host_by_name("STA1-1"), sender, "3", msg_size, 30);
-  simgrid::s4u::Actor::create("receiver", e.host_by_name("STA1-2"), receiver, "3");
-  simgrid::s4u::Actor::create("sender", e.host_by_name("STA1-2"), sender, "4", msg_size, 40);
-  simgrid::s4u::Actor::create("receiver", e.host_by_name("STA1-1"), receiver, "4");
+  sg4::Actor::create("sender", e.host_by_name("STA0-0"), sender, "1", msg_size, 10);
+  sg4::Actor::create("receiver", e.host_by_name("STA0-1"), receiver, "1");
+  sg4::Actor::create("sender", e.host_by_name("STA0-1"), sender, "2", msg_size, 20);
+  sg4::Actor::create("receiver", e.host_by_name("STA0-0"), receiver, "2");
+  sg4::Actor::create("sender", e.host_by_name("STA1-1"), sender, "3", msg_size, 30);
+  sg4::Actor::create("receiver", e.host_by_name("STA1-2"), receiver, "3");
+  sg4::Actor::create("sender", e.host_by_name("STA1-2"), sender, "4", msg_size, 40);
+  sg4::Actor::create("receiver", e.host_by_name("STA1-1"), receiver, "4");
 
   /* Communication between STA of different wifi zones */
-  simgrid::s4u::Actor::create("sender", e.host_by_name("STA0-0"), sender, "5", msg_size, 50);
-  simgrid::s4u::Actor::create("receiver", e.host_by_name("STA1-0"), receiver, "5");
-  simgrid::s4u::Actor::create("sender", e.host_by_name("STA1-0"), sender, "6", msg_size, 60);
-  simgrid::s4u::Actor::create("receiver", e.host_by_name("STA0-0"), receiver, "6");
-  simgrid::s4u::Actor::create("sender", e.host_by_name("STA0-1"), sender, "7", msg_size, 70);
-  simgrid::s4u::Actor::create("receiver", e.host_by_name("STA1-2"), receiver, "7");
-  simgrid::s4u::Actor::create("sender", e.host_by_name("STA1-2"), sender, "8", msg_size, 80);
-  simgrid::s4u::Actor::create("receiver", e.host_by_name("STA0-1"), receiver, "8");
+  sg4::Actor::create("sender", e.host_by_name("STA0-0"), sender, "5", msg_size, 50);
+  sg4::Actor::create("receiver", e.host_by_name("STA1-0"), receiver, "5");
+  sg4::Actor::create("sender", e.host_by_name("STA1-0"), sender, "6", msg_size, 60);
+  sg4::Actor::create("receiver", e.host_by_name("STA0-0"), receiver, "6");
+  sg4::Actor::create("sender", e.host_by_name("STA0-1"), sender, "7", msg_size, 70);
+  sg4::Actor::create("receiver", e.host_by_name("STA1-2"), receiver, "7");
+  sg4::Actor::create("sender", e.host_by_name("STA1-2"), sender, "8", msg_size, 80);
+  sg4::Actor::create("receiver", e.host_by_name("STA0-1"), receiver, "8");
 
   e.run();
   return 0;