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

diff --git a/examples/cpp/exec-async/s4u-exec-async.cpp b/examples/cpp/exec-async/s4u-exec-async.cpp
index bb94c7d..655388c 100644 (file)
--- a/examples/cpp/exec-async/s4u-exec-async.cpp
+++ b/examples/cpp/exec-async/s4u-exec-async.cpp
@@ -56,9 +56,9 @@ int main(int argc, char* argv[])
   simgrid::s4u::Engine e(&argc, argv);
   e.load_platform(argv[1]);
 
-  simgrid::s4u::Host* fafard  = simgrid::s4u::Host::by_name("Fafard");
-  simgrid::s4u::Host* ginette = simgrid::s4u::Host::by_name("Ginette");
-  simgrid::s4u::Host* boivin  = simgrid::s4u::Host::by_name("Boivin");
+  simgrid::s4u::Host* fafard  = e.host_by_name("Fafard");
+  simgrid::s4u::Host* ginette = e.host_by_name("Ginette");
+  simgrid::s4u::Host* boivin  = e.host_by_name("Boivin");
 
   simgrid::s4u::Actor::create("wait", fafard, waiter);
   simgrid::s4u::Actor::create("monitor", ginette, monitor);

diff --git a/examples/cpp/exec-basic/s4u-exec-basic.cpp b/examples/cpp/exec-basic/s4u-exec-basic.cpp
index ec4e159..aadaace 100644 (file)
--- a/examples/cpp/exec-basic/s4u-exec-basic.cpp
+++ b/examples/cpp/exec-basic/s4u-exec-basic.cpp
@@ -42,8 +42,8 @@ int main(int argc, char* argv[])
 
   e.load_platform(argv[1]);
 
-  simgrid::s4u::Actor::create("executor", simgrid::s4u::Host::by_name("Tremblay"), executor);
-  simgrid::s4u::Actor::create("privileged", simgrid::s4u::Host::by_name("Tremblay"), privileged);
+  simgrid::s4u::Actor::create("executor", e.host_by_name("Tremblay"), executor);
+  simgrid::s4u::Actor::create("privileged", e.host_by_name("Tremblay"), privileged);
 
   e.run();
 

diff --git a/examples/cpp/exec-dependent/s4u-exec-dependent.cpp b/examples/cpp/exec-dependent/s4u-exec-dependent.cpp
index 0fa1eb9..db155eb 100644 (file)
--- a/examples/cpp/exec-dependent/s4u-exec-dependent.cpp
+++ b/examples/cpp/exec-dependent/s4u-exec-dependent.cpp
@@ -52,7 +52,7 @@ int main(int argc, char* argv[])
   simgrid::s4u::Engine e(&argc, argv);
   e.load_platform(argv[1]);
 
-  simgrid::s4u::Actor::create("worker", simgrid::s4u::Host::by_name("Fafard"), worker);
+  simgrid::s4u::Actor::create("worker", e.host_by_name("Fafard"), worker);
 
   e.run();
 

diff --git a/examples/cpp/exec-dvfs/s4u-exec-dvfs.cpp b/examples/cpp/exec-dvfs/s4u-exec-dvfs.cpp
index 7df0140..25dc93f 100644 (file)
--- a/examples/cpp/exec-dvfs/s4u-exec-dvfs.cpp
+++ b/examples/cpp/exec-dvfs/s4u-exec-dvfs.cpp
@@ -54,8 +54,8 @@ int main(int argc, char* argv[])
 
   e.load_platform(argv[1]);
 
-  simgrid::s4u::Actor::create("dvfs_test", simgrid::s4u::Host::by_name("MyHost1"), dvfs);
-  simgrid::s4u::Actor::create("dvfs_test", simgrid::s4u::Host::by_name("MyHost2"), dvfs);
+  simgrid::s4u::Actor::create("dvfs_test", e.host_by_name("MyHost1"), dvfs);
+  simgrid::s4u::Actor::create("dvfs_test", e.host_by_name("MyHost2"), dvfs);
 
   e.run();
 

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 24b9e01..1aeceb7 100644 (file)
--- a/examples/cpp/exec-ptask-multicore/s4u-exec-ptask-multicore.cpp
+++ b/examples/cpp/exec-ptask-multicore/s4u-exec-ptask-multicore.cpp
@@ -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.");

diff --git a/examples/cpp/exec-ptask/s4u-exec-ptask.cpp b/examples/cpp/exec-ptask/s4u-exec-ptask.cpp
index a16c75f..e5c4e65 100644 (file)
--- a/examples/cpp/exec-ptask/s4u-exec-ptask.cpp
+++ b/examples/cpp/exec-ptask/s4u-exec-ptask.cpp
@@ -137,7 +137,7 @@ int main(int argc, char* argv[])
   xbt_assert(argc == 2, "Usage: %s <platform file>", argv[0]);
 
   e.load_platform(argv[1]);
-  simgrid::s4u::Actor::create("test", simgrid::s4u::Host::by_name("MyHost1"), runner);
+  simgrid::s4u::Actor::create("test", e.host_by_name("MyHost1"), runner);
 
   e.run();
   XBT_INFO("Simulation done.");

diff --git a/examples/cpp/exec-remote/s4u-exec-remote.cpp b/examples/cpp/exec-remote/s4u-exec-remote.cpp
index 6a7dde7..339b812 100644 (file)
--- a/examples/cpp/exec-remote/s4u-exec-remote.cpp
+++ b/examples/cpp/exec-remote/s4u-exec-remote.cpp
@@ -61,7 +61,7 @@ int main(int argc, char* argv[])
 {
   simgrid::s4u::Engine e(&argc, argv);
   e.load_platform(argv[1]);
-  simgrid::s4u::Actor::create("test", simgrid::s4u::Host::by_name("Fafard"), wizard);
+  simgrid::s4u::Actor::create("test", e.host_by_name("Fafard"), wizard);
 
   e.run();
 

diff --git a/examples/cpp/exec-unassigned/s4u-exec-unassigned.cpp b/examples/cpp/exec-unassigned/s4u-exec-unassigned.cpp
index 0998373..8662ce3 100644 (file)
--- a/examples/cpp/exec-unassigned/s4u-exec-unassigned.cpp
+++ b/examples/cpp/exec-unassigned/s4u-exec-unassigned.cpp
@@ -30,7 +30,7 @@ int main(int argc, char* argv[])
   simgrid::s4u::Engine e(&argc, argv);
   e.load_platform(argv[1]);
 
-  simgrid::s4u::Actor::create("worker", simgrid::s4u::Host::by_name("Fafard"), worker);
+  simgrid::s4u::Actor::create("worker", e.host_by_name("Fafard"), worker);
 
   e.run();
 

diff --git a/examples/cpp/exec-waitany/s4u-exec-waitany.cpp b/examples/cpp/exec-waitany/s4u-exec-waitany.cpp
index 1149c4c..89fc558 100644 (file)
--- a/examples/cpp/exec-waitany/s4u-exec-waitany.cpp
+++ b/examples/cpp/exec-waitany/s4u-exec-waitany.cpp
@@ -54,8 +54,8 @@ int main(int argc, char* argv[])
 {
   simgrid::s4u::Engine e(&argc, argv);
   e.load_platform(argv[1]);
-  simgrid::s4u::Actor::create("worker", simgrid::s4u::Host::by_name("Tremblay"), worker, false);
-  simgrid::s4u::Actor::create("worker_timeout", simgrid::s4u::Host::by_name("Tremblay"), worker, true);
+  simgrid::s4u::Actor::create("worker", e.host_by_name("Tremblay"), worker, false);
+  simgrid::s4u::Actor::create("worker_timeout", e.host_by_name("Tremblay"), worker, true);
   e.run();
 
   return 0;

diff --git a/examples/cpp/exec-waitfor/s4u-exec-waitfor.cpp b/examples/cpp/exec-waitfor/s4u-exec-waitfor.cpp
index 859b26a..1b7314f 100644 (file)
--- a/examples/cpp/exec-waitfor/s4u-exec-waitfor.cpp
+++ b/examples/cpp/exec-waitfor/s4u-exec-waitfor.cpp
@@ -59,7 +59,7 @@ int main(int argc, char* argv[])
 {
   simgrid::s4u::Engine e(&argc, argv);
   e.load_platform(argv[1]);
-  simgrid::s4u::Actor::create("worker", simgrid::s4u::Host::by_name("Tremblay"), worker);
+  simgrid::s4u::Actor::create("worker", e.host_by_name("Tremblay"), worker);
   e.run();
 
   return 0;

diff --git a/examples/cpp/io-async/s4u-io-async.cpp b/examples/cpp/io-async/s4u-io-async.cpp
index 67ee0b9..19f5adf 100644 (file)
--- a/examples/cpp/io-async/s4u-io-async.cpp
+++ b/examples/cpp/io-async/s4u-io-async.cpp
@@ -67,10 +67,10 @@ int main(int argc, char* argv[])
 {
   simgrid::s4u::Engine e(&argc, argv);
   e.load_platform(argv[1]);
-  simgrid::s4u::Actor::create("test", simgrid::s4u::Host::by_name("bob"), test, 2e7);
-  simgrid::s4u::Actor::create("test_waitfor", simgrid::s4u::Host::by_name("alice"), test_waitfor, 5e7);
-  simgrid::s4u::Actor::create("test_cancel", simgrid::s4u::Host::by_name("alice"), test_cancel, 5e7);
-  simgrid::s4u::Actor::create("test_monitor", simgrid::s4u::Host::by_name("alice"), test_monitor, 5e7);
+  simgrid::s4u::Actor::create("test", e.host_by_name("bob"), test, 2e7);
+  simgrid::s4u::Actor::create("test_waitfor", e.host_by_name("alice"), test_waitfor, 5e7);
+  simgrid::s4u::Actor::create("test_cancel", e.host_by_name("alice"), test_cancel, 5e7);
+  simgrid::s4u::Actor::create("test_monitor", e.host_by_name("alice"), test_monitor, 5e7);
 
   e.run();
 

diff --git a/examples/cpp/io-dependent/s4u-io-dependent.cpp b/examples/cpp/io-dependent/s4u-io-dependent.cpp
index 3b38e53..db4e0ea 100644 (file)
--- a/examples/cpp/io-dependent/s4u-io-dependent.cpp
+++ b/examples/cpp/io-dependent/s4u-io-dependent.cpp
@@ -58,7 +58,7 @@ int main(int argc, char* argv[])
   sg_storage_file_system_init();
   e.load_platform(argv[1]);
 
-  simgrid::s4u::Actor::create("bob", simgrid::s4u::Host::by_name("bob"), test);
+  simgrid::s4u::Actor::create("bob", e.host_by_name("bob"), test);
 
   e.run();
 

diff --git a/examples/cpp/io-disk-raw/s4u-io-disk-raw.cpp b/examples/cpp/io-disk-raw/s4u-io-disk-raw.cpp
index 8bd9564..485f367 100644 (file)
--- a/examples/cpp/io-disk-raw/s4u-io-disk-raw.cpp
+++ b/examples/cpp/io-disk-raw/s4u-io-disk-raw.cpp
@@ -64,8 +64,7 @@ int main(int argc, char** argv)
       XBT_INFO("  %s -> %s", kv.first.c_str(), kv.second.c_str());
   }
 
-
-  simgrid::s4u::Actor::create("", simgrid::s4u::Host::by_name("bob"), host);
+  simgrid::s4u::Actor::create("", e.host_by_name("bob"), host);
 
   e.run();
   XBT_INFO("Simulated time: %g", simgrid::s4u::Engine::get_clock());

diff --git a/examples/cpp/io-file-system/s4u-io-file-system.cpp b/examples/cpp/io-file-system/s4u-io-file-system.cpp
index 0fcb3c3..4157828 100644 (file)
--- a/examples/cpp/io-file-system/s4u-io-file-system.cpp
+++ b/examples/cpp/io-file-system/s4u-io-file-system.cpp
@@ -81,7 +81,7 @@ int main(int argc, char** argv)
   simgrid::s4u::Engine e(&argc, argv);
   sg_storage_file_system_init();
   e.load_platform(argv[1]);
-  simgrid::s4u::Actor::create("host", simgrid::s4u::Host::by_name("bob"), MyHost());
+  simgrid::s4u::Actor::create("host", e.host_by_name("bob"), MyHost());
   e.run();
 
   return 0;

diff --git a/examples/cpp/maestro-set/s4u-maestro-set.cpp b/examples/cpp/maestro-set/s4u-maestro-set.cpp
index a0c1080..4394842 100644 (file)
--- a/examples/cpp/maestro-set/s4u-maestro-set.cpp
+++ b/examples/cpp/maestro-set/s4u-maestro-set.cpp
@@ -75,7 +75,7 @@ int main(int argc, char* argv[])
   e.load_platform(argv[1]);
 
   /* Become one of the simulated actors (must be done after the platform creation, or the host won't exist). */
-  sg_actor_attach("sender", nullptr, simgrid::s4u::Host::by_name("Tremblay"), nullptr);
+  sg_actor_attach("sender", nullptr, e.host_by_name("Tremblay"), nullptr);
 
   ensure_root_tid(); // Only useful in this test: we ensure that simgrid is not broken and that this code is executed in
                      // the correct system thread

diff --git a/examples/cpp/mc-bugged1-liveness/s4u-mc-bugged1-liveness.cpp b/examples/cpp/mc-bugged1-liveness/s4u-mc-bugged1-liveness.cpp
index d445cbb..aee134a 100644 (file)
--- a/examples/cpp/mc-bugged1-liveness/s4u-mc-bugged1-liveness.cpp
+++ b/examples/cpp/mc-bugged1-liveness/s4u-mc-bugged1-liveness.cpp
@@ -143,14 +143,14 @@ int main(int argc, char* argv[])
 
   e.load_platform(argv[1]);
 
-  simgrid::s4u::Actor::create("coordinator", simgrid::s4u::Host::by_name("Tremblay"), coordinator)
+  simgrid::s4u::Actor::create("coordinator", e.host_by_name("Tremblay"), coordinator)
       ->set_kill_time(argc > 3 ? std::stod(argv[3]) : -1.0);
   if (std::stod(argv[2]) == 0) {
-    simgrid::s4u::Actor::create("client", simgrid::s4u::Host::by_name("Boivin"), raw_client, 1);
-    simgrid::s4u::Actor::create("client", simgrid::s4u::Host::by_name("Fafard"), raw_client, 2);
+    simgrid::s4u::Actor::create("client", e.host_by_name("Boivin"), raw_client, 1);
+    simgrid::s4u::Actor::create("client", e.host_by_name("Fafard"), raw_client, 2);
   } else { // "Visited" case
-    simgrid::s4u::Actor::create("client", simgrid::s4u::Host::by_name("Boivin"), raw_client, 2);
-    simgrid::s4u::Actor::create("client", simgrid::s4u::Host::by_name("Fafard"), raw_client, 1);
+    simgrid::s4u::Actor::create("client", e.host_by_name("Boivin"), raw_client, 2);
+    simgrid::s4u::Actor::create("client", e.host_by_name("Fafard"), raw_client, 1);
   }
   e.run();
 

diff --git a/examples/cpp/mc-bugged1/s4u-mc-bugged1.cpp b/examples/cpp/mc-bugged1/s4u-mc-bugged1.cpp
index 533da73..a22d90b 100644 (file)
--- a/examples/cpp/mc-bugged1/s4u-mc-bugged1.cpp
+++ b/examples/cpp/mc-bugged1/s4u-mc-bugged1.cpp
@@ -44,10 +44,10 @@ int main(int argc, char* argv[])
 
   e.load_platform(argv[1]);
 
-  simgrid::s4u::Actor::create("server", simgrid::s4u::Host::by_name("HostA"), server);
-  simgrid::s4u::Actor::create("client", simgrid::s4u::Host::by_name("HostB"), client, 1);
-  simgrid::s4u::Actor::create("client", simgrid::s4u::Host::by_name("HostC"), client, 2);
-  simgrid::s4u::Actor::create("client", simgrid::s4u::Host::by_name("HostD"), client, 3);
+  simgrid::s4u::Actor::create("server", e.host_by_name("HostA"), server);
+  simgrid::s4u::Actor::create("client", e.host_by_name("HostB"), client, 1);
+  simgrid::s4u::Actor::create("client", e.host_by_name("HostC"), client, 2);
+  simgrid::s4u::Actor::create("client", e.host_by_name("HostD"), client, 3);
 
   e.run();
   return 0;

diff --git a/examples/cpp/mc-bugged2/s4u-mc-bugged2.cpp b/examples/cpp/mc-bugged2/s4u-mc-bugged2.cpp
index 33cb1b3..ea27c72 100644 (file)
--- a/examples/cpp/mc-bugged2/s4u-mc-bugged2.cpp
+++ b/examples/cpp/mc-bugged2/s4u-mc-bugged2.cpp
@@ -59,9 +59,9 @@ int main(int argc, char* argv[])
 
   e.load_platform(argv[1]);
 
-  simgrid::s4u::Actor::create("server", simgrid::s4u::Host::by_name("HostA"), server);
-  simgrid::s4u::Actor::create("client", simgrid::s4u::Host::by_name("HostB"), client, 1);
-  simgrid::s4u::Actor::create("client", simgrid::s4u::Host::by_name("HostC"), client, 2);
+  simgrid::s4u::Actor::create("server", e.host_by_name("HostA"), server);
+  simgrid::s4u::Actor::create("client", e.host_by_name("HostB"), client, 1);
+  simgrid::s4u::Actor::create("client", e.host_by_name("HostC"), client, 2);
 
   e.run();
   return 0;

diff --git a/examples/cpp/mc-electric-fence/s4u-mc-electric-fence.cpp b/examples/cpp/mc-electric-fence/s4u-mc-electric-fence.cpp
index fd2179b..715da95 100644 (file)
--- a/examples/cpp/mc-electric-fence/s4u-mc-electric-fence.cpp
+++ b/examples/cpp/mc-electric-fence/s4u-mc-electric-fence.cpp
@@ -45,9 +45,9 @@ int main(int argc, char* argv[])
 
   e.load_platform(argv[1]);
 
-  sg4::Actor::create("server", sg4::Host::by_name("HostA"), server);
-  sg4::Actor::create("client", sg4::Host::by_name("HostB"), client, 1);
-  sg4::Actor::create("client", sg4::Host::by_name("HostC"), client, 2);
+  sg4::Actor::create("server", e.host_by_name("HostA"), server);
+  sg4::Actor::create("client", e.host_by_name("HostB"), client, 1);
+  sg4::Actor::create("client", e.host_by_name("HostC"), client, 2);
 
   e.run();
   return 0;

diff --git a/examples/cpp/network-ns3-wifi/s4u-network-ns3-wifi.cpp b/examples/cpp/network-ns3-wifi/s4u-network-ns3-wifi.cpp
index 648d86a..0fdc464 100644 (file)
--- a/examples/cpp/network-ns3-wifi/s4u-network-ns3-wifi.cpp
+++ b/examples/cpp/network-ns3-wifi/s4u-network-ns3-wifi.cpp
@@ -44,25 +44,25 @@ int main(int argc, char* argv[])
   e.load_platform(argv[1]);
   double msg_size = 1E5;
 
-  /* Communication between STA in the same wifi zone */    
-  simgrid::s4u::Actor::create("sender", simgrid::s4u::Host::by_name("STA0-0"), sender, "1", msg_size, 10);
-  simgrid::s4u::Actor::create("receiver", simgrid::s4u::Host::by_name("STA0-1"), receiver, "1");
-  simgrid::s4u::Actor::create("sender", simgrid::s4u::Host::by_name("STA0-1"), sender, "2", msg_size, 20);
-  simgrid::s4u::Actor::create("receiver", simgrid::s4u::Host::by_name("STA0-0"), receiver, "2");
-  simgrid::s4u::Actor::create("sender", simgrid::s4u::Host::by_name("STA1-1"), sender, "3", msg_size, 30);
-  simgrid::s4u::Actor::create("receiver", simgrid::s4u::Host::by_name("STA1-2"), receiver, "3");
-  simgrid::s4u::Actor::create("sender", simgrid::s4u::Host::by_name("STA1-2"), sender, "4", msg_size, 40);
-  simgrid::s4u::Actor::create("receiver", simgrid::s4u::Host::by_name("STA1-1"), receiver, "4");
+  /* Communication between STA in the same wifi zone */
+  simgrid::s4u::Actor::create("sender", e.host_by_name("STA0-0"), sender, "1", msg_size, 10);
+  simgrid::s4u::Actor::create("receiver", e.host_by_name("STA0-1"), receiver, "1");
+  simgrid::s4u::Actor::create("sender", e.host_by_name("STA0-1"), sender, "2", msg_size, 20);
+  simgrid::s4u::Actor::create("receiver", e.host_by_name("STA0-0"), receiver, "2");
+  simgrid::s4u::Actor::create("sender", e.host_by_name("STA1-1"), sender, "3", msg_size, 30);
+  simgrid::s4u::Actor::create("receiver", e.host_by_name("STA1-2"), receiver, "3");
+  simgrid::s4u::Actor::create("sender", e.host_by_name("STA1-2"), sender, "4", msg_size, 40);
+  simgrid::s4u::Actor::create("receiver", e.host_by_name("STA1-1"), receiver, "4");
 
   /* Communication between STA of different wifi zones */
-  simgrid::s4u::Actor::create("sender", simgrid::s4u::Host::by_name("STA0-0"), sender, "5", msg_size, 50);
-  simgrid::s4u::Actor::create("receiver", simgrid::s4u::Host::by_name("STA1-0"), receiver, "5");
-  simgrid::s4u::Actor::create("sender", simgrid::s4u::Host::by_name("STA1-0"), sender, "6", msg_size, 60);
-  simgrid::s4u::Actor::create("receiver", simgrid::s4u::Host::by_name("STA0-0"), receiver, "6");
-  simgrid::s4u::Actor::create("sender", simgrid::s4u::Host::by_name("STA0-1"), sender, "7", msg_size, 70);
-  simgrid::s4u::Actor::create("receiver", simgrid::s4u::Host::by_name("STA1-2"), receiver, "7");
-  simgrid::s4u::Actor::create("sender", simgrid::s4u::Host::by_name("STA1-2"), sender, "8", msg_size, 80);
-  simgrid::s4u::Actor::create("receiver", simgrid::s4u::Host::by_name("STA0-1"), receiver, "8");
+  simgrid::s4u::Actor::create("sender", e.host_by_name("STA0-0"), sender, "5", msg_size, 50);
+  simgrid::s4u::Actor::create("receiver", e.host_by_name("STA1-0"), receiver, "5");
+  simgrid::s4u::Actor::create("sender", e.host_by_name("STA1-0"), sender, "6", msg_size, 60);
+  simgrid::s4u::Actor::create("receiver", e.host_by_name("STA0-0"), receiver, "6");
+  simgrid::s4u::Actor::create("sender", e.host_by_name("STA0-1"), sender, "7", msg_size, 70);
+  simgrid::s4u::Actor::create("receiver", e.host_by_name("STA1-2"), receiver, "7");
+  simgrid::s4u::Actor::create("sender", e.host_by_name("STA1-2"), sender, "8", msg_size, 80);
+  simgrid::s4u::Actor::create("receiver", e.host_by_name("STA0-1"), receiver, "8");
 
   e.run();
   return 0;

diff --git a/examples/cpp/network-wifi/s4u-network-wifi.cpp b/examples/cpp/network-wifi/s4u-network-wifi.cpp
index 8d30241..703fe23 100644 (file)
--- a/examples/cpp/network-wifi/s4u-network-wifi.cpp
+++ b/examples/cpp/network-wifi/s4u-network-wifi.cpp
@@ -35,8 +35,8 @@ int main(int argc, char* argv[])
 
   /* Exchange a message between the 2 stations */
   auto mailbox  = simgrid::s4u::Mailbox::by_name("mailbox");
-  auto station1 = simgrid::s4u::Host::by_name("Station 1");
-  auto station2 = simgrid::s4u::Host::by_name("Station 2");
+  auto station1 = e.host_by_name("Station 1");
+  auto station2 = e.host_by_name("Station 2");
   simgrid::s4u::Actor::create("sender", station1, sender, mailbox, 1e7);
   simgrid::s4u::Actor::create("receiver", station2, receiver, mailbox);
 

diff --git a/examples/cpp/platform-profile/s4u-platform-profile.cpp b/examples/cpp/platform-profile/s4u-platform-profile.cpp
index 869edfb..c5ba685 100644 (file)
--- a/examples/cpp/platform-profile/s4u-platform-profile.cpp
+++ b/examples/cpp/platform-profile/s4u-platform-profile.cpp
@@ -37,7 +37,7 @@ int main(int argc, char* argv[])
 
   e.load_platform(argv[1]);
 
-  simgrid::s4u::Actor::create("watcher", simgrid::s4u::Host::by_name("Tremblay"), watcher);
+  simgrid::s4u::Actor::create("watcher", e.host_by_name("Tremblay"), watcher);
 
   e.run(); /* - Run the simulation */
 

diff --git a/examples/cpp/plugin-host-load/s4u-plugin-host-load.cpp b/examples/cpp/plugin-host-load/s4u-plugin-host-load.cpp
index 4aef718..0281b67 100644 (file)
--- a/examples/cpp/plugin-host-load/s4u-plugin-host-load.cpp
+++ b/examples/cpp/plugin-host-load/s4u-plugin-host-load.cpp
@@ -93,8 +93,8 @@ 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("load_test", simgrid::s4u::Host::by_name("MyHost1"), execute_load_test);
-  simgrid::s4u::Actor::create("change_speed", simgrid::s4u::Host::by_name("MyHost1"), change_speed);
+  simgrid::s4u::Actor::create("load_test", e.host_by_name("MyHost1"), execute_load_test);
+  simgrid::s4u::Actor::create("change_speed", e.host_by_name("MyHost1"), change_speed);
 
   e.run();
 

diff --git a/examples/cpp/plugin-link-load/s4u-plugin-link-load.cpp b/examples/cpp/plugin-link-load/s4u-plugin-link-load.cpp
index 4cfb90c..c402de2 100644 (file)
--- a/examples/cpp/plugin-link-load/s4u-plugin-link-load.cpp
+++ b/examples/cpp/plugin-link-load/s4u-plugin-link-load.cpp
@@ -94,8 +94,8 @@ 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("load_test", simgrid::s4u::Host::by_name("node-42.simgrid.org"), execute_load_test);
-  simgrid::s4u::Actor::create("monitor", simgrid::s4u::Host::by_name("node-51.simgrid.org"), monitor);
+  simgrid::s4u::Actor::create("load_test", e.host_by_name("node-42.simgrid.org"), execute_load_test);
+  simgrid::s4u::Actor::create("monitor", e.host_by_name("node-51.simgrid.org"), monitor);
 
   e.run();
 

diff --git a/examples/cpp/plugin-prodcons/s4u-plugin-prodcons.cpp b/examples/cpp/plugin-prodcons/s4u-plugin-prodcons.cpp
index fc20568..3263df6 100644 (file)
--- a/examples/cpp/plugin-prodcons/s4u-plugin-prodcons.cpp
+++ b/examples/cpp/plugin-prodcons/s4u-plugin-prodcons.cpp
@@ -79,10 +79,10 @@ int main(int argc, char* argv[])
 
   for (int i = 0; i < 3; i++) {
     std::string hostname = std::string("node-") + std::to_string(i) + ".simgrid.org";
-    sg4::Actor::create("ingester-" + std::to_string(i), sg4::Host::by_name(hostname), &ingester, i, pc);
+    sg4::Actor::create("ingester-" + std::to_string(i), e.host_by_name(hostname), &ingester, i, pc);
 
     hostname = std::string("node-") + std::to_string(i + 3) + ".simgrid.org";
-    sg4::Actor::create("retriever-" + std::to_string(i), sg4::Host::by_name(hostname), &retriever, pc);
+    sg4::Actor::create("retriever-" + std::to_string(i), e.host_by_name(hostname), &retriever, pc);
   }
 
   e.run();

diff --git a/examples/cpp/synchro-barrier/s4u-synchro-barrier.cpp b/examples/cpp/synchro-barrier/s4u-synchro-barrier.cpp
index 28aba1f..6e1d3f0 100644 (file)
--- a/examples/cpp/synchro-barrier/s4u-synchro-barrier.cpp
+++ b/examples/cpp/synchro-barrier/s4u-synchro-barrier.cpp
@@ -42,7 +42,7 @@ int main(int argc, char **argv)
   xbt_assert(actor_count > 0, "<actor-count> must be greater than 0");
 
   e.load_platform("../../platforms/two_hosts.xml");
-  simgrid::s4u::Actor::create("master", simgrid::s4u::Host::by_name("Tremblay"), master, actor_count);
+  simgrid::s4u::Actor::create("master", e.host_by_name("Tremblay"), master, actor_count);
   e.run();
 
   return 0;

diff --git a/examples/cpp/synchro-condition-variable-waituntil/s4u-synchro-condition-variable-waituntil.cpp b/examples/cpp/synchro-condition-variable-waituntil/s4u-synchro-condition-variable-waituntil.cpp
index d468267..272ee95 100644 (file)
--- a/examples/cpp/synchro-condition-variable-waituntil/s4u-synchro-condition-variable-waituntil.cpp
+++ b/examples/cpp/synchro-condition-variable-waituntil/s4u-synchro-condition-variable-waituntil.cpp
@@ -54,8 +54,7 @@ int main(int argc, char* argv[])
   simgrid::s4u::Engine e(&argc, argv);
   e.load_platform("../../platforms/small_platform.xml");
 
-  auto host = simgrid::s4u::Host::by_name("Tremblay");
-  simgrid::s4u::Actor::create("main", host, main_actor);
+  simgrid::s4u::Actor::create("main", e.host_by_name("Tremblay"), main_actor);
 
   e.run();
   return 0;

diff --git a/examples/cpp/synchro-condition-variable/s4u-synchro-condition-variable.cpp b/examples/cpp/synchro-condition-variable/s4u-synchro-condition-variable.cpp
index a63fa62..aab65ea 100644 (file)
--- a/examples/cpp/synchro-condition-variable/s4u-synchro-condition-variable.cpp
+++ b/examples/cpp/synchro-condition-variable/s4u-synchro-condition-variable.cpp
@@ -43,7 +43,7 @@ int main(int argc, char** argv)
 {
   simgrid::s4u::Engine e(&argc, argv);
   e.load_platform("../../platforms/two_hosts.xml");
-  simgrid::s4u::Actor::create("main", simgrid::s4u::Host::by_name("Tremblay"), master_fun);
+  simgrid::s4u::Actor::create("main", e.host_by_name("Tremblay"), master_fun);
   e.run();
 
   return 0;

diff --git a/examples/cpp/synchro-mutex/s4u-synchro-mutex.cpp b/examples/cpp/synchro-mutex/s4u-synchro-mutex.cpp
index 01aa751..86c3ac2 100644 (file)
--- a/examples/cpp/synchro-mutex/s4u-synchro-mutex.cpp
+++ b/examples/cpp/synchro-mutex/s4u-synchro-mutex.cpp
@@ -63,7 +63,7 @@ int main(int argc, char **argv)
 {
   simgrid::s4u::Engine e(&argc, argv);
   e.load_platform("../../platforms/two_hosts.xml");
-  simgrid::s4u::Actor::create("main", simgrid::s4u::Host::by_name("Tremblay"), master);
+  simgrid::s4u::Actor::create("main", e.host_by_name("Tremblay"), master);
   e.run();
 
   return 0;

diff --git a/examples/cpp/synchro-semaphore/s4u-synchro-semaphore.cpp b/examples/cpp/synchro-semaphore/s4u-synchro-semaphore.cpp
index 7acc1ac..b4abe7f 100644 (file)
--- a/examples/cpp/synchro-semaphore/s4u-synchro-semaphore.cpp
+++ b/examples/cpp/synchro-semaphore/s4u-synchro-semaphore.cpp
@@ -45,8 +45,8 @@ int main(int argc, char **argv)
   std::vector<std::string> args({"one", "two", "three", ""});
   simgrid::s4u::Engine e(&argc, argv);
   e.load_platform("../../platforms/two_hosts.xml");
-  simgrid::s4u::Actor::create("producer", simgrid::s4u::Host::by_name("Tremblay"), producer, std::cref(args));
-  simgrid::s4u::Actor::create("consumer", simgrid::s4u::Host::by_name("Jupiter"), consumer);
+  simgrid::s4u::Actor::create("producer", e.host_by_name("Tremblay"), producer, std::cref(args));
+  simgrid::s4u::Actor::create("consumer", e.host_by_name("Jupiter"), consumer);
   e.run();
 
   return 0;

diff --git a/examples/cpp/trace-categories/s4u-trace-categories.cpp b/examples/cpp/trace-categories/s4u-trace-categories.cpp
index 62de2b4..798ef4a 100644 (file)
--- a/examples/cpp/trace-categories/s4u-trace-categories.cpp
+++ b/examples/cpp/trace-categories/s4u-trace-categories.cpp
@@ -64,8 +64,8 @@ int main(int argc, char* argv[])
   TRACE_category_with_color("data", "0 0 1");     // blue
   TRACE_category_with_color("finalize", "0 0 0"); // black
 
-  simgrid::s4u::Actor::create("master", simgrid::s4u::Host::by_name("Tremblay"), master);
-  simgrid::s4u::Actor::create("worker", simgrid::s4u::Host::by_name("Fafard"), worker);
+  simgrid::s4u::Actor::create("master", e.host_by_name("Tremblay"), master);
+  simgrid::s4u::Actor::create("worker", e.host_by_name("Fafard"), worker);
 
   e.run();
   return 0;

diff --git a/examples/cpp/trace-host-user-variables/s4u-trace-host-user-variables.cpp b/examples/cpp/trace-host-user-variables/s4u-trace-host-user-variables.cpp
index b0546e0..e152cc1 100644 (file)
--- a/examples/cpp/trace-host-user-variables/s4u-trace-host-user-variables.cpp
+++ b/examples/cpp/trace-host-user-variables/s4u-trace-host-user-variables.cpp
@@ -49,7 +49,7 @@ int main(int argc, char* argv[])
   TRACE_host_variable_declare("HDD_capacity");
   TRACE_host_variable_declare("HDD_utilization");
 
-  simgrid::s4u::Actor::create("master", simgrid::s4u::Host::by_name("Tremblay"), trace_fun);
+  simgrid::s4u::Actor::create("master", e.host_by_name("Tremblay"), trace_fun);
 
   e.run();
 

diff --git a/examples/cpp/trace-link-user-variables/s4u-trace-link-user-variables.cpp b/examples/cpp/trace-link-user-variables/s4u-trace-link-user-variables.cpp
index 1e833a9..f7adbed 100644 (file)
--- a/examples/cpp/trace-link-user-variables/s4u-trace-link-user-variables.cpp
+++ b/examples/cpp/trace-link-user-variables/s4u-trace-link-user-variables.cpp
@@ -53,12 +53,12 @@ int main(int argc, char* argv[])
   TRACE_link_variable_declare("Link_Capacity");
   TRACE_link_variable_declare_with_color("Link_Utilization", "0.9 0.1 0.1");
 
-  simgrid::s4u::Actor::create("master", simgrid::s4u::Host::by_name("Tremblay"), trace_fun);
-  simgrid::s4u::Actor::create("worker", simgrid::s4u::Host::by_name("Tremblay"), trace_fun);
-  simgrid::s4u::Actor::create("worker", simgrid::s4u::Host::by_name("Jupiter"), trace_fun);
-  simgrid::s4u::Actor::create("worker", simgrid::s4u::Host::by_name("Fafard"), trace_fun);
-  simgrid::s4u::Actor::create("worker", simgrid::s4u::Host::by_name("Ginette"), trace_fun);
-  simgrid::s4u::Actor::create("worker", simgrid::s4u::Host::by_name("Bourassa"), trace_fun);
+  simgrid::s4u::Actor::create("master", e.host_by_name("Tremblay"), trace_fun);
+  simgrid::s4u::Actor::create("worker", e.host_by_name("Tremblay"), trace_fun);
+  simgrid::s4u::Actor::create("worker", e.host_by_name("Jupiter"), trace_fun);
+  simgrid::s4u::Actor::create("worker", e.host_by_name("Fafard"), trace_fun);
+  simgrid::s4u::Actor::create("worker", e.host_by_name("Ginette"), trace_fun);
+  simgrid::s4u::Actor::create("worker", e.host_by_name("Bourassa"), trace_fun);
 
   e.run();
   return 0;

diff --git a/examples/cpp/trace-process-migration/s4u-trace-process-migration.cpp b/examples/cpp/trace-process-migration/s4u-trace-process-migration.cpp
index 5b08957..fd3f8d8 100644 (file)
--- a/examples/cpp/trace-process-migration/s4u-trace-process-migration.cpp
+++ b/examples/cpp/trace-process-migration/s4u-trace-process-migration.cpp
@@ -51,8 +51,8 @@ int main(int argc, char* argv[])
 
   TRACE_category("migration_order");
 
-  sg4::Actor::create("emigrant", sg4::Host::by_name("Fafard"), emigrant);
-  sg4::Actor::create("policeman", sg4::Host::by_name("Tremblay"), policeman);
+  sg4::Actor::create("emigrant", e.host_by_name("Fafard"), emigrant);
+  sg4::Actor::create("policeman", e.host_by_name("Tremblay"), policeman);
 
   e.run();
   return 0;

diff --git a/examples/cpp/trace-route-user-variables/s4u-trace-route-user-variables.cpp b/examples/cpp/trace-route-user-variables/s4u-trace-route-user-variables.cpp
index e218c24..7b92044 100644 (file)
--- a/examples/cpp/trace-route-user-variables/s4u-trace-route-user-variables.cpp
+++ b/examples/cpp/trace-route-user-variables/s4u-trace-route-user-variables.cpp
@@ -56,12 +56,12 @@ int main(int argc, char* argv[])
   TRACE_link_variable_declare("Link_Capacity");
   TRACE_link_variable_declare_with_color("Link_Utilization", "0.9 0.1 0.1");
 
-  simgrid::s4u::Actor::create("master", simgrid::s4u::Host::by_name("Tremblay"), trace_fun);
-  simgrid::s4u::Actor::create("worker", simgrid::s4u::Host::by_name("Tremblay"), trace_fun);
-  simgrid::s4u::Actor::create("worker", simgrid::s4u::Host::by_name("Jupiter"), trace_fun);
-  simgrid::s4u::Actor::create("worker", simgrid::s4u::Host::by_name("Fafard"), trace_fun);
-  simgrid::s4u::Actor::create("worker", simgrid::s4u::Host::by_name("Ginette"), trace_fun);
-  simgrid::s4u::Actor::create("worker", simgrid::s4u::Host::by_name("Bourassa"), trace_fun);
+  simgrid::s4u::Actor::create("master", e.host_by_name("Tremblay"), trace_fun);
+  simgrid::s4u::Actor::create("worker", e.host_by_name("Tremblay"), trace_fun);
+  simgrid::s4u::Actor::create("worker", e.host_by_name("Jupiter"), trace_fun);
+  simgrid::s4u::Actor::create("worker", e.host_by_name("Fafard"), trace_fun);
+  simgrid::s4u::Actor::create("worker", e.host_by_name("Ginette"), trace_fun);
+  simgrid::s4u::Actor::create("worker", e.host_by_name("Bourassa"), trace_fun);
 
   e.run();
   return 0;