less indirect calls to get_instance in examples (exec to trace)

[simgrid.git] / examples / cpp / exec-ptask-multicore / s4u-exec-ptask-multicore.cpp

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 10627091ac15cf12d294757132f30528c4bdcc2f..1aeceb7a87add21309475630f0efe3653dd41030 100644 (file)
--- a/examples/cpp/exec-ptask-multicore/s4u-exec-ptask-multicore.cpp
+++ b/examples/cpp/exec-ptask-multicore/s4u-exec-ptask-multicore.cpp
@@ -16,19 +16,19 @@ static void runner()
   std::vector<double> comm(4, 0.0);
   // Different hosts.
   std::vector<sg4::Host*> hosts_diff = {e->host_by_name("MyHost2"), e->host_by_name("MyHost3")};
-  double start_time                  = e->get_clock();
+  double start_time                  = sg4::Engine::get_clock();
   sg4::this_actor::parallel_execute(hosts_diff, comp, comm);
   XBT_INFO("Computed 2-core activity on two different hosts. Took %g s", e->get_clock() - start_time);
 
   // Same host, monocore.
   std::vector<sg4::Host*> monocore_hosts = {e->host_by_name("MyHost2"), e->host_by_name("MyHost2")};
-  start_time                             = e->get_clock();
+  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);
 
   // Same host, multicore.
   std::vector<sg4::Host*> multicore_host = {e->host_by_name("MyHost1"), e->host_by_name("MyHost1")};
-  start_time                             = e->get_clock();
+  start_time                             = sg4::Engine::get_clock();
   sg4::this_actor::parallel_execute(multicore_host, comp, comm);
   XBT_INFO("Computed 2-core activity on one 2-core host. Took %g s", e->get_clock() - start_time);
 
@@ -36,7 +36,7 @@ static void runner()
   std::vector<double> comp6(6, 1e9);
   std::vector<double> comm6(36, 0.0);
   std::vector<sg4::Host*> multicore_overload(6, e->host_by_name("MyHost1"));
-  start_time = e->get_clock();
+  start_time = sg4::Engine::get_clock();
   sg4::this_actor::parallel_execute(multicore_overload, comp6, comm6);
   XBT_INFO("Computed 6-core activity of a 4-core host. Took %g s", e->get_clock() - start_time);
 }
@@ -48,7 +48,7 @@ int main(int argc, char* argv[])
   xbt_assert(argc == 2, "Usage: %s <platform file>", argv[0]);
 
   e.load_platform(argv[1]);
-  sg4::Actor::create("test", sg4::Host::by_name("MyHost1"), runner);
+  sg4::Actor::create("test", e.host_by_name("MyHost1"), runner);
 
   e.run();
   XBT_INFO("Simulation done.");