start snake_casing s4u::Engine

[simgrid.git] / examples / s4u / actor-migration / s4u-actor-migration.cpp

diff --git a/examples/s4u/actor-migration/s4u-actor-migration.cpp b/examples/s4u/actor-migration/s4u-actor-migration.cpp
index b9a3636..d6fb4c5 100644 (file)
--- a/examples/s4u/actor-migration/s4u-actor-migration.cpp
+++ b/examples/s4u/actor-migration/s4u-actor-migration.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2017-2018. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -13,7 +13,7 @@
  * Then another migration is done by the monitor while the worker is suspended.
  *
  * Note that worker() takes an uncommon set of parameters,
- * and that this is perfectly accepted by createActor().
+ * and that this is perfectly accepted by create().
  */
 
 #include <simgrid/s4u.hpp>
@@ -25,17 +25,17 @@ static void worker(simgrid::s4u::Host* first, simgrid::s4u::Host* second)
 {
   double flopAmount = first->getSpeed() * 5 + second->getSpeed() * 5;
 
-  XBT_INFO("Let's move to %s to execute %.2f Mflops (5sec on %s and 5sec on %s)", first->getCname(), flopAmount / 1e6,
-           first->getCname(), second->getCname());
+  XBT_INFO("Let's move to %s to execute %.2f Mflops (5sec on %s and 5sec on %s)", first->get_cname(), flopAmount / 1e6,
+           first->get_cname(), second->get_cname());
 
   simgrid::s4u::this_actor::migrate(first);
   simgrid::s4u::this_actor::execute(flopAmount);
 
-  XBT_INFO("I wake up on %s. Let's suspend a bit", simgrid::s4u::this_actor::getHost()->getCname());
+  XBT_INFO("I wake up on %s. Let's suspend a bit", simgrid::s4u::this_actor::get_host()->get_cname());
 
   simgrid::s4u::this_actor::suspend();
 
-  XBT_INFO("I wake up on %s", simgrid::s4u::this_actor::getHost()->getCname());
+  XBT_INFO("I wake up on %s", simgrid::s4u::this_actor::get_host()->get_cname());
   XBT_INFO("Done");
 }
 
@@ -45,15 +45,15 @@ static void monitor()
   simgrid::s4u::Host* jacquelin = simgrid::s4u::Host::by_name("Jacquelin");
   simgrid::s4u::Host* fafard    = simgrid::s4u::Host::by_name("Fafard");
 
-  simgrid::s4u::ActorPtr actor = simgrid::s4u::Actor::createActor("worker", fafard, worker, boivin, jacquelin);
+  simgrid::s4u::ActorPtr actor = simgrid::s4u::Actor::create("worker", fafard, worker, boivin, jacquelin);
 
   simgrid::s4u::this_actor::sleep_for(5);
 
-  XBT_INFO("After 5 seconds, move the process to %s", jacquelin->getCname());
+  XBT_INFO("After 5 seconds, move the process to %s", jacquelin->get_cname());
   actor->migrate(jacquelin);
 
   simgrid::s4u::this_actor::sleep_until(15);
-  XBT_INFO("At t=15, move the process to %s and resume it.", fafard->getCname());
+  XBT_INFO("At t=15, move the process to %s and resume it.", fafard->get_cname());
   actor->migrate(fafard);
   actor->resume();
 }
@@ -62,9 +62,9 @@ int main(int argc, char* argv[])
 {
   simgrid::s4u::Engine e(&argc, argv);
   xbt_assert(argc == 2, "Usage: %s platform_file\n\tExample: %s msg_platform.xml\n", argv[0], argv[0]);
-  e.loadPlatform(argv[1]);
+  e.load_platform(argv[1]);
 
-  simgrid::s4u::Actor::createActor("monitor", simgrid::s4u::Host::by_name("Boivin"), monitor);
+  simgrid::s4u::Actor::create("monitor", simgrid::s4u::Host::by_name("Boivin"), monitor);
   e.run();
 
   return 0;