X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/969b2289cb602ac88647e9d8d5a411ab481f4910..2911b8122231fb6dcda07110d191b4b16dd42e36:/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 085464e95a..12e793d020 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-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2017-2019. 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. */
@@ -11,10 +11,10 @@
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_test, "Property test");
 
-static void test_host(std::string hostname)
+static void test_host(const std::string& hostname)
 {
   simgrid::s4u::Host* thehost = simgrid::s4u::Host::by_name(hostname);
-  std::unordered_map<std::string, std::string>* props = thehost->get_properties();
+  const std::unordered_map<std::string, std::string>* hostprops = thehost->get_properties();
   const char* noexist = "Unknown";
   const char* exist   = "Hdd";
   const char* value;
@@ -22,11 +22,11 @@ static void test_host(std::string hostname)
   XBT_INFO("== Print the properties of the host '%s'", hostname.c_str());
   // Sort the properties before displaying them, so that the tests are perfectly reproducible
   std::vector<std::string> keys;
-  for (auto const& kv : *props)
+  for (auto const& kv : *hostprops)
     keys.push_back(kv.first);
   std::sort(keys.begin(), keys.end());
   for (std::string key : keys)
-    XBT_INFO("  Host property: '%s' -> '%s'", key.c_str(), props->at(key).c_str());
+    XBT_INFO("  Host property: '%s' -> '%s'", key.c_str(), hostprops->at(key).c_str());
 
   XBT_INFO("== Try to get a host property that does not exist");
   value = thehost->get_property(noexist);
@@ -49,42 +49,49 @@ static void test_host(std::string hostname)
 
   /* Restore the value for the next test */
   thehost->set_property(exist, "180");
+
+  auto thezone = thehost->get_englobing_zone();
+  XBT_INFO("== Print the properties of the zone '%s' that contains '%s'", thezone->get_cname(), hostname.c_str());
+  const std::unordered_map<std::string, std::string>* zoneprops = thezone->get_properties();
+  keys.clear();
+  for (auto const& kv : *zoneprops)
+    keys.push_back(kv.first);
+  std::sort(keys.begin(), keys.end());
+  for (std::string key : keys)
+    XBT_INFO("  Zone property: '%s' -> '%s'", key.c_str(), zoneprops->at(key).c_str());
 }
 
-static int alice(int argc, char* argv[])
+static void alice(std::vector<std::string> /*args*/)
 {
   /* Dump what we have on the current host */
   test_host("host1");
-  return 0;
 }
 
-static int carole(int argc, char* argv[])
+static void carole(std::vector<std::string> /*args*/)
 {
   /* Dump what we have on a remote host */
   simgrid::s4u::this_actor::sleep_for(1); // Wait for alice to be done with its experiment
   test_host("host1");
-  return 0;
 }
 
-static int david(int argc, char* argv[])
+static void david(std::vector<std::string> /*args*/)
 {
   /* Dump what we have on a remote host */
   simgrid::s4u::this_actor::sleep_for(2); // Wait for alice and carole to be done with its experiment
-  test_host("node-0.acme.org");
-  return 0;
+  test_host("node-0.simgrid.org");
 }
 
-static int bob(int argc, char* argv[])
+static void bob(std::vector<std::string> /*args*/)
 {
   /* this host also tests the properties of the AS*/
   simgrid::s4u::NetZone* root = simgrid::s4u::Engine::get_instance()->get_netzone_root();
-  XBT_INFO("== Print the properties of the zone");
+  XBT_INFO("== Print the properties of the root zone");
   XBT_INFO("   Zone property: filename -> %s", root->get_property("filename"));
   XBT_INFO("   Zone property: date -> %s", root->get_property("date"));
   XBT_INFO("   Zone property: author -> %s", root->get_property("author"));
 
   /* Get the property list of current bob process */
-  std::unordered_map<std::string, std::string>* props = simgrid::s4u::Actor::self()->get_properties();
+  const std::unordered_map<std::string, std::string>* props = simgrid::s4u::Actor::self()->get_properties();
   const char* noexist = "UnknownProcessProp";
   XBT_ATTRIB_UNUSED const char* value;
 
@@ -96,7 +103,6 @@ static int bob(int argc, char* argv[])
 
   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[])