X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9dc842c5693960b11e58a90abb9f35d54337a7d3..46e97eaa5bcfc8bb551da78b930073e620ead03a:/examples/s4u/routing-get-clusters/s4u-routing-get-clusters.cpp

diff --git a/examples/s4u/routing-get-clusters/s4u-routing-get-clusters.cpp b/examples/s4u/routing-get-clusters/s4u-routing-get-clusters.cpp
index bc36f0fc45..33b02dda1d 100644
--- a/examples/s4u/routing-get-clusters/s4u-routing-get-clusters.cpp
+++ b/examples/s4u/routing-get-clusters/s4u-routing-get-clusters.cpp
@@ -1,51 +1,41 @@
-/* Copyright (c) 2009-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2009-2020. 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. */
 
+#include "simgrid/kernel/routing/ClusterZone.hpp"
+#include "simgrid/kernel/routing/DragonflyZone.hpp"
 #include "simgrid/s4u.hpp"
-#include "src/kernel/routing/ClusterZone.hpp"
-#include "src/kernel/routing/DragonflyZone.hpp"
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_test, "Messages specific for this s4u example");
 
 int main(int argc, char* argv[])
 {
   simgrid::s4u::Engine e(&argc, argv);
-  e.loadPlatform(argv[1]);
+  e.load_platform(argv[1]);
 
-  std::vector<simgrid::kernel::routing::ClusterZone*>* clusters =
-      new std::vector<simgrid::kernel::routing::ClusterZone*>;
+  std::vector<simgrid::kernel::routing::ClusterZone*> clusters =
+      e.get_filtered_netzones<simgrid::kernel::routing::ClusterZone>();
 
-  e.getNetzoneByType<simgrid::kernel::routing::ClusterZone>(clusters);
-
-  for (auto c : *clusters) {
-    XBT_INFO("%s", c->getCname());
-    std::vector<simgrid::s4u::Host*>* hosts = new std::vector<simgrid::s4u::Host*>;
-    c->getHosts(hosts);
-    for (auto h : *hosts)
-      XBT_INFO("   %s", h->getCname());
-    delete hosts;
+  for (auto c : clusters) {
+    XBT_INFO("%s", c->get_cname());
+    std::vector<simgrid::s4u::Host*> hosts = c->get_all_hosts();
+    for (auto h : hosts)
+      XBT_INFO("   %s", h->get_cname());
   }
 
-  delete clusters;
-
-  std::vector<simgrid::kernel::routing::DragonflyZone*>* dragonfly_clusters =
-      new std::vector<simgrid::kernel::routing::DragonflyZone*>;
-
-  e.getNetzoneByType<simgrid::kernel::routing::DragonflyZone>(dragonfly_clusters);
+  std::vector<simgrid::kernel::routing::DragonflyZone*> dragonfly_clusters =
+      e.get_filtered_netzones<simgrid::kernel::routing::DragonflyZone>();
 
-  if (not dragonfly_clusters->empty()) {
-    for (auto d : *dragonfly_clusters) {
-      XBT_INFO("%s' dragonfly topology:", d->getCname());
-      for (int i = 0; i < d->getHostCount(); i++) {
-        unsigned int coords[4];
-        d->rankId_to_coords(i, &coords);
-        XBT_INFO("   %d: (%u, %u, %u, %u)", i, coords[0], coords[1], coords[2], coords[3]);
+  if (not dragonfly_clusters.empty()) {
+    for (auto d : dragonfly_clusters) {
+      XBT_INFO("%s' dragonfly topology:", d->get_cname());
+      for (int i = 0; i < d->get_host_count(); i++) {
+        const simgrid::kernel::routing::DragonflyZone::Coords coords = d->rankId_to_coords(i);
+        XBT_INFO("   %d: (%u, %u, %u, %u)", i, coords.group, coords.chassis, coords.blade, coords.node);
       }
     }
   }
-  delete dragonfly_clusters;
 
   return 0;
 }