-/* Copyright (c) 2009-2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-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. */
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) {
+ for (auto c : clusters) {
XBT_INFO("%s", c->get_cname());
- std::vector<simgrid::s4u::Host*>* hosts = new std::vector<simgrid::s4u::Host*>;
- c->getHosts(hosts);
- for (auto h : *hosts)
+ std::vector<simgrid::s4u::Host*> hosts = c->get_all_hosts();
+ for (auto h : hosts)
XBT_INFO(" %s", h->get_cname());
- delete hosts;
}
- 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) {
+ if (not dragonfly_clusters.empty()) {
+ for (auto d : dragonfly_clusters) {
XBT_INFO("%s' dragonfly topology:", d->get_cname());
- for (int i = 0; i < d->getHostCount(); i++) {
+ for (int i = 0; i < d->get_host_count(); 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]);
}
}
}
- delete dragonfly_clusters;
return 0;
}