X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e4b0e5563bf3957c69041a31c1ccc6a0274e1792..48296e83ce3ba1fa3658a3a74d10a536e33b3849:/teshsuite/platforms/flatifier.cpp

diff --git a/teshsuite/platforms/flatifier.cpp b/teshsuite/platforms/flatifier.cpp
index 2ab089a7f3..a61e7c5547 100644
--- a/teshsuite/platforms/flatifier.cpp
+++ b/teshsuite/platforms/flatifier.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2008-2022. 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. */
@@ -9,7 +9,7 @@
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Host.hpp"
 #include "simgrid/s4u/Link.hpp"
-#include "src/surf/network_interface.hpp"
+#include "src/kernel/resource/StandardLinkImpl.hpp"
 
 #include <algorithm>
 #include <cstring>
@@ -47,10 +47,8 @@ static void create_environment(xbt_os_timer_t parse_time, const std::string& pla
 static void dump_hosts()
 {
   std::vector<sg4::Host*> hosts = sg4::Engine::get_instance()->get_all_hosts();
-  std::sort(hosts.begin(), hosts.end(),
-            [](const sg4::Host* a, const sg4::Host* b) { return a->get_name() < b->get_name(); });
 
-  for (auto h : hosts) {
+  for (auto const* h : hosts) {
     std::printf("  <host id=\"%s\" speed=\"%.0f\"", h->get_cname(), h->get_speed());
     const std::unordered_map<std::string, std::string>* props = h->get_properties();
     if (h->get_core_count() > 1) {
@@ -58,8 +56,8 @@ static void dump_hosts()
     }
     // Sort the properties before displaying them, so that the tests are perfectly reproducible
     std::vector<std::string> keys;
-    for (auto const& kv : *props)
-      keys.push_back(kv.first);
+    for (auto const& [key, _] : *props)
+      keys.push_back(key);
     if (not keys.empty()) {
       std::printf(">\n");
       std::sort(keys.begin(), keys.end());
@@ -79,7 +77,7 @@ static void dump_links()
   std::sort(links.begin(), links.end(),
             [](const sg4::Link* a, const sg4::Link* b) { return a->get_name() < b->get_name(); });
 
-  for (auto link : links) {
+  for (auto const* link : links) {
     std::printf("  <link id=\"");
 
     std::printf("%s\" bandwidth=\"%.0f\" latency=\"%.9f\"", link->get_cname(), link->get_bandwidth(),
@@ -108,18 +106,16 @@ static void dump_routers()
 static void dump_routes()
 {
   std::vector<sg4::Host*> hosts = sg4::Engine::get_instance()->get_all_hosts();
-  std::sort(hosts.begin(), hosts.end(),
-            [](const sg4::Host* a, const sg4::Host* b) { return a->get_name() < b->get_name(); });
   std::vector<simgrid::kernel::routing::NetPoint*> netpoints = sg4::Engine::get_instance()->get_all_netpoints();
   std::sort(netpoints.begin(), netpoints.end(),
             [](const simgrid::kernel::routing::NetPoint* a, const simgrid::kernel::routing::NetPoint* b) {
               return a->get_name() < b->get_name();
             });
 
-  for (auto src_host : hosts) { // Routes from host
+  for (auto const* src_host : hosts) { // Routes from host
     const simgrid::kernel::routing::NetPoint* src = src_host->get_netpoint();
-    for (auto dst_host : hosts) { // Routes to host
-      std::vector<simgrid::kernel::resource::LinkImpl*> route;
+    for (auto const* dst_host : hosts) { // Routes to host
+      std::vector<simgrid::kernel::resource::StandardLinkImpl*> route;
       const simgrid::kernel::routing::NetPoint* dst = dst_host->get_netpoint();
       simgrid::kernel::routing::NetZoneImpl::get_global_route(src, dst, route, nullptr);
       if (route.empty())
@@ -134,7 +130,7 @@ static void dump_routes()
       if (not dst->is_router())
         continue;
       std::printf("  <route src=\"%s\" dst=\"%s\">\n  ", src_host->get_cname(), dst->get_cname());
-      std::vector<simgrid::kernel::resource::LinkImpl*> route;
+      std::vector<simgrid::kernel::resource::StandardLinkImpl*> route;
       simgrid::kernel::routing::NetZoneImpl::get_global_route(src, dst, route, nullptr);
       for (auto const& link : route)
         std::printf("<link_ctn id=\"%s\"/>", link->get_cname());
@@ -148,7 +144,7 @@ static void dump_routes()
     for (auto const& value2 : netpoints) { // to router
       if (not value2->is_router())
         continue;
-      std::vector<simgrid::kernel::resource::LinkImpl*> route;
+      std::vector<simgrid::kernel::resource::StandardLinkImpl*> route;
       simgrid::kernel::routing::NetZoneImpl::get_global_route(value1, value2, route, nullptr);
       if (route.empty())
         continue;
@@ -157,9 +153,9 @@ static void dump_routes()
         std::printf("<link_ctn id=\"%s\"/>", link->get_cname());
       std::printf("\n  </route>\n");
     }
-    for (auto dst_host : hosts) { // Routes to host
+    for (auto const* dst_host : hosts) { // Routes to host
       std::printf("  <route src=\"%s\" dst=\"%s\">\n  ", value1->get_cname(), dst_host->get_cname());
-      std::vector<simgrid::kernel::resource::LinkImpl*> route;
+      std::vector<simgrid::kernel::resource::StandardLinkImpl*> route;
       const simgrid::kernel::routing::NetPoint* netcardDst = dst_host->get_netpoint();
       simgrid::kernel::routing::NetZoneImpl::get_global_route(value1, netcardDst, route, nullptr);
       for (auto const& link : route)