less indirect calls to get_instance in examples (actor to engine)

diff --git a/examples/cpp/actor-create/s4u-actor-create.cpp b/examples/cpp/actor-create/s4u-actor-create.cpp
index 1875ae3..198a632 100644 (file)
--- a/examples/cpp/actor-create/s4u-actor-create.cpp
+++ b/examples/cpp/actor-create/s4u-actor-create.cpp
@@ -98,15 +98,15 @@ int main(int argc, char** argv)
    * as we do here for the receiver actors. This function can take any kind of parameters, as
    * long as the last parameters of Actor::create() match what your function expects.
    */
-  sg4::Actor::create("receiver", sg4::Host::by_name("Fafard"), &receiver, "mb42");
+  sg4::Actor::create("receiver", e.host_by_name("Fafard"), &receiver, "mb42");
 
   /* If your actor is getting more complex, you probably want to implement it as a class instead,
    * as we do here for the sender actors. The main behavior goes into operator()() of the class.
    *
    * You can then directly start your actor, as follows: */
-  sg4::Actor::create("sender1", sg4::Host::by_name("Tremblay"), Sender());
+  sg4::Actor::create("sender1", e.host_by_name("Tremblay"), Sender());
   /* If you want to pass parameters to your class, that's very easy: just use your constructors */
-  sg4::Actor::create("sender2", sg4::Host::by_name("Jupiter"), Sender("GloubiBoulga"));
+  sg4::Actor::create("sender2", e.host_by_name("Jupiter"), Sender("GloubiBoulga"));
 
   /* But starting actors directly is considered as a bad experimental habit, since it ties the code
    * you want to test with the experimental scenario. Starting your actors from an external deployment

diff --git a/examples/cpp/actor-daemon/s4u-actor-daemon.cpp b/examples/cpp/actor-daemon/s4u-actor-daemon.cpp
index 61666cf..2dd5564 100644 (file)
--- a/examples/cpp/actor-daemon/s4u-actor-daemon.cpp
+++ b/examples/cpp/actor-daemon/s4u-actor-daemon.cpp
@@ -35,8 +35,8 @@ int main(int argc, char* argv[])
   sg4::Engine e(&argc, argv);
 
   e.load_platform(argv[1]);
-  sg4::Actor::create("worker", sg4::Host::by_name("Boivin"), worker);
-  sg4::Actor::create("daemon", sg4::Host::by_name("Tremblay"), my_daemon);
+  sg4::Actor::create("worker", e.host_by_name("Boivin"), worker);
+  sg4::Actor::create("daemon", e.host_by_name("Tremblay"), my_daemon);
 
   e.run();
   return 0;

diff --git a/examples/cpp/actor-exiting/s4u-actor-exiting.cpp b/examples/cpp/actor-exiting/s4u-actor-exiting.cpp
index 9693523..0b61296 100644 (file)
--- a/examples/cpp/actor-exiting/s4u-actor-exiting.cpp
+++ b/examples/cpp/actor-exiting/s4u-actor-exiting.cpp
@@ -84,9 +84,9 @@ int main(int argc, char* argv[])
       [](sg4::Actor const& actor) { XBT_INFO("Actor %s gets destroyed now", actor.get_cname()); });
 
   /* Create some actors */
-  sg4::Actor::create("A", sg4::Host::by_name("Tremblay"), actor_a);
-  sg4::Actor::create("B", sg4::Host::by_name("Fafard"), actor_b);
-  sg4::Actor::create("C", sg4::Host::by_name("Ginette"), actor_c);
+  sg4::Actor::create("A", e.host_by_name("Tremblay"), actor_a);
+  sg4::Actor::create("B", e.host_by_name("Fafard"), actor_b);
+  sg4::Actor::create("C", e.host_by_name("Ginette"), actor_c);
 
   e.run(); /* - Run the simulation */
 

diff --git a/examples/cpp/actor-join/s4u-actor-join.cpp b/examples/cpp/actor-join/s4u-actor-join.cpp
index fd11767..5889f44 100644 (file)
--- a/examples/cpp/actor-join/s4u-actor-join.cpp
+++ b/examples/cpp/actor-join/s4u-actor-join.cpp
@@ -55,11 +55,11 @@ int main(int argc, char* argv[])
 
   e.load_platform(argv[1]);
 
-  sg4::Actor::create("master", sg4::Host::by_name("Tremblay"), master);
+  sg4::Actor::create("master", e.host_by_name("Tremblay"), master);
 
   e.run();
 
-  XBT_INFO("Simulation time %g", sg4::Engine::get_clock());
+  XBT_INFO("Simulation time %g", e.get_clock());
 
   return 0;
 }

diff --git a/examples/cpp/actor-kill/s4u-actor-kill.cpp b/examples/cpp/actor-kill/s4u-actor-kill.cpp
index 9b8d86e..dfcfc41 100644 (file)
--- a/examples/cpp/actor-kill/s4u-actor-kill.cpp
+++ b/examples/cpp/actor-kill/s4u-actor-kill.cpp
@@ -67,7 +67,7 @@ int main(int argc, char* argv[])
 
   e.load_platform(argv[1]); /* - Load the platform description */
   /* - Create and deploy killer actor, that will create the victim actors  */
-  sg4::Actor::create("killer", sg4::Host::by_name("Tremblay"), killer);
+  sg4::Actor::create("killer", e.host_by_name("Tremblay"), killer);
 
   e.run(); /* - Run the simulation */
 

diff --git a/examples/cpp/actor-migrate/s4u-actor-migrate.cpp b/examples/cpp/actor-migrate/s4u-actor-migrate.cpp
index 8e6e6aa..2c6312c 100644 (file)
--- a/examples/cpp/actor-migrate/s4u-actor-migrate.cpp
+++ b/examples/cpp/actor-migrate/s4u-actor-migrate.cpp
@@ -64,7 +64,7 @@ int main(int argc, char* argv[])
   xbt_assert(argc == 2, "Usage: %s platform_file\n\tExample: %s ../platforms/small_platform.xml\n", argv[0], argv[0]);
   e.load_platform(argv[1]);
 
-  sg4::Actor::create("monitor", sg4::Host::by_name("Boivin"), monitor);
+  sg4::Actor::create("monitor", e.host_by_name("Boivin"), monitor);
   e.run();
 
   return 0;

diff --git a/examples/cpp/actor-stacksize/s4u-actor-stacksize.cpp b/examples/cpp/actor-stacksize/s4u-actor-stacksize.cpp
index ddee169..e530466 100644 (file)
--- a/examples/cpp/actor-stacksize/s4u-actor-stacksize.cpp
+++ b/examples/cpp/actor-stacksize/s4u-actor-stacksize.cpp
@@ -21,25 +21,25 @@ int main(int argc, char* argv[])
   e.load_platform(argv[1]);
 
   // If you don't specify anything, you get the default size (8Mb) or the one passed on the command line
-  sg4::Actor::create("actor", sg4::Host::by_name("Tremblay"), actor);
+  sg4::Actor::create("actor", e.host_by_name("Tremblay"), actor);
 
   // You can use set_config(string) to pass a size that will be parsed. That value will be used for any subsequent
   // actors
   sg4::Engine::set_config("contexts/stack-size:16384");
-  sg4::Actor::create("actor", sg4::Host::by_name("Tremblay"), actor);
-  sg4::Actor::create("actor", sg4::Host::by_name("Tremblay"), actor);
+  sg4::Actor::create("actor", e.host_by_name("Tremblay"), actor);
+  sg4::Actor::create("actor", e.host_by_name("Tremblay"), actor);
 
   // You can use set_config(key, value) for the same effect.
   sg4::Engine::set_config("contexts/stack-size", 32 * 1024);
-  sg4::Actor::create("actor", sg4::Host::by_name("Tremblay"), actor);
-  sg4::Actor::create("actor", sg4::Host::by_name("Tremblay"), actor);
+  sg4::Actor::create("actor", e.host_by_name("Tremblay"), actor);
+  sg4::Actor::create("actor", e.host_by_name("Tremblay"), actor);
 
   // Or you can use set_stacksize() before starting the actor to modify only this one
-  sg4::Actor::init("actor", sg4::Host::by_name("Tremblay"))->set_stacksize(64 * 1024)->start(actor);
-  sg4::Actor::create("actor", sg4::Host::by_name("Tremblay"), actor);
+  sg4::Actor::init("actor", e.host_by_name("Tremblay"))->set_stacksize(64 * 1024)->start(actor);
+  sg4::Actor::create("actor", e.host_by_name("Tremblay"), actor);
 
   e.run();
-  XBT_INFO("Simulation time %g", sg4::Engine::get_clock());
+  XBT_INFO("Simulation time %g", e.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 c8f387b..0cd70a8 100644 (file)
--- a/examples/cpp/app-chainsend/s4u-app-chainsend.cpp
+++ b/examples/cpp/app-chainsend/s4u-app-chainsend.cpp
@@ -161,19 +161,19 @@ int main(int argc, char* argv[])
 
   e.load_platform(argv[1]);
 
-  simgrid::s4u::Actor::create("broadcaster", simgrid::s4u::Host::by_name("node-0.simgrid.org"), broadcaster, 8, 256);
+  simgrid::s4u::Actor::create("broadcaster", e.host_by_name("node-0.simgrid.org"), broadcaster, 8, 256);
 
-  simgrid::s4u::Actor::create("peer", simgrid::s4u::Host::by_name("node-1.simgrid.org"), peer);
-  simgrid::s4u::Actor::create("peer", simgrid::s4u::Host::by_name("node-2.simgrid.org"), peer);
-  simgrid::s4u::Actor::create("peer", simgrid::s4u::Host::by_name("node-3.simgrid.org"), peer);
-  simgrid::s4u::Actor::create("peer", simgrid::s4u::Host::by_name("node-4.simgrid.org"), peer);
-  simgrid::s4u::Actor::create("peer", simgrid::s4u::Host::by_name("node-5.simgrid.org"), peer);
-  simgrid::s4u::Actor::create("peer", simgrid::s4u::Host::by_name("node-6.simgrid.org"), peer);
-  simgrid::s4u::Actor::create("peer", simgrid::s4u::Host::by_name("node-7.simgrid.org"), peer);
-  simgrid::s4u::Actor::create("peer", simgrid::s4u::Host::by_name("node-8.simgrid.org"), peer);
+  simgrid::s4u::Actor::create("peer", e.host_by_name("node-1.simgrid.org"), peer);
+  simgrid::s4u::Actor::create("peer", e.host_by_name("node-2.simgrid.org"), peer);
+  simgrid::s4u::Actor::create("peer", e.host_by_name("node-3.simgrid.org"), peer);
+  simgrid::s4u::Actor::create("peer", e.host_by_name("node-4.simgrid.org"), peer);
+  simgrid::s4u::Actor::create("peer", e.host_by_name("node-5.simgrid.org"), peer);
+  simgrid::s4u::Actor::create("peer", e.host_by_name("node-6.simgrid.org"), peer);
+  simgrid::s4u::Actor::create("peer", e.host_by_name("node-7.simgrid.org"), peer);
+  simgrid::s4u::Actor::create("peer", e.host_by_name("node-8.simgrid.org"), peer);
 
   e.run();
-  XBT_INFO("Total simulation time: %e", simgrid::s4u::Engine::get_clock());
+  XBT_INFO("Total simulation time: %e", e.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 6766af4..601f062 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", simgrid::s4u::Engine::get_clock());
+  XBT_INFO("Simulation time %g", e.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 c615cb1..b7c7b8b 100644 (file)
--- a/examples/cpp/cloud-capping/s4u-cloud-capping.cpp
+++ b/examples/cpp/cloud-capping/s4u-cloud-capping.cpp
@@ -250,10 +250,10 @@ int main(int argc, char* argv[])
 
   e.load_platform(argv[1]);
 
-  simgrid::s4u::Actor::create("master_", simgrid::s4u::Host::by_name("Fafard"), master_main);
+  simgrid::s4u::Actor::create("master_", e.host_by_name("Fafard"), master_main);
 
   e.run();
-  XBT_INFO("Bye (simulation time %g)", simgrid::s4u::Engine::get_clock());
+  XBT_INFO("Bye (simulation time %g)", e.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 2b903ad..3df190d 100644 (file)
--- a/examples/cpp/cloud-simple/s4u-cloud-simple.cpp
+++ b/examples/cpp/cloud-simple/s4u-cloud-simple.cpp
@@ -212,11 +212,11 @@ int main(int argc, char* argv[])
   sg_vm_live_migration_plugin_init();
   e.load_platform(argv[1]); /* - Load the platform description */
 
-  simgrid::s4u::Actor::create("master_", simgrid::s4u::Host::by_name("Fafard"), master_main);
+  simgrid::s4u::Actor::create("master_", e.host_by_name("Fafard"), master_main);
 
   e.run();
 
-  XBT_INFO("Simulation time %g", simgrid::s4u::Engine::get_clock());
+  XBT_INFO("Simulation time %g", e.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 aa9e345..7ce73aa 100644 (file)
--- a/examples/cpp/comm-dependent/s4u-comm-dependent.cpp
+++ b/examples/cpp/comm-dependent/s4u-comm-dependent.cpp
@@ -41,14 +41,14 @@ int main(int argc, char* argv[])
   sg4::Engine e(&argc, argv);
   e.load_platform(argv[1]);
 
-  sg4::Mailbox* mbox = sg4::Mailbox::by_name("Mailbox");
+  sg4::Mailbox* mbox = e.mailbox_by_name_or_create("Mailbox");
 
-  sg4::Actor::create("sender", sg4::Host::by_name("Tremblay"), sender, mbox);
-  sg4::Actor::create("receiver", sg4::Host::by_name("Jupiter"), receiver, mbox);
+  sg4::Actor::create("sender", e.host_by_name("Tremblay"), sender, mbox);
+  sg4::Actor::create("receiver", e.host_by_name("Jupiter"), receiver, mbox);
 
   e.run();
 
-  XBT_INFO("Simulation time: %.3f", sg4::Engine::get_clock());
+  XBT_INFO("Simulation time: %.3f", e.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 525d286..5db7a66 100644 (file)
--- a/examples/cpp/comm-host2host/s4u-comm-host2host.cpp
+++ b/examples/cpp/comm-host2host/s4u-comm-host2host.cpp
@@ -62,12 +62,12 @@ int main(int argc, char* argv[])
   sg4::Engine e(&argc, argv);
   e.load_platform(argv[1]);
 
-  sg4::Actor::create("sender", sg4::Host::by_name("Boivin"), sender, sg4::Host::by_name("Tremblay"),
-                     sg4::Host::by_name("Jupiter"), sg4::Host::by_name("Fafard"), sg4::Host::by_name("Ginette"));
+  sg4::Actor::create("sender", e.host_by_name("Boivin"), sender, e.host_by_name("Tremblay"), e.host_by_name("Jupiter"),
+                     e.host_by_name("Fafard"), e.host_by_name("Ginette"));
 
   e.run();
 
-  XBT_INFO("Total simulation time: %.3f", sg4::Engine::get_clock());
+  XBT_INFO("Total simulation time: %.3f", e.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 d6099d7..dfc717f 100644 (file)
--- a/examples/cpp/comm-pingpong/s4u-comm-pingpong.cpp
+++ b/examples/cpp/comm-pingpong/s4u-comm-pingpong.cpp
@@ -46,15 +46,15 @@ int main(int argc, char* argv[])
   sg4::Engine e(&argc, argv);
   e.load_platform(argv[1]);
 
-  sg4::Mailbox* mb1 = sg4::Mailbox::by_name("Mailbox 1");
-  sg4::Mailbox* mb2 = sg4::Mailbox::by_name("Mailbox 2");
+  sg4::Mailbox* mb1 = e.mailbox_by_name_or_create("Mailbox 1");
+  sg4::Mailbox* mb2 = e.mailbox_by_name_or_create("Mailbox 2");
 
-  sg4::Actor::create("pinger", sg4::Host::by_name("Tremblay"), pinger, mb1, mb2);
-  sg4::Actor::create("ponger", sg4::Host::by_name("Jupiter"), ponger, mb2, mb1);
+  sg4::Actor::create("pinger", e.host_by_name("Tremblay"), pinger, mb1, mb2);
+  sg4::Actor::create("ponger", e.host_by_name("Jupiter"), ponger, mb2, mb1);
 
   e.run();
 
-  XBT_INFO("Total simulation time: %.3f", sg4::Engine::get_clock());
+  XBT_INFO("Total simulation time: %.3f", e.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 73f797b..8b4ae5f 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", simgrid::s4u::Engine::get_clock());
+  XBT_INFO("Simulated time: %g", e.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 0b92ef4..c6dc149 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", simgrid::s4u::Engine::get_clock());
+  XBT_INFO("Simulated time: %g", e.get_clock());
 
   return 0;
 }

diff --git a/examples/cpp/energy-boot/s4u-energy-boot.cpp b/examples/cpp/energy-boot/s4u-energy-boot.cpp
index 33fd4bf..556debc 100644 (file)
--- a/examples/cpp/energy-boot/s4u-energy-boot.cpp
+++ b/examples/cpp/energy-boot/s4u-energy-boot.cpp
@@ -103,7 +103,7 @@ int main(int argc, char* argv[])
   xbt_assert(argc == 2, "Usage: %s platform_file\n\tExample: %s platform.xml\n", argv[0], argv[0]);
 
   e.load_platform(argv[1]);
-  simgrid::s4u::Actor::create("Boot Monitor", simgrid::s4u::Host::by_name("MyHost2"), monitor);
+  simgrid::s4u::Actor::create("Boot Monitor", e.host_by_name("MyHost2"), monitor);
 
   e.run();
 

diff --git a/examples/cpp/energy-exec-ptask/s4u-energy-exec-ptask.cpp b/examples/cpp/energy-exec-ptask/s4u-energy-exec-ptask.cpp
index f5d185a..ea2b839 100644 (file)
--- a/examples/cpp/energy-exec-ptask/s4u-energy-exec-ptask.cpp
+++ b/examples/cpp/energy-exec-ptask/s4u-energy-exec-ptask.cpp
@@ -157,12 +157,12 @@ int main(int argc, char* argv[])
 {
   sg_host_energy_plugin_init();
   simgrid::s4u::Engine e(&argc, argv);
-  simgrid::s4u::Engine::set_config("host/model:ptask_L07");
+  e.set_config("host/model:ptask_L07");
 
   xbt_assert(argc == 2, "Usage: %s platform_file\n\tExample: %s ../platforms/energy_platform.xml\n", argv[0], argv[0]);
 
   e.load_platform(argv[1]);
-  simgrid::s4u::Actor::create("energy_ptask_test", simgrid::s4u::Host::by_name("MyHost1"), runner);
+  simgrid::s4u::Actor::create("energy_ptask_test", e.host_by_name("MyHost1"), runner);
 
   e.run();
   XBT_INFO("End of simulation.");

diff --git a/examples/cpp/energy-exec/s4u-energy-exec.cpp b/examples/cpp/energy-exec/s4u-energy-exec.cpp
index 152074f..d9ac7d8 100644 (file)
--- a/examples/cpp/energy-exec/s4u-energy-exec.cpp
+++ b/examples/cpp/energy-exec/s4u-energy-exec.cpp
@@ -71,7 +71,7 @@ int main(int argc, char* argv[])
   xbt_assert(argc == 2, "Usage: %s platform_file\n\tExample: %s ../platforms/energy_platform.xml\n", argv[0], argv[0]);
 
   e.load_platform(argv[1]);
-  simgrid::s4u::Actor::create("dvfs_test", simgrid::s4u::Host::by_name("MyHost1"), dvfs);
+  simgrid::s4u::Actor::create("dvfs_test", e.host_by_name("MyHost1"), dvfs);
 
   e.run();
 

diff --git a/examples/cpp/energy-link/s4u-energy-link.cpp b/examples/cpp/energy-link/s4u-energy-link.cpp
index 40dce86..5838ba1 100644 (file)
--- a/examples/cpp/energy-link/s4u-energy-link.cpp
+++ b/examples/cpp/energy-link/s4u-energy-link.cpp
@@ -99,8 +99,8 @@ int main(int argc, char* argv[])
   } else { // No parameter at all? Then use the default value
     argSender.emplace_back("25000");
   }
-  simgrid::s4u::Actor::create("sender", simgrid::s4u::Host::by_name("MyHost1"), sender, argSender);
-  simgrid::s4u::Actor::create("receiver", simgrid::s4u::Host::by_name("MyHost2"), receiver, argReceiver);
+  simgrid::s4u::Actor::create("sender", e.host_by_name("MyHost1"), sender, argSender);
+  simgrid::s4u::Actor::create("receiver", e.host_by_name("MyHost2"), receiver, argReceiver);
 
   /* And now, launch the simulation */
   e.run();

diff --git a/examples/cpp/energy-vm/s4u-energy-vm.cpp b/examples/cpp/energy-vm/s4u-energy-vm.cpp
index 0bcc632..872274b 100644 (file)
--- a/examples/cpp/energy-vm/s4u-energy-vm.cpp
+++ b/examples/cpp/energy-vm/s4u-energy-vm.cpp
@@ -59,7 +59,7 @@ int main(int argc, char* argv[])
 
   e.load_platform(argv[1]);
 
-  simgrid::s4u::Actor::create("dvfs", simgrid::s4u::Host::by_name("MyHost1"), dvfs);
+  simgrid::s4u::Actor::create("dvfs", e.host_by_name("MyHost1"), dvfs);
 
   e.run();