Fix test (no timing changes)

diff --git a/examples/cpp/exec-ptask-multicore/s4u-exec-ptask-multicore.cpp b/examples/cpp/exec-ptask-multicore/s4u-exec-ptask-multicore.cpp
index 1692dab..dd3fcbf 100644 (file)
--- a/examples/cpp/exec-ptask-multicore/s4u-exec-ptask-multicore.cpp
+++ b/examples/cpp/exec-ptask-multicore/s4u-exec-ptask-multicore.cpp
@@ -24,13 +24,13 @@ static void runner()
   std::vector<sg4::Host*> monocore_hosts = {e->host_by_name("MyHost2"), e->host_by_name("MyHost2")};
   start_time                             = sg4::Engine::get_clock();
   sg4::this_actor::parallel_execute(monocore_hosts, comp, comm);
-  XBT_INFO("Computed 2-core activity one 1-core host. Took %g s", e->get_clock() - start_time);
+  XBT_INFO("Computed 2-core activity a 1-core host. Took %g s", e->get_clock() - start_time);
 
   // Same host, multicore.
   std::vector<sg4::Host*> multicore_host = {e->host_by_name("MyHost1"), e->host_by_name("MyHost1")};
   start_time                             = sg4::Engine::get_clock();
   sg4::this_actor::parallel_execute(multicore_host, comp, comm);
-  XBT_INFO("Computed 2-core activity on one 4-core host. Took %g s", e->get_clock() - start_time);
+  XBT_INFO("Computed 2-core activity on a 4-core host. Took %g s", e->get_clock() - start_time);
 
   // Same host, using too many cores
   std::vector<double> comp6(6, 1e9);
@@ -54,7 +54,7 @@ static void runner()
 
   start_time = sg4::Engine::get_clock();
   sg4::this_actor::parallel_execute(multicore_host, comp, comm);
-  XBT_INFO("Computed 2-core activity on one 4-core host. Took %g s", e->get_clock() - start_time);
+  XBT_INFO("Computed 2-core activity on a 4-core host. Took %g s", e->get_clock() - start_time);
 
   start_time = sg4::Engine::get_clock();
   sg4::this_actor::parallel_execute(hosts_diff, comp, comm);
@@ -63,7 +63,6 @@ static void runner()
   // Add a background task and change ptask on the fly
   auto MyHost1                          = e->host_by_name("MyHost1");
   simgrid::s4u::ExecPtr background_task = MyHost1->exec_async(5e9);
-  background_task->start();
   XBT_INFO("Start a 1-core background task on the 4-core host.");
 
   start_time = sg4::Engine::get_clock();

diff --git a/examples/cpp/exec-ptask-multicore/s4u-exec-ptask-multicore.tesh b/examples/cpp/exec-ptask-multicore/s4u-exec-ptask-multicore.tesh
index c134cf8..889ff1b 100644 (file)
--- a/examples/cpp/exec-ptask-multicore/s4u-exec-ptask-multicore.tesh
+++ b/examples/cpp/exec-ptask-multicore/s4u-exec-ptask-multicore.tesh
@@ -4,13 +4,13 @@ $ ${bindir:=.}/s4u-exec-ptask-multicore ${platfdir}/energy_platform.xml --cfg=ho
 > [  0.000000] Configuration change: Set 'host/model' to 'ptask_L07'
 > [  0.000000] Switching to the L07 model to handle parallel tasks.
 > [ 10.000000] Computed 2-core activity on two different hosts. Took 10 s
-> [ 30.000000] Computed 2-core activity one 1-core host. Took 20 s
-> [ 40.000000] Computed 2-core activity on one 2-core host. Took 10 s
-> [ 55.000000] Computed 6-core activity of a 4-core host. Took 15 s
+> [ 30.000000] Computed 2-core activity a 1-core host. Took 20 s
+> [ 40.000000] Computed 2-core activity on a 4-core host. Took 10 s
+> [ 55.000000] Computed 6-core activity on a 4-core host. Took 15 s
 > [ 65.000000] Computed 2-core activity on a 4-core host with some communication. Took 10 s
 > [ 65.000000] Switching machine multicore to pstate 1.
 > [ 65.000000] Switching back to pstate 0.
-> [ 75.000000] Computed 2-core activity on one 4-core host. Took 10 s
+> [ 75.000000] Computed 2-core activity on a 4-core host. Took 10 s
 > [ 85.000000] Computed 2-core activity on two different hosts. Took 10 s
 > [ 85.000000] Start a 1-core background task on the 4-core host.
 > [ 95.000000] Computed 2-core activity on the 4-core host. Took 10 s
@@ -18,4 +18,4 @@ $ ${bindir:=.}/s4u-exec-ptask-multicore ${platfdir}/energy_platform.xml --cfg=ho
 > [ 95.000000] Switching to pstate 1 while background task is still running.
 > [115.000000] Computed again the same 2-core activity on it. Took 20 s
 > [175.000000] The background task has ended.
-> [175.000000] Simulation done.
\ No newline at end of file
+> [175.000000] Simulation done.