Merge pull request #272 from mpoquet/SMPI_convert

[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 caa9d5d..d6fb4c5 100644 (file)
--- a/examples/s4u/actor-migration/s4u-actor-migration.cpp
+++ b/examples/s4u/actor-migration/s4u-actor-migration.cpp
@@ -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>
@@ -31,11 +31,11 @@ static void worker(simgrid::s4u::Host* first, simgrid::s4u::Host* second)
   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()->get_cname());
+  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()->get_cname());
+  XBT_INFO("I wake up on %s", simgrid::s4u::this_actor::get_host()->get_cname());
   XBT_INFO("Done");
 }
 
@@ -45,7 +45,7 @@ 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);
 
@@ -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;