update ns3 wifi to match loic's simgrid wifi

[simgrid.git] / examples / s4u / app-pingpong / s4u-app-pingpong.cpp

diff --git a/examples/s4u/app-pingpong/s4u-app-pingpong.cpp b/examples/s4u/app-pingpong/s4u-app-pingpong.cpp
index 0bd97377fd2194faca441f96818d717ae720b268..f80ef71e9bb8d6c631030179648e9f88cc1f5fe6 100644 (file)
--- a/examples/s4u/app-pingpong/s4u-app-pingpong.cpp
+++ b/examples/s4u/app-pingpong/s4u-app-pingpong.cpp
@@ -11,7 +11,7 @@ static void pinger(simgrid::s4u::Mailbox* mailbox_in, simgrid::s4u::Mailbox* mai
 {
   XBT_INFO("Ping from mailbox %s to mailbox %s", mailbox_in->get_name().c_str(), mailbox_out->get_name().c_str());
 
-  /* - Do the ping with a 1-Byte task (latency bound) ... */
+  /* - Do the ping with a 1-Byte payload (latency bound) ... */
   double* payload = new double();
   *payload        = simgrid::s4u::Engine::get_clock();
 
@@ -20,7 +20,7 @@ static void pinger(simgrid::s4u::Mailbox* mailbox_in, simgrid::s4u::Mailbox* mai
   const double* sender_time = static_cast<double*>(mailbox_in->get());
 
   double communication_time = simgrid::s4u::Engine::get_clock() - *sender_time;
-  XBT_INFO("Task received : large communication (bandwidth bound)");
+  XBT_INFO("Payload received : large communication (bandwidth bound)");
   XBT_INFO("Pong time (bandwidth bound): %.3f", communication_time);
   delete sender_time;
 }
@@ -32,14 +32,14 @@ static void ponger(simgrid::s4u::Mailbox* mailbox_in, simgrid::s4u::Mailbox* mai
   /* - Receive the (small) ping first ....*/
   const double* sender_time = static_cast<double*>(mailbox_in->get());
   double communication_time = simgrid::s4u::Engine::get_clock() - *sender_time;
-  XBT_INFO("Task received : small communication (latency bound)");
-  XBT_INFO(" Ping time (latency bound) %f", communication_time);
+  XBT_INFO("Payload received : small communication (latency bound)");
+  XBT_INFO("Ping time (latency bound) %f", communication_time);
   delete sender_time;
 
   /*  - ... Then send a 1GB pong back (bandwidth bound) */
   double* payload = new double();
   *payload        = simgrid::s4u::Engine::get_clock();
-  XBT_INFO("task_bw->data = %.3f", *payload);
+  XBT_INFO("payload = %.3f", *payload);
 
   mailbox_out->put(payload, 1e9);
 }