X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/084ad52d4bc9b1c53f08795703e7fe2d0ada7764..666a812d1b3ee4568f2beb317dfcd08d99055697:/examples/s4u/platform-properties/s4u-platform-properties.cpp

diff --git a/examples/s4u/platform-properties/s4u-platform-properties.cpp b/examples/s4u/platform-properties/s4u-platform-properties.cpp
index 307a941853..c4d57e00e2 100644
--- a/examples/s4u/platform-properties/s4u-platform-properties.cpp
+++ b/examples/s4u/platform-properties/s4u-platform-properties.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. */
@@ -71,14 +71,14 @@ static int david(int argc, char* argv[])
 static int bob(int argc, char* argv[])
 {
   /* this host also tests the properties of the AS*/
-  simgrid::s4u::NetZone* root = simgrid::s4u::Engine::getInstance()->getNetRoot();
+  simgrid::s4u::NetZone* root = simgrid::s4u::Engine::get_instance()->getNetRoot();
   XBT_INFO("== Print the properties of the zone");
   XBT_INFO("   Zone property: filename -> %s", root->getProperty("filename"));
   XBT_INFO("   Zone property: date -> %s", root->getProperty("date"));
   XBT_INFO("   Zone property: author -> %s", root->getProperty("author"));
 
   /* Get the property list of current bob process */
-  std::map<std::string, std::string>* props = simgrid::s4u::Actor::self()->getProperties();
+  std::map<std::string, std::string>* props = simgrid::s4u::Actor::self()->get_properties();
   const char* noexist = "UnknownProcessProp";
   XBT_ATTRIB_UNUSED const char* value;
 
@@ -88,30 +88,29 @@ static int bob(int argc, char* argv[])
 
   XBT_INFO("== Try to get an actor property that does not exist");
 
-  value = simgrid::s4u::Actor::self()->getProperty(noexist);
-  xbt_assert(not value, "The property is defined (it shouldnt)");
+  value = simgrid::s4u::Actor::self()->get_property(noexist);
+  xbt_assert(not value, "The property is defined (it should not)");
   return 0;
 }
 
 int main(int argc, char* argv[])
 {
   simgrid::s4u::Engine e(&argc, argv);
-  e.loadPlatform(argv[1]);
+  e.load_platform(argv[1]);
 
-  e.registerFunction("alice", alice);
-  e.registerFunction("bob", bob);
-  e.registerFunction("carole", carole);
-  e.registerFunction("david", david);
+  e.register_function("alice", alice);
+  e.register_function("bob", bob);
+  e.register_function("carole", carole);
+  e.register_function("david", david);
 
   size_t totalHosts = sg_host_count();
 
   XBT_INFO("There are %zu hosts in the environment", totalHosts);
-  simgrid::s4u::Host** hosts = sg_host_list();
-  for (unsigned int i = 0; i < totalHosts; i++)
-    XBT_INFO("Host '%s' runs at %.0f flops/s", hosts[i]->getCname(), hosts[i]->getSpeed());
-  xbt_free(hosts);
+  std::vector<simgrid::s4u::Host*> hosts = e.get_all_hosts();
+  for (unsigned int i = 0; i < hosts.size(); i++)
+    XBT_INFO("Host '%s' runs at %.0f flops/s", hosts[i]->get_cname(), hosts[i]->getSpeed());
 
-  e.loadDeployment(argv[2]);
+  e.load_deployment(argv[2]);
   e.run();
 
   return 0;