Use :: to call get_clock() which is a static member of s4u::Engine.

diff --git a/docs/source/tuto_s4u/master-workers-lab3.cpp b/docs/source/tuto_s4u/master-workers-lab3.cpp
index 85a1c0f..d369ecc 100644 (file)
--- a/docs/source/tuto_s4u/master-workers-lab3.cpp
+++ b/docs/source/tuto_s4u/master-workers-lab3.cpp
@@ -50,7 +50,7 @@ static void master(std::vector<std::string> args)
   }
 
   int task_id = 0;
-  while (e->get_clock() < simulation_duration) { /* For each task: */
+  while (simgrid::s4u::Engine::get_clock() < simulation_duration) { /* For each task: */
     /* - Select a worker in a round-robin way */
     aid_t worker_pid                 = actors.at(task_id % actors.size())->get_pid();
     std::string mailbox_name         = std::string("worker-") + std::to_string(worker_pid);

diff --git a/docs/source/tuto_s4u/master-workers-lab4.cpp b/docs/source/tuto_s4u/master-workers-lab4.cpp
index c0cafea..40984ca 100644 (file)
--- a/docs/source/tuto_s4u/master-workers-lab4.cpp
+++ b/docs/source/tuto_s4u/master-workers-lab4.cpp
@@ -56,7 +56,7 @@ static void master(std::vector<std::string> args)
   }
 
   int task_id = 0;
-  while (e->get_clock() < simulation_duration) { /* For each task: */
+  while (simgrid::s4u::Engine::get_clock() < simulation_duration) { /* For each task: */
     /* - Select a worker in a round-robin way */
     aid_t worker_pid                 = actors.at(task_id % actors.size())->get_pid();
     std::string mailbox_name         = std::string("worker-") + std::to_string(worker_pid);

diff --git a/examples/cpp/actor-stacksize/s4u-actor-stacksize.cpp b/examples/cpp/actor-stacksize/s4u-actor-stacksize.cpp
index c184215..ddee169 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", sg4::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-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-simple/s4u-cloud-simple.cpp b/examples/cpp/cloud-simple/s4u-cloud-simple.cpp
index 813eede..2b903ad 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 7c88907..aa9e345 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 7c80502..626bf42 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 65acdbd..d6099d7 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 8723799..6651af6 100644 (file)
--- a/examples/cpp/dht-chord/s4u-dht-chord.cpp
+++ b/examples/cpp/dht-chord/s4u-dht-chord.cpp
@@ -47,6 +47,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/exec-async/s4u-exec-async.cpp b/examples/cpp/exec-async/s4u-exec-async.cpp
index 269228c..bb94c7d 100644 (file)
--- a/examples/cpp/exec-async/s4u-exec-async.cpp
+++ b/examples/cpp/exec-async/s4u-exec-async.cpp
@@ -66,7 +66,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/exec-dependent/s4u-exec-dependent.cpp b/examples/cpp/exec-dependent/s4u-exec-dependent.cpp
index b8eb8b5..68187bf 100644 (file)
--- a/examples/cpp/exec-dependent/s4u-exec-dependent.cpp
+++ b/examples/cpp/exec-dependent/s4u-exec-dependent.cpp
@@ -56,7 +56,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/exec-dvfs/s4u-exec-dvfs.cpp b/examples/cpp/exec-dvfs/s4u-exec-dvfs.cpp
index 22197c4..d281d64 100644 (file)
--- a/examples/cpp/exec-dvfs/s4u-exec-dvfs.cpp
+++ b/examples/cpp/exec-dvfs/s4u-exec-dvfs.cpp
@@ -59,7 +59,7 @@ int main(int argc, char* argv[])
 
   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/exec-unassigned/s4u-exec-unassigned.cpp b/examples/cpp/exec-unassigned/s4u-exec-unassigned.cpp
index 722609b..0998373 100644 (file)
--- a/examples/cpp/exec-unassigned/s4u-exec-unassigned.cpp
+++ b/examples/cpp/exec-unassigned/s4u-exec-unassigned.cpp
@@ -34,7 +34,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/io-async/s4u-io-async.cpp b/examples/cpp/io-async/s4u-io-async.cpp
index fba5031..ac72b84 100644 (file)
--- a/examples/cpp/io-async/s4u-io-async.cpp
+++ b/examples/cpp/io-async/s4u-io-async.cpp
@@ -74,7 +74,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/io-dependent/s4u-io-dependent.cpp b/examples/cpp/io-dependent/s4u-io-dependent.cpp
index 5923adb..5b296f3 100644 (file)
--- a/examples/cpp/io-dependent/s4u-io-dependent.cpp
+++ b/examples/cpp/io-dependent/s4u-io-dependent.cpp
@@ -55,7 +55,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/replay-comm/s4u-replay-comm.cpp b/examples/cpp/replay-comm/s4u-replay-comm.cpp
index 4743256..cc93d6c 100644 (file)
--- a/examples/cpp/replay-comm/s4u-replay-comm.cpp
+++ b/examples/cpp/replay-comm/s4u-replay-comm.cpp
@@ -108,7 +108,7 @@ int main(int argc, char* argv[])
 
   simgrid::xbt::action_fs = nullptr;
 
-  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/replay-io/s4u-replay-io.cpp b/examples/cpp/replay-io/s4u-replay-io.cpp
index 52f18b8..66ebcff 100644 (file)
--- a/examples/cpp/replay-io/s4u-replay-io.cpp
+++ b/examples/cpp/replay-io/s4u-replay-io.cpp
@@ -123,7 +123,7 @@ int main(int argc, char* argv[])
 
   simgrid::xbt::action_fs = nullptr;
 
-  XBT_INFO("Simulation time %g", e.get_clock());
+  XBT_INFO("Simulation time %g", simgrid::s4u::Engine::get_clock());
 
   return 0;
 }

diff --git a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual.cpp b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual.cpp
index fc55056..d736085 100644 (file)
--- a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual.cpp
+++ b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual.cpp
@@ -239,7 +239,7 @@ int main(int argc, char* argv[])
   simgrid::s4u::Actor::create("workload", hosts[0], workload_executor_process, &jobs);
 
   e.run();
-  XBT_INFO("Simulation finished! Final time: %g", e.get_clock());
+  XBT_INFO("Simulation finished! Final time: %g", simgrid::s4u::Engine::get_clock());
 
   SMPI_finalize();
 

diff --git a/examples/smpi/smpi_s4u_masterworker/masterworker_mailbox_smpi.cpp b/examples/smpi/smpi_s4u_masterworker/masterworker_mailbox_smpi.cpp
index d4d0664..9c35e33 100644 (file)
--- a/examples/smpi/smpi_s4u_masterworker/masterworker_mailbox_smpi.cpp
+++ b/examples/smpi/smpi_s4u_masterworker/masterworker_mailbox_smpi.cpp
@@ -120,7 +120,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());
 
   SMPI_finalize();
   return 0;

diff --git a/teshsuite/mc/mutex-handling/mutex-handling.cpp b/teshsuite/mc/mutex-handling/mutex-handling.cpp
index e7657ef..243763b 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", simgrid::s4u::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/models/ptask_L07/ptask_L07.cpp b/teshsuite/models/ptask_L07/ptask_L07.cpp
index 0783ad5..6c39cb7 100644 (file)
--- a/teshsuite/models/ptask_L07/ptask_L07.cpp
+++ b/teshsuite/models/ptask_L07/ptask_L07.cpp
@@ -23,9 +23,9 @@ static void main_dispatcher()
   XBT_INFO("------------------------------------------------------------");
   XBT_INFO("Have to compute 1 flop on a 1 flop/s host.");
   XBT_INFO("Should be done in exactly one second.");
-  start_time = e->get_clock();
+  start_time = sg4::Engine::get_clock();
   sg4::Exec::init()->set_flops_amount(1)->set_host(hosts[0])->wait();
-  end_time = e->get_clock();
+  end_time = sg4::Engine::get_clock();
   XBT_INFO("Actual result: computing 1 flop at 1 flop/s takes %.2f seconds.", end_time - start_time);
   XBT_INFO("\n");
 
@@ -35,12 +35,12 @@ static void main_dispatcher()
   XBT_INFO("------------------------------------------------------------");
   XBT_INFO("Have to compute 2 x 1 flop on a 1 flop/s host.");
   XBT_INFO("Should be done in exactly 2 seconds because of sharing.");
-  start_time = e->get_clock();
+  start_time      = sg4::Engine::get_clock();
   sg4::ExecPtr e1 = sg4::Exec::init()->set_flops_amount(1)->set_host(hosts[0])->start();
   sg4::ExecPtr e2 = sg4::Exec::init()->set_flops_amount(1)->set_host(hosts[0])->start();
   e1->wait();
   e2->wait();
-  end_time = e->get_clock();
+  end_time = sg4::Engine::get_clock();
   XBT_INFO("Actual result: computing 2x1 flop at 1 flop/s takes %.2f seconds.", end_time - start_time);
   XBT_INFO("\n");
 
@@ -50,11 +50,11 @@ static void main_dispatcher()
   XBT_INFO("------------------------------------------------------------");
   XBT_INFO("Have to compute 2 flops across two hosts running at 1 flop/s.");
   XBT_INFO("Should be done in exactly one second.");
-  start_time = e->get_clock();
+  start_time = sg4::Engine::get_clock();
   sg4::Exec::init()->set_flops_amounts(std::vector<double>({1.0, 1.0}))
                    ->set_hosts(std::vector<sg4::Host*>({hosts[0], hosts[1]}))
                    ->wait();
-  end_time = e->get_clock();
+  end_time = sg4::Engine::get_clock();
   XBT_INFO("Actual result: computing 2 flops on 2 hosts at 1 flop/s takes %.2f seconds.", end_time - start_time);
   XBT_INFO("\n");
 
@@ -64,11 +64,11 @@ static void main_dispatcher()
   XBT_INFO("------------------------------------------------------------");
   XBT_INFO("Have to compute 2 flops across two hosts, one running at 1 flop/s and one at 2 flop/s.");
   XBT_INFO("Should be done in exactly one second.");
-  start_time = e->get_clock();
+  start_time = sg4::Engine::get_clock();
   sg4::Exec::init()->set_flops_amounts(std::vector<double>({1.0, 1.0}))
                    ->set_hosts(std::vector<sg4::Host*>({hosts[0], hosts[5]}))
                    ->wait();
-  end_time = e->get_clock();
+  end_time = sg4::Engine::get_clock();
   XBT_INFO("Actual result: computing 2 flops on 2 heterogeneous hosts takes %.2f seconds.", end_time - start_time);
   XBT_INFO("\n");
 
@@ -78,9 +78,9 @@ static void main_dispatcher()
   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).");
-  start_time = e->get_clock();
+  start_time = sg4::Engine::get_clock();
   sg4::Comm::sendto_async(hosts[0], hosts[4], 1.0)->wait();
-  end_time = e->get_clock();
+  end_time = sg4::Engine::get_clock();
   XBT_INFO("Actual result: sending 1 byte on a shared link at 1Bps + 500ms takes %.2f seconds.", end_time - start_time);
   XBT_INFO("\n");
 
@@ -90,9 +90,9 @@ static void main_dispatcher()
   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).");
-  start_time = e->get_clock();
+  start_time = sg4::Engine::get_clock();
   sg4::Comm::sendto_async(hosts[0], hosts[5], 1.0)->wait();
-  end_time = e->get_clock();
+  end_time = sg4::Engine::get_clock();
   XBT_INFO("Actual result: sending 1 byte on a fatpipe link at 1Bps + 500ms takes %.2f seconds.", end_time - start_time);
   XBT_INFO("\n");
 
@@ -102,9 +102,9 @@ static void main_dispatcher()
   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).");
-  start_time = e->get_clock();
+  start_time = sg4::Engine::get_clock();
   sg4::Comm::sendto_async(hosts[0], hosts[1], 1.0)->wait();
-  end_time = e->get_clock();
+  end_time = sg4::Engine::get_clock();
   XBT_INFO("Actual result: sending 1 byte on a 3-link route at 1Bps + 2,500ms takes %.2f seconds.", end_time - start_time);
   XBT_INFO("\n");
 
@@ -115,9 +115,9 @@ static void main_dispatcher()
   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).");
-  start_time = e->get_clock();
+  start_time = sg4::Engine::get_clock();
   sg4::Comm::sendto_async(hosts[0], hosts[6], 1.0)->wait();
-  end_time = e->get_clock();
+  end_time = sg4::Engine::get_clock();
   XBT_INFO("Actual result: sending 1 byte on a large latency link takes %.2f seconds.", end_time - start_time);
   XBT_INFO("\n");
 
@@ -127,12 +127,12 @@ static void main_dispatcher()
    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).");
-   start_time = e->get_clock();
+   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);
    c1->wait();
    c2->wait();
-   end_time = e->get_clock();
+   end_time = sg4::Engine::get_clock();
    XBT_INFO("Actual result: sending 2x1 bytes on a shared link at 1Bps + 500ms takes %.2f seconds.", end_time - start_time);
    XBT_INFO("\n");
 
@@ -142,12 +142,12 @@ static void main_dispatcher()
    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).");
-   start_time = e->get_clock();
+   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);
    c1->wait();
    c2->wait();
-   end_time = e->get_clock();
+   end_time = sg4::Engine::get_clock();
    XBT_INFO("Actual result: sending 2x1 bytes on a fatpipe link at 1Bps + 500ms takes %.2f seconds.", end_time - start_time);
    XBT_INFO("\n");
 
@@ -157,12 +157,12 @@ static void main_dispatcher()
    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).");
-   start_time = e->get_clock();
+   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);
    c1->wait();
    c2->wait();
-   end_time = e->get_clock();
+   end_time = sg4::Engine::get_clock();
    XBT_INFO("Actual result: sending 2x1 bytes on a 3-link route at 1Bps + 2,500ms takes %.2f seconds.",
             end_time - start_time);
    XBT_INFO("\n");
@@ -173,12 +173,12 @@ static void main_dispatcher()
    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).");
-   start_time = e->get_clock();
+   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);
    c1->wait();
    c2->wait();
-   end_time = e->get_clock();
+   end_time = sg4::Engine::get_clock();
    XBT_INFO("Actual result: sending 1 byte in both directions on a shared link at 1Bps + 500ms takes %.2f seconds.",
             end_time - start_time);
    XBT_INFO("\n");
@@ -189,12 +189,12 @@ static void main_dispatcher()
    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).");
-   start_time = e->get_clock();
+   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);
    c1->wait();
    c2->wait();
-   end_time = e->get_clock();
+   end_time = sg4::Engine::get_clock();
    XBT_INFO("Actual result: sending 1 byte in both directions on a fatpipe link at 1Bps + 500ms takes %.2f seconds.",
             end_time - start_time);
    XBT_INFO("\n");
@@ -205,12 +205,12 @@ static void main_dispatcher()
    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).");
-   start_time = e->get_clock();
+   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);
    c1->wait();
    c2->wait();
-   end_time = e->get_clock();
+   end_time = sg4::Engine::get_clock();
    XBT_INFO("Actual result: sending 1 byte in both directions on a 3-link route at 1Bps + 2,500ms takes %.2f seconds.",
              end_time - start_time);
    XBT_INFO("\n");
@@ -221,14 +221,14 @@ static void main_dispatcher()
    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).");
-   start_time = e->get_clock();
+   start_time = sg4::Engine::get_clock();
    sg4::Exec::init()->set_bytes_amounts(std::vector<double>({0.0, 1.0, 0.0, 0.0,
                                                              0.0, 0.0, 0.0, 0.0,
                                                              0.0, 0.0, 0.0, 1.0,
                                                              0.0, 0.0, 0.0, 0.0 }))
                     ->set_hosts(std::vector<sg4::Host*>({hosts[0], hosts[1], hosts[2], hosts[3]}))
                     ->wait();
-   end_time = e->get_clock();
+   end_time = sg4::Engine::get_clock();
    XBT_INFO("Actual result: sending 2 x 1 byte in a parallel communication without interference takes %.2f seconds.",
              end_time - start_time);
    XBT_INFO("\n");
@@ -243,14 +243,14 @@ static void main_dispatcher()
    XBT_INFO(" - For 2 seconds, two lows share a link to transfer 1 x 1B. 'cpu2' received is payload");
    XBT_INFO(" - For 1 second, one flow has the full bandwidth to transfer 1B. 'cpu3' received is payload");
 
-   start_time = e->get_clock();
+   start_time = sg4::Engine::get_clock();
    sg4::Exec::init()->set_bytes_amounts(std::vector<double>({0.0, 1.0, 2.0, 3.0,
                                                              0.0, 0.0, 0.0, 0.0,
                                                              0.0, 0.0, 0.0, 0.0,
                                                              0.0, 0.0, 0.0, 0.0 }))
                     ->set_hosts(std::vector<sg4::Host*>({hosts[0], hosts[1], hosts[2], hosts[3]}))
                     ->wait();
-   end_time = e->get_clock();
+   end_time = sg4::Engine::get_clock();
    XBT_INFO("Actual result: scattering an increasing number of bytes to 3 hosts takes %.2f seconds.",
              end_time - start_time);
    XBT_INFO("\n");
@@ -264,14 +264,14 @@ static void main_dispatcher()
    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 = e->get_clock();
+   start_time = sg4::Engine::get_clock();
    sg4::Exec::init()->set_bytes_amounts(std::vector<double>({0.0, 1.0, 1.0, 1.0,
                                                              1.0, 0.0, 1.0, 1.0,
                                                              1.0, 1.0, 0.0, 1.0,
                                                              1.0, 1.0, 1.0, 0.0 }))
                     ->set_hosts(std::vector<sg4::Host*>({hosts[0], hosts[1], hosts[2], hosts[3]}))
                     ->wait();
-   end_time = e->get_clock();
+   end_time = sg4::Engine::get_clock();
    XBT_INFO("Actual result: 1-byte all-too-all in a parallel communication takes %.2f seconds.",
              end_time - start_time);
    XBT_INFO("\n");

diff --git a/teshsuite/s4u/actor-autorestart/actor-autorestart.cpp b/teshsuite/s4u/actor-autorestart/actor-autorestart.cpp
index 5736e0b..6a86b41 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", simgrid::s4u::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 902c1f7..eafecfe 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", simgrid::s4u::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-two-execs/cloud-two-execs.cpp b/teshsuite/s4u/cloud-two-execs/cloud-two-execs.cpp
index d349abc..495453e 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_", simgrid::s4u::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 20430fe..c5e1fec 100644 (file)
--- a/teshsuite/s4u/concurrent_rw/concurrent_rw.cpp
+++ b/teshsuite/s4u/concurrent_rw/concurrent_rw.cpp
@@ -36,7 +36,7 @@ int main(int argc, char** argv)
     simgrid::s4u::Actor::create("host", simgrid::s4u::Host::by_name("bob"), host);
 
   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-actors/host-on-off-actors.cpp b/teshsuite/s4u/host-on-off-actors/host-on-off-actors.cpp
index 4359ad7..a94afdc 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
@@ -164,7 +164,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 951137b..08641ef 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 cd29b5a..e4610d6 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 2be97ae..30eec58 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;
 }