Cosmetics: "transfert" -> "transfer".

[simgrid.git] / teshsuite / models / ptask_L07_usage / ptask_L07_usage.cpp

diff --git a/teshsuite/models/ptask_L07_usage/ptask_L07_usage.cpp b/teshsuite/models/ptask_L07_usage/ptask_L07_usage.cpp
index 25e4b78..82e46fd 100644 (file)
--- a/teshsuite/models/ptask_L07_usage/ptask_L07_usage.cpp
+++ b/teshsuite/models/ptask_L07_usage/ptask_L07_usage.cpp
@@ -1,4 +1,4 @@
-/* Copyright g(c) 2019-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright g(c) 2019-2022. 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. */
@@ -79,7 +79,7 @@ static void main_dispatcher()
   XBT_INFO("TEST: Latency test between hosts connected by a shared link.");
   XBT_INFO("------------------------------------------------------------");
   XBT_INFO("Have to send 1B from one host to another at 1Bps with a latency of 500ms.");
-  XBT_INFO("Should be done in 1.5 seconds (500ms latency + 1s transfert).");
+  XBT_INFO("Should be done in 1.5 seconds (500ms latency + 1s transfer).");
   start_time = sg4::Engine::get_clock();
   sg4::Comm::sendto_async(hosts[0], hosts[4], 1.0)->wait();
   end_time = sg4::Engine::get_clock();
@@ -91,7 +91,7 @@ static void main_dispatcher()
   XBT_INFO("TEST: Latency test between hosts connected by a fatpipe link.");
   XBT_INFO("------------------------------------------------------------");
   XBT_INFO("Have to send 1B from one host to another at 1Bps with a latency of 500ms.");
-  XBT_INFO("Should be done in 1.5 seconds (500ms latency + 1s transfert).");
+  XBT_INFO("Should be done in 1.5 seconds (500ms latency + 1s transfer).");
   start_time = sg4::Engine::get_clock();
   sg4::Comm::sendto_async(hosts[0], hosts[5], 1.0)->wait();
   end_time = sg4::Engine::get_clock();
@@ -104,7 +104,7 @@ static void main_dispatcher()
   XBT_INFO("TEST: Latency test between hosts connected by a 3-link route.");
   XBT_INFO("------------------------------------------------------------");
   XBT_INFO("Have to send 1B from one host to another at 1Bps with a latency of 2 x 500ms + 1s.");
-  XBT_INFO("Should be done in 3 seconds (2 x 500ms + 1s latency + 1s transfert).");
+  XBT_INFO("Should be done in 3 seconds (2 x 500ms + 1s latency + 1s transfer).");
   start_time = sg4::Engine::get_clock();
   sg4::Comm::sendto_async(hosts[0], hosts[1], 1.0)->wait();
   end_time = sg4::Engine::get_clock();
@@ -118,7 +118,7 @@ static void main_dispatcher()
   XBT_INFO("------------------------------------------------------------");
   XBT_INFO("Have to send 1B from one host to another on a link at 2Bps with a latency of 2 x 1024^2s.");
   XBT_INFO("This latency is half the default TCP window size (4MiB). This limits the bandwidth to 1B");
-  XBT_INFO("Should be done in 2 x 1024^2s + 1 seconds (large latency + 1s transfert).");
+  XBT_INFO("Should be done in 2 x 1024^2s + 1 seconds (large latency + 1s transfer).");
   start_time = sg4::Engine::get_clock();
   sg4::Comm::sendto_async(hosts[0], hosts[6], 1.0)->wait();
   end_time = sg4::Engine::get_clock();
@@ -130,7 +130,7 @@ static void main_dispatcher()
   XBT_INFO("TEST: Latency test between hosts connected by a shared link with 2 comms in same direction.");
   XBT_INFO("------------------------------------------------------------");
   XBT_INFO("Have to send 2 x 1B from one host to another at 1Bps with a latency of 500ms.");
-  XBT_INFO("Should be done in 2.5 seconds (500ms latency + 2s transfert).");
+  XBT_INFO("Should be done in 2.5 seconds (500ms latency + 2s transfer).");
   start_time      = sg4::Engine::get_clock();
   sg4::CommPtr c1 = sg4::Comm::sendto_async(hosts[0], hosts[4], 1.0);
   sg4::CommPtr c2 = sg4::Comm::sendto_async(hosts[0], hosts[4], 1.0);
@@ -146,7 +146,7 @@ static void main_dispatcher()
   XBT_INFO("TEST: Latency test between hosts connected by a fatpipe link with 2 comms in same direction.");
   XBT_INFO("------------------------------------------------------------");
   XBT_INFO("Have to send 2 x 1B from one host to another at 1Bps with a latency of 500ms.");
-  XBT_INFO("Should be done in 1.5 seconds (500ms latency + 1s transfert).");
+  XBT_INFO("Should be done in 1.5 seconds (500ms latency + 1s transfer).");
   start_time = sg4::Engine::get_clock();
   c1         = sg4::Comm::sendto_async(hosts[0], hosts[5], 1.0);
   c2         = sg4::Comm::sendto_async(hosts[0], hosts[5], 1.0);
@@ -162,7 +162,7 @@ static void main_dispatcher()
   XBT_INFO("TEST: Latency test between hosts connected by a 3-link route with 2 comms in same direction.");
   XBT_INFO("------------------------------------------------------------");
   XBT_INFO("Have to send 2 x 1B from one host to another at 1Bps with a latency of 2 x 500ms + 1s.");
-  XBT_INFO("Should be done in 4 seconds (2 x 500ms + 1s latency + 2s transfert).");
+  XBT_INFO("Should be done in 4 seconds (2 x 500ms + 1s latency + 2s transfer).");
   start_time = sg4::Engine::get_clock();
   c1         = sg4::Comm::sendto_async(hosts[0], hosts[1], 1.0);
   c2         = sg4::Comm::sendto_async(hosts[0], hosts[1], 1.0);
@@ -178,7 +178,7 @@ static void main_dispatcher()
   XBT_INFO("TEST: Latency test between hosts connected by a shared link with 2 comms in opposite direction.");
   XBT_INFO("------------------------------------------------------------");
   XBT_INFO("Have to send 1B between two hosts in each direction at 1Bps with a latency of 500ms.");
-  XBT_INFO("Should be done in 2.5 seconds (500ms latency + 2s transfert).");
+  XBT_INFO("Should be done in 2.5 seconds (500ms latency + 2s transfer).");
   start_time = sg4::Engine::get_clock();
   c1         = sg4::Comm::sendto_async(hosts[0], hosts[4], 1.0);
   c2         = sg4::Comm::sendto_async(hosts[4], hosts[0], 1.0);
@@ -194,7 +194,7 @@ static void main_dispatcher()
   XBT_INFO("TEST: Latency test between hosts connected by a fatpipe link with 2 comms in opposite direction.");
   XBT_INFO("------------------------------------------------------------");
   XBT_INFO("Have to send 1B between two hosts in each direction at 1Bps with a latency of 500ms.");
-  XBT_INFO("Should be done in 1.5 seconds (500ms latency + 1s transfert).");
+  XBT_INFO("Should be done in 1.5 seconds (500ms latency + 1s transfer).");
   start_time = sg4::Engine::get_clock();
   c1         = sg4::Comm::sendto_async(hosts[0], hosts[5], 1.0);
   c2         = sg4::Comm::sendto_async(hosts[5], hosts[0], 1.0);
@@ -210,7 +210,7 @@ static void main_dispatcher()
   XBT_INFO("TEST: Latency test between hosts connected by a 3-link route with 2 comms in opposite direction.");
   XBT_INFO("------------------------------------------------------------");
   XBT_INFO("Have to send 1B between two hosts in each direction at 1Bps with a latency of 2 x 500ms + 1s.");
-  XBT_INFO("Should be done in 4 seconds (2 x 500ms + 1s latency + 2s transfert).");
+  XBT_INFO("Should be done in 4 seconds (2 x 500ms + 1s latency + 2s transfer).");
   start_time = sg4::Engine::get_clock();
   c1         = sg4::Comm::sendto_async(hosts[0], hosts[1], 1.0);
   c2         = sg4::Comm::sendto_async(hosts[1], hosts[0], 1.0);
@@ -226,7 +226,7 @@ static void main_dispatcher()
   XBT_INFO("TEST: 4-host parallel communication with independent transfers.");
   XBT_INFO("------------------------------------------------------------");
   XBT_INFO("'cpu0' sends 1B to 'cpu1' and 'cpu2' sends 1B to 'cpu3'. The only shared link is the fatpipe switch.");
-  XBT_INFO("Should be done in 3 seconds (2 x 500ms + 1s latency + 1s transfert).");
+  XBT_INFO("Should be done in 3 seconds (2 x 500ms + 1s latency + 1s transfer).");
   start_time = sg4::Engine::get_clock();
   sg4::Exec::init()
       ->set_bytes_amounts(std::vector<double>({0.0, 1.0, 0.0, 0.0,
@@ -269,7 +269,7 @@ static void main_dispatcher()
   XBT_INFO("------------------------------------------------------------");
   XBT_INFO("Each host sends 1B to every other hosts.");
   XBT_INFO("Should be done in 8 seconds: 2 x 500ms + 1s of initial latency and 6 seconds for transfer");
-  XBT_INFO("Each SHARED link is traversed by 6 flows (3 in and 3 out). ");
+  XBT_INFO("Each SHARED link is traversed by 6 flows (3 in and 3 out).");
   XBT_INFO("Each 1B transfer thus takes 6 seconds on a 1Bps link");
 
   start_time = sg4::Engine::get_clock();
@@ -318,14 +318,13 @@ static void main_dispatcher()
   c1->wait();
   end_time = sg4::Engine::get_clock();
   XBT_INFO("Actual result: Sending 1B while computing 2 flops takes %.4f seconds.", end_time - start_time);
-  XBT_INFO("\n");
 }
 
 int main(int argc, char** argv)
 {
   sg4::Engine engine(&argc, argv);
   engine.load_platform(argv[1]);
-  sg4::Actor::create("dispatcher", sg4::Host::by_name("cpu0"), main_dispatcher);
+  sg4::Actor::create("dispatcher", engine.host_by_name("cpu0"), main_dispatcher);
   engine.run();
 
   return 0;