please sonar, get_clock is a static method

diff --git a/examples/cpp/actor-join/s4u-actor-join.cpp b/examples/cpp/actor-join/s4u-actor-join.cpp
index 5889f44..ec7a9dd 100644 (file)
--- a/examples/cpp/actor-join/s4u-actor-join.cpp
+++ b/examples/cpp/actor-join/s4u-actor-join.cpp
@@ -59,7 +59,7 @@ int main(int argc, char* argv[])
 
   e.run();
 
-  XBT_INFO("Simulation time %g", e.get_clock());
+  XBT_INFO("Simulation time %g", sg4::Engine::get_clock());
 
   return 0;
 }

diff --git a/examples/cpp/actor-stacksize/s4u-actor-stacksize.cpp b/examples/cpp/actor-stacksize/s4u-actor-stacksize.cpp
index e530466..81e7b87 100644 (file)
--- a/examples/cpp/actor-stacksize/s4u-actor-stacksize.cpp
+++ b/examples/cpp/actor-stacksize/s4u-actor-stacksize.cpp
@@ -39,7 +39,7 @@ int main(int argc, char* argv[])
   sg4::Actor::create("actor", e.host_by_name("Tremblay"), actor);
 
   e.run();
-  XBT_INFO("Simulation time %g", e.get_clock());
+  XBT_INFO("Simulation time %g", sg4::Engine::get_clock());
 
   return 0;
 }

diff --git a/examples/cpp/app-chainsend/s4u-app-chainsend.cpp b/examples/cpp/app-chainsend/s4u-app-chainsend.cpp
index 0cd70a8..47525dd 100644 (file)
--- a/examples/cpp/app-chainsend/s4u-app-chainsend.cpp
+++ b/examples/cpp/app-chainsend/s4u-app-chainsend.cpp
@@ -173,7 +173,7 @@ int main(int argc, char* argv[])
   simgrid::s4u::Actor::create("peer", e.host_by_name("node-8.simgrid.org"), peer);
 
   e.run();
-  XBT_INFO("Total simulation time: %e", e.get_clock());
+  XBT_INFO("Total simulation time: %e", simgrid::s4u::Engine::get_clock());
 
   return 0;
 }

diff --git a/examples/cpp/app-token-ring/s4u-app-token-ring.cpp b/examples/cpp/app-token-ring/s4u-app-token-ring.cpp
index 601f062..6766af4 100644 (file)
--- a/examples/cpp/app-token-ring/s4u-app-token-ring.cpp
+++ b/examples/cpp/app-token-ring/s4u-app-token-ring.cpp
@@ -66,7 +66,7 @@ int main(int argc, char** argv)
     id++;
   }
   e.run();
-  XBT_INFO("Simulation time %g", e.get_clock());
+  XBT_INFO("Simulation time %g", simgrid::s4u::Engine::get_clock());
 
   return 0;
 }

diff --git a/examples/cpp/cloud-capping/s4u-cloud-capping.cpp b/examples/cpp/cloud-capping/s4u-cloud-capping.cpp
index b7c7b8b..a3da18d 100644 (file)
--- a/examples/cpp/cloud-capping/s4u-cloud-capping.cpp
+++ b/examples/cpp/cloud-capping/s4u-cloud-capping.cpp
@@ -253,7 +253,7 @@ int main(int argc, char* argv[])
   simgrid::s4u::Actor::create("master_", e.host_by_name("Fafard"), master_main);
 
   e.run();
-  XBT_INFO("Bye (simulation time %g)", e.get_clock());
+  XBT_INFO("Bye (simulation time %g)", simgrid::s4u::Engine::get_clock());
 
   return 0;
 }

diff --git a/examples/cpp/cloud-simple/s4u-cloud-simple.cpp b/examples/cpp/cloud-simple/s4u-cloud-simple.cpp
index 3df190d..6ef3e2c 100644 (file)
--- a/examples/cpp/cloud-simple/s4u-cloud-simple.cpp
+++ b/examples/cpp/cloud-simple/s4u-cloud-simple.cpp
@@ -216,7 +216,7 @@ int main(int argc, char* argv[])
 
   e.run();
 
-  XBT_INFO("Simulation time %g", e.get_clock());
+  XBT_INFO("Simulation time %g", simgrid::s4u::Engine::get_clock());
 
   return 0;
 }

diff --git a/examples/cpp/comm-dependent/s4u-comm-dependent.cpp b/examples/cpp/comm-dependent/s4u-comm-dependent.cpp
index 7ce73aa..a421d13 100644 (file)
--- a/examples/cpp/comm-dependent/s4u-comm-dependent.cpp
+++ b/examples/cpp/comm-dependent/s4u-comm-dependent.cpp
@@ -48,7 +48,7 @@ int main(int argc, char* argv[])
 
   e.run();
 
-  XBT_INFO("Simulation time: %.3f", e.get_clock());
+  XBT_INFO("Simulation time: %.3f", sg4::Engine::get_clock());
 
   return 0;
 }

diff --git a/examples/cpp/comm-host2host/s4u-comm-host2host.cpp b/examples/cpp/comm-host2host/s4u-comm-host2host.cpp
index 5db7a66..cde4cfb 100644 (file)
--- a/examples/cpp/comm-host2host/s4u-comm-host2host.cpp
+++ b/examples/cpp/comm-host2host/s4u-comm-host2host.cpp
@@ -67,7 +67,7 @@ int main(int argc, char* argv[])
 
   e.run();
 
-  XBT_INFO("Total simulation time: %.3f", e.get_clock());
+  XBT_INFO("Total simulation time: %.3f", sg4::Engine::get_clock());
 
   return 0;
 }

diff --git a/examples/cpp/comm-pingpong/s4u-comm-pingpong.cpp b/examples/cpp/comm-pingpong/s4u-comm-pingpong.cpp
index dfc717f..5233d43 100644 (file)
--- a/examples/cpp/comm-pingpong/s4u-comm-pingpong.cpp
+++ b/examples/cpp/comm-pingpong/s4u-comm-pingpong.cpp
@@ -54,7 +54,7 @@ int main(int argc, char* argv[])
 
   e.run();
 
-  XBT_INFO("Total simulation time: %.3f", e.get_clock());
+  XBT_INFO("Total simulation time: %.3f", sg4::Engine::get_clock());
 
   return 0;
 }

diff --git a/examples/cpp/dht-chord/s4u-dht-chord.cpp b/examples/cpp/dht-chord/s4u-dht-chord.cpp
index 8b4ae5f..73f797b 100644 (file)
--- a/examples/cpp/dht-chord/s4u-dht-chord.cpp
+++ b/examples/cpp/dht-chord/s4u-dht-chord.cpp
@@ -45,6 +45,6 @@ int main(int argc, char* argv[])
 
   e.run();
 
-  XBT_INFO("Simulated time: %g", e.get_clock());
+  XBT_INFO("Simulated time: %g", simgrid::s4u::Engine::get_clock());
   return 0;
 }

diff --git a/examples/cpp/dht-kademlia/s4u-dht-kademlia.cpp b/examples/cpp/dht-kademlia/s4u-dht-kademlia.cpp
index c6dc149..0b92ef4 100644 (file)
--- a/examples/cpp/dht-kademlia/s4u-dht-kademlia.cpp
+++ b/examples/cpp/dht-kademlia/s4u-dht-kademlia.cpp
@@ -85,7 +85,7 @@ int main(int argc, char* argv[])
 
   e.run();
 
-  XBT_INFO("Simulated time: %g", e.get_clock());
+  XBT_INFO("Simulated time: %g", simgrid::s4u::Engine::get_clock());
 
   return 0;
 }

diff --git a/teshsuite/kernel/context-defaults/context-defaults.cpp b/teshsuite/kernel/context-defaults/context-defaults.cpp
index af1722e..ee9d6b1 100644 (file)
--- a/teshsuite/kernel/context-defaults/context-defaults.cpp
+++ b/teshsuite/kernel/context-defaults/context-defaults.cpp
@@ -13,7 +13,6 @@ int main(int argc, char* argv[])
 {
   xbt_log_control_set("root.fmt:[%c/%p]%e%m%n");
   xbt_log_control_set("simix_context.threshold:verbose");
-  simgrid::s4u::Engine e(&argc, argv);
-  e.get_clock(); // just to use the engine once.
+  XBT_ATTRIB_UNUSED simgrid::s4u::Engine e(&argc, argv);
   return 0;
 }

diff --git a/teshsuite/mc/mutex-handling/mutex-handling.cpp b/teshsuite/mc/mutex-handling/mutex-handling.cpp
index 236c5f3..49d6da6 100644 (file)
--- a/teshsuite/mc/mutex-handling/mutex-handling.cpp
+++ b/teshsuite/mc/mutex-handling/mutex-handling.cpp
@@ -74,7 +74,7 @@ int main(int argc, char* argv[])
   simgrid::s4u::Actor::create("sender", e.host_by_name("Fafard"), sender, "box", mutex, 2);
 
   e.run();
-  XBT_INFO("Simulation time %g", e.get_clock());
+  XBT_INFO("Simulation time %g", simgrid::s4u::Engine::get_clock());
 
   return 0;
 }

diff --git a/teshsuite/s4u/actor-autorestart/actor-autorestart.cpp b/teshsuite/s4u/actor-autorestart/actor-autorestart.cpp
index 65a5464..048a698 100644 (file)
--- a/teshsuite/s4u/actor-autorestart/actor-autorestart.cpp
+++ b/teshsuite/s4u/actor-autorestart/actor-autorestart.cpp
@@ -59,7 +59,7 @@ int main(int argc, char* argv[])
   simgrid::s4u::Actor::create("Autostart", e.host_by_name("Tremblay"), autostart);
 
   e.run();
-  XBT_INFO("Simulation time %g", e.get_clock());
+  XBT_INFO("Simulation time %g", simgrid::s4u::Engine::get_clock());
 
   return 0;
 }

diff --git a/teshsuite/s4u/actor/actor.cpp b/teshsuite/s4u/actor/actor.cpp
index 0bbc753..23c84b2 100644 (file)
--- a/teshsuite/s4u/actor/actor.cpp
+++ b/teshsuite/s4u/actor/actor.cpp
@@ -60,7 +60,7 @@ int main(int argc, char* argv[])
   simgrid::s4u::Actor::create("worker", e.host_by_name("Tremblay"), worker);
 
   e.run();
-  XBT_INFO("Simulation time %g", e.get_clock());
+  XBT_INFO("Simulation time %g", simgrid::s4u::Engine::get_clock());
 
   return 0;
 }

diff --git a/teshsuite/s4u/cloud-interrupt-migration/cloud-interrupt-migration.cpp b/teshsuite/s4u/cloud-interrupt-migration/cloud-interrupt-migration.cpp
index 019b100..7a7c206 100644 (file)
--- a/teshsuite/s4u/cloud-interrupt-migration/cloud-interrupt-migration.cpp
+++ b/teshsuite/s4u/cloud-interrupt-migration/cloud-interrupt-migration.cpp
@@ -65,7 +65,7 @@ int main(int argc, char* argv[])
 
   e.run();
 
-  XBT_INFO("Bye (simulation time %g)", e.get_clock());
+  XBT_INFO("Bye (simulation time %g)", simgrid::s4u::Engine::get_clock());
 
   return 0;
 }

diff --git a/teshsuite/s4u/cloud-two-execs/cloud-two-execs.cpp b/teshsuite/s4u/cloud-two-execs/cloud-two-execs.cpp
index 2114719..9e38bce 100644 (file)
--- a/teshsuite/s4u/cloud-two-execs/cloud-two-execs.cpp
+++ b/teshsuite/s4u/cloud-two-execs/cloud-two-execs.cpp
@@ -58,7 +58,7 @@ int main(int argc, char* argv[])
   simgrid::s4u::Actor::create("master_", e.host_by_name("Fafard"), master_main);
 
   e.run();
-  XBT_INFO("Bye (simulation time %g)", e.get_clock());
+  XBT_INFO("Bye (simulation time %g)", simgrid::s4u::Engine::get_clock());
 
   return 0;
 }

diff --git a/teshsuite/s4u/comm-pt2pt/comm-pt2pt.cpp b/teshsuite/s4u/comm-pt2pt/comm-pt2pt.cpp
index 5ccfa0c..6fbc607 100644 (file)
--- a/teshsuite/s4u/comm-pt2pt/comm-pt2pt.cpp
+++ b/teshsuite/s4u/comm-pt2pt/comm-pt2pt.cpp
@@ -186,7 +186,7 @@ int main(int argc, char* argv[])
   simgrid::s4u::Actor::create("recver", hosts[1], receiver, argRecv);
 
   e.run();
-  XBT_INFO("Simulation time %g", e.get_clock());
+  XBT_INFO("Simulation time %g", simgrid::s4u::Engine::get_clock());
 
   return 0;
 }

diff --git a/teshsuite/s4u/concurrent_rw/concurrent_rw.cpp b/teshsuite/s4u/concurrent_rw/concurrent_rw.cpp
index d86661d..9924a39 100644 (file)
--- a/teshsuite/s4u/concurrent_rw/concurrent_rw.cpp
+++ b/teshsuite/s4u/concurrent_rw/concurrent_rw.cpp
@@ -38,7 +38,7 @@ int main(int argc, char** argv)
     sg4::Actor::create("host", e.host_by_name("bob"), host);
 
   e.run();
-  XBT_INFO("Simulation time %g", e.get_clock());
+  XBT_INFO("Simulation time %g", sg4::Engine::get_clock());
 
   return 0;
 }

diff --git a/teshsuite/s4u/host-multicore-speed-file/host-multicore-speed-file.cpp b/teshsuite/s4u/host-multicore-speed-file/host-multicore-speed-file.cpp
index 468c98f..ed67673 100644 (file)
--- a/teshsuite/s4u/host-multicore-speed-file/host-multicore-speed-file.cpp
+++ b/teshsuite/s4u/host-multicore-speed-file/host-multicore-speed-file.cpp
@@ -107,7 +107,7 @@ int main(int argc, char* argv[])
 
   e.run();
 
-  XBT_INFO("Simulation time %g", e.get_clock());
+  XBT_INFO("Simulation time %g", sg4::Engine::get_clock());
 
   return 0;
 }

diff --git a/teshsuite/s4u/host-on-off-actors/host-on-off-actors.cpp b/teshsuite/s4u/host-on-off-actors/host-on-off-actors.cpp
index e5ad474..f2542d5 100644 (file)
--- a/teshsuite/s4u/host-on-off-actors/host-on-off-actors.cpp
+++ b/teshsuite/s4u/host-on-off-actors/host-on-off-actors.cpp
@@ -163,7 +163,7 @@ int main(int argc, char* argv[])
 
   e.run();
 
-  XBT_INFO("Simulation time %g", e.get_clock());
+  XBT_INFO("Simulation time %g", simgrid::s4u::Engine::get_clock());
 
   return 0;
 }

diff --git a/teshsuite/s4u/host-on-off-recv/host-on-off-recv.cpp b/teshsuite/s4u/host-on-off-recv/host-on-off-recv.cpp
index 19de43d..5e2d38f 100644 (file)
--- a/teshsuite/s4u/host-on-off-recv/host-on-off-recv.cpp
+++ b/teshsuite/s4u/host-on-off-recv/host-on-off-recv.cpp
@@ -61,7 +61,7 @@ int main(int argc, char* argv[])
 
   e.run();
 
-  XBT_INFO("Simulation time %g", e.get_clock());
+  XBT_INFO("Simulation time %g", simgrid::s4u::Engine::get_clock());
 
   return 0;
 }

diff --git a/teshsuite/s4u/host-on-off/host-on-off.cpp b/teshsuite/s4u/host-on-off/host-on-off.cpp
index 860df76..00f9307 100644 (file)
--- a/teshsuite/s4u/host-on-off/host-on-off.cpp
+++ b/teshsuite/s4u/host-on-off/host-on-off.cpp
@@ -99,7 +99,7 @@ int main(int argc, char* argv[])
 
   e.run();
 
-  XBT_INFO("Simulation time %g", e.get_clock());
+  XBT_INFO("Simulation time %g", simgrid::s4u::Engine::get_clock());
 
   return 0;
 }

diff --git a/teshsuite/s4u/storage_client_server/storage_client_server.cpp b/teshsuite/s4u/storage_client_server/storage_client_server.cpp
index 8c1f927..55554e4 100644 (file)
--- a/teshsuite/s4u/storage_client_server/storage_client_server.cpp
+++ b/teshsuite/s4u/storage_client_server/storage_client_server.cpp
@@ -154,6 +154,6 @@ int main(int argc, char* argv[])
 
   e.run();
 
-  XBT_INFO("Simulated time: %g", e.get_clock());
+  XBT_INFO("Simulated time: %g", simgrid::s4u::Engine::get_clock());
   return 0;
 }

diff --git a/teshsuite/surf/surf_usage/surf_usage.cpp b/teshsuite/surf/surf_usage/surf_usage.cpp
index fbfac17..5735095 100644 (file)
--- a/teshsuite/surf/surf_usage/surf_usage.cpp
+++ b/teshsuite/surf/surf_usage/surf_usage.cpp
@@ -71,7 +71,7 @@ int main(int argc, char** argv)
 
   surf_solve(-1.0);
   do {
-    XBT_INFO("Next Event : %g", e.get_clock());
+    XBT_INFO("Next Event : %g", simgrid::s4u::Engine::get_clock());
     XBT_DEBUG("\t CPU actions");
 
     simgrid::kernel::resource::Action::StateSet* action_list = cpu_model_pm->get_failed_action_set();

diff --git a/teshsuite/surf/surf_usage2/surf_usage2.cpp b/teshsuite/surf/surf_usage2/surf_usage2.cpp
index 6faa675..18bc5b0 100644 (file)
--- a/teshsuite/surf/surf_usage2/surf_usage2.cpp
+++ b/teshsuite/surf/surf_usage2/surf_usage2.cpp
@@ -48,7 +48,7 @@ int main(int argc, char** argv)
     simgrid::kernel::resource::Action* action = nullptr;
     running                                   = 0;
 
-    double now = e.get_clock();
+    double now = simgrid::s4u::Engine::get_clock();
     XBT_INFO("Next Event : %g", now);
 
     for (auto const& model : e.get_all_models()) {