X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ea74f5d95928a521a588737e81f1de94eef25d19..4c753f8d4cabd4104f3f7109823f16be2ebdcce3:/examples/cpp/cloud-simple/s4u-cloud-simple.cpp

diff --git a/examples/cpp/cloud-simple/s4u-cloud-simple.cpp b/examples/cpp/cloud-simple/s4u-cloud-simple.cpp
index e6c923cfcc..90373f11ee 100644
--- a/examples/cpp/cloud-simple/s4u-cloud-simple.cpp
+++ b/examples/cpp/cloud-simple/s4u-cloud-simple.cpp
@@ -8,20 +8,21 @@
 #include "simgrid/s4u/VirtualMachine.hpp"
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_test, "Messages specific for this s4u example");
+namespace sg4 = simgrid::s4u;
 
 static void computation_fun()
 {
-  double clock_sta = simgrid::s4u::Engine::get_clock();
-  simgrid::s4u::this_actor::execute(1000000);
-  double clock_end = simgrid::s4u::Engine::get_clock();
+  double clock_sta = sg4::Engine::get_clock();
+  sg4::this_actor::execute(1000000);
+  double clock_end = sg4::Engine::get_clock();
 
-  XBT_INFO("%s:%s executed %g", simgrid::s4u::this_actor::get_host()->get_cname(),
-           simgrid::s4u::this_actor::get_cname(), clock_end - clock_sta);
+  XBT_INFO("%s:%s executed %g", sg4::this_actor::get_host()->get_cname(), sg4::this_actor::get_cname(),
+           clock_end - clock_sta);
 }
 
 static void launch_computation_worker(s4u_Host* host)
 {
-  simgrid::s4u::Actor::create("compute", host, computation_fun);
+  sg4::Actor::create("compute", host, computation_fun);
 }
 
 struct s_payload {
@@ -32,23 +33,23 @@ struct s_payload {
 
 static void communication_tx_fun(std::vector<std::string> args)
 {
-  simgrid::s4u::Mailbox* mbox   = simgrid::s4u::Mailbox::by_name(args.at(0));
+  sg4::Mailbox* mbox            = sg4::Mailbox::by_name(args.at(0));
   auto* payload                 = new s_payload;
-  payload->tx_actor_name        = simgrid::s4u::Actor::self()->get_cname();
-  payload->tx_host              = simgrid::s4u::this_actor::get_host();
-  payload->clock_sta            = simgrid::s4u::Engine::get_clock();
+  payload->tx_actor_name        = sg4::Actor::self()->get_cname();
+  payload->tx_host              = sg4::this_actor::get_host();
+  payload->clock_sta            = sg4::Engine::get_clock();
 
   mbox->put(payload, 1000000);
 }
 
 static void communication_rx_fun(std::vector<std::string> args)
 {
-  const char* actor_name        = simgrid::s4u::Actor::self()->get_cname();
-  const char* host_name         = simgrid::s4u::this_actor::get_host()->get_cname();
-  simgrid::s4u::Mailbox* mbox   = simgrid::s4u::Mailbox::by_name(args.at(0));
+  const char* actor_name = sg4::Actor::self()->get_cname();
+  const char* host_name  = sg4::this_actor::get_host()->get_cname();
+  sg4::Mailbox* mbox     = sg4::Mailbox::by_name(args.at(0));
 
   auto payload     = mbox->get_unique<struct s_payload>();
-  double clock_end = simgrid::s4u::Engine::get_clock();
+  double clock_end = sg4::Engine::get_clock();
 
   XBT_INFO("%s:%s to %s:%s => %g sec", payload->tx_host->get_cname(), payload->tx_actor_name, host_name, actor_name,
            clock_end - payload->clock_sta);
@@ -56,36 +57,36 @@ static void communication_rx_fun(std::vector<std::string> args)
 
 static void launch_communication_worker(s4u_Host* tx_host, s4u_Host* rx_host)
 {
-  std::string mbox_name = std::string("MBOX:") + tx_host->get_cname() + "-" + rx_host->get_cname();
+  std::string mbox_name = "MBOX:" + tx_host->get_name() + "-" + rx_host->get_name();
   std::vector<std::string> args;
   args.push_back(mbox_name);
 
-  simgrid::s4u::Actor::create("comm_tx", tx_host, communication_tx_fun, args);
+  sg4::Actor::create("comm_tx", tx_host, communication_tx_fun, args);
 
-  simgrid::s4u::Actor::create("comm_rx", rx_host, communication_rx_fun, args);
+  sg4::Actor::create("comm_rx", rx_host, communication_rx_fun, args);
 }
 
 static void master_main()
 {
-  s4u_Host* pm0 = simgrid::s4u::Host::by_name("Fafard");
-  s4u_Host* pm1 = simgrid::s4u::Host::by_name("Tremblay");
-  s4u_Host* pm2 = simgrid::s4u::Host::by_name("Bourassa");
+  s4u_Host* pm0 = sg4::Host::by_name("Fafard");
+  s4u_Host* pm1 = sg4::Host::by_name("Tremblay");
+  s4u_Host* pm2 = sg4::Host::by_name("Bourassa");
 
   XBT_INFO("## Test 1 (started): check computation on normal PMs");
 
   XBT_INFO("### Put an activity on a PM");
   launch_computation_worker(pm0);
-  simgrid::s4u::this_actor::sleep_for(2);
+  sg4::this_actor::sleep_for(2);
 
   XBT_INFO("### Put two activities on a PM");
   launch_computation_worker(pm0);
   launch_computation_worker(pm0);
-  simgrid::s4u::this_actor::sleep_for(2);
+  sg4::this_actor::sleep_for(2);
 
   XBT_INFO("### Put an activity on each PM");
   launch_computation_worker(pm0);
   launch_computation_worker(pm1);
-  simgrid::s4u::this_actor::sleep_for(2);
+  sg4::this_actor::sleep_for(2);
 
   XBT_INFO("## Test 1 (ended)");
 
@@ -96,7 +97,7 @@ static void master_main()
   auto* vm0 = pm0->create_vm("VM0", 1);
   vm0->start();
   launch_computation_worker(vm0);
-  simgrid::s4u::this_actor::sleep_for(2);
+  sg4::this_actor::sleep_for(2);
   vm0->destroy();
 
   XBT_INFO("## Test 2 (ended)");
@@ -108,7 +109,7 @@ static void master_main()
   vm0 = pm0->create_vm("VM0", 1);
   vm0->start();
   launch_computation_worker(pm0);
-  simgrid::s4u::this_actor::sleep_for(2);
+  sg4::this_actor::sleep_for(2);
   vm0->destroy();
   XBT_INFO("## Test 3 (ended)");
 
@@ -122,7 +123,7 @@ static void master_main()
   auto* vm1 = pm0->create_vm("VM1", 1);
   launch_computation_worker(vm0);
   launch_computation_worker(vm1);
-  simgrid::s4u::this_actor::sleep_for(2);
+  sg4::this_actor::sleep_for(2);
   vm0->destroy();
   vm1->destroy();
 
@@ -133,7 +134,7 @@ static void master_main()
   vm1->start();
   launch_computation_worker(vm0);
   launch_computation_worker(vm1);
-  simgrid::s4u::this_actor::sleep_for(2);
+  sg4::this_actor::sleep_for(2);
   vm0->destroy();
   vm1->destroy();
   XBT_INFO("## Test 4 (ended)");
@@ -141,24 +142,24 @@ static void master_main()
   XBT_INFO("## Test 5  (started): Analyse network impact");
   XBT_INFO("### Make a connection between PM0 and PM1");
   launch_communication_worker(pm0, pm1);
-  simgrid::s4u::this_actor::sleep_for(5);
+  sg4::this_actor::sleep_for(5);
 
   XBT_INFO("### Make two connection between PM0 and PM1");
   launch_communication_worker(pm0, pm1);
   launch_communication_worker(pm0, pm1);
-  simgrid::s4u::this_actor::sleep_for(5);
+  sg4::this_actor::sleep_for(5);
 
   XBT_INFO("### Make a connection between PM0 and VM0@PM0");
   vm0 = pm0->create_vm("VM0", 1);
   vm0->start();
   launch_communication_worker(pm0, vm0);
-  simgrid::s4u::this_actor::sleep_for(5);
+  sg4::this_actor::sleep_for(5);
   vm0->destroy();
 
   XBT_INFO("### Make a connection between PM0 and VM0@PM1");
   vm0 = pm1->create_vm("VM0", 1);
   launch_communication_worker(pm0, vm0);
-  simgrid::s4u::this_actor::sleep_for(5);
+  sg4::this_actor::sleep_for(5);
   vm0->destroy();
 
   XBT_INFO("### Make two connections between PM0 and VM0@PM1");
@@ -166,7 +167,7 @@ static void master_main()
   vm0->start();
   launch_communication_worker(pm0, vm0);
   launch_communication_worker(pm0, vm0);
-  simgrid::s4u::this_actor::sleep_for(5);
+  sg4::this_actor::sleep_for(5);
   vm0->destroy();
 
   XBT_INFO("### Make a connection between PM0 and VM0@PM1, and also make a connection between PM0 and PM1");
@@ -174,7 +175,7 @@ static void master_main()
   vm0->start();
   launch_communication_worker(pm0, vm0);
   launch_communication_worker(pm0, pm1);
-  simgrid::s4u::this_actor::sleep_for(5);
+  sg4::this_actor::sleep_for(5);
   vm0->destroy();
 
   XBT_INFO("### Make a connection between VM0@PM0 and PM1@PM1, and also make a connection between VM0@PM0 and VM1@PM1");
@@ -184,7 +185,7 @@ static void master_main()
   vm1->start();
   launch_communication_worker(vm0, vm1);
   launch_communication_worker(vm0, vm1);
-  simgrid::s4u::this_actor::sleep_for(5);
+  sg4::this_actor::sleep_for(5);
   vm0->destroy();
   vm1->destroy();
 
@@ -197,26 +198,26 @@ static void master_main()
 
   vm0->start();
   launch_communication_worker(vm0, pm2);
-  simgrid::s4u::this_actor::sleep_for(0.01);
+  sg4::this_actor::sleep_for(0.01);
   sg_vm_migrate(vm0, pm1);
-  simgrid::s4u::this_actor::sleep_for(0.01);
+  sg4::this_actor::sleep_for(0.01);
   sg_vm_migrate(vm0, pm0);
-  simgrid::s4u::this_actor::sleep_for(5);
+  sg4::this_actor::sleep_for(5);
   vm0->destroy();
   XBT_INFO("## Test 6 (ended)");
 }
 
 int main(int argc, char* argv[])
 {
-  simgrid::s4u::Engine e(&argc, argv);
+  sg4::Engine e(&argc, argv);
   sg_vm_live_migration_plugin_init();
   e.load_platform(argv[1]); /* - Load the platform description */
 
-  simgrid::s4u::Actor::create("master_", e.host_by_name("Fafard"), master_main);
+  sg4::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", sg4::Engine::get_clock());
 
   return 0;
 }