Update copyright lines.

[simgrid.git] / teshsuite / simdag / flatifier / flatifier.cpp

diff --git a/teshsuite/simdag/flatifier/flatifier.cpp b/teshsuite/simdag/flatifier/flatifier.cpp
index 757d5ed..9f230da 100644 (file)
--- a/teshsuite/simdag/flatifier/flatifier.cpp
+++ b/teshsuite/simdag/flatifier/flatifier.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2008-2021. 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. */
@@ -12,6 +12,7 @@
 #include "src/surf/network_interface.hpp"
 
 #include <algorithm>
+#include <cstring>
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(flatifier, "Logging specific to this platform parsing tool");
 
@@ -48,7 +49,7 @@ static void dump_hosts()
             [](const_sg_host_t a, const_sg_host_t b) { return strcmp(sg_host_get_name(a), sg_host_get_name(b)) < 0; });
 
   for (size_t i = 0; i < totalHosts; i++) {
-    std::printf("  <host id=\"%s\" speed=\"%.0f\"", hosts[i]->get_cname(), sg_host_speed(hosts[i]));
+    std::printf("  <host id=\"%s\" speed=\"%.0f\"", hosts[i]->get_cname(), sg_host_get_speed(hosts[i]));
     const std::unordered_map<std::string, std::string>* props = hosts[i]->get_properties();
     if (hosts[i]->get_core_count() > 1) {
       std::printf(" core=\"%d\"", hosts[i]->get_core_count());
@@ -76,7 +77,7 @@ static void dump_links()
   simgrid::s4u::Link** links = sg_link_list();
 
   std::sort(links, links + totalLinks, [](const simgrid::s4u::Link* a, const simgrid::s4u::Link* b) {
-    return strcmp(sg_link_name(a), sg_link_name(b)) < 0;
+    return strcmp(sg_link_get_name(a), sg_link_get_name(b)) < 0;
   });
 
   for (size_t i = 0; i < totalLinks; i++) {
@@ -129,48 +130,48 @@ static void dump_routes()
       std::vector<simgrid::kernel::resource::LinkImpl*> route;
       simgrid::kernel::routing::NetPoint* dst = host2->get_netpoint();
       simgrid::kernel::routing::NetZoneImpl::get_global_route(src, dst, route, nullptr);
-      if (not route.empty()) {
-        std::printf("  <route src=\"%s\" dst=\"%s\">\n  ", host1->get_cname(), host2->get_cname());
-        for (auto const& link : route)
-          std::printf("<link_ctn id=\"%s\"/>", link->get_cname());
-        std::printf("\n  </route>\n");
-      }
+      if (route.empty())
+        continue;
+      std::printf("  <route src=\"%s\" dst=\"%s\">\n  ", host1->get_cname(), host2->get_cname());
+      for (auto const& link : route)
+        std::printf("<link_ctn id=\"%s\"/>", link->get_cname());
+      std::printf("\n  </route>\n");
     }
 
     for (auto const& dst : netpoints) { // to router
-      if (dst->is_router()) {
-        std::printf("  <route src=\"%s\" dst=\"%s\">\n  ", host1->get_cname(), dst->get_cname());
-        std::vector<simgrid::kernel::resource::LinkImpl*> 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());
-        std::printf("\n  </route>\n");
-      }
+      if (not dst->is_router())
+        continue;
+      std::printf("  <route src=\"%s\" dst=\"%s\">\n  ", host1->get_cname(), dst->get_cname());
+      std::vector<simgrid::kernel::resource::LinkImpl*> 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());
+      std::printf("\n  </route>\n");
     }
   }
 
   for (auto const& value1 : netpoints) { // Routes from router
-    if (value1->is_router()) {
-      for (auto const& value2 : netpoints) { // to router
-        if (value2->is_router()) {
-          std::printf("  <route src=\"%s\" dst=\"%s\">\n  ", value1->get_cname(), value2->get_cname());
-          std::vector<simgrid::kernel::resource::LinkImpl*> route;
-          simgrid::kernel::routing::NetZoneImpl::get_global_route(value1, value2, route, nullptr);
-          for (auto const& link : route)
-            std::printf("<link_ctn id=\"%s\"/>", link->get_cname());
-          std::printf("\n  </route>\n");
-        }
-      }
-      for (unsigned int it_dst = 0; it_dst < totalHosts; it_dst++) { // Routes to host
-        const simgrid::s4u::Host* host2 = hosts[it_dst];
-        std::printf("  <route src=\"%s\" dst=\"%s\">\n  ", value1->get_cname(), host2->get_cname());
-        std::vector<simgrid::kernel::resource::LinkImpl*> route;
-        simgrid::kernel::routing::NetPoint* netcardDst = host2->get_netpoint();
-        simgrid::kernel::routing::NetZoneImpl::get_global_route(value1, netcardDst, route, nullptr);
-        for (auto const& link : route)
-          std::printf("<link_ctn id=\"%s\"/>", link->get_cname());
-        std::printf("\n  </route>\n");
-      }
+    if (not value1->is_router())
+      continue;
+    for (auto const& value2 : netpoints) { // to router
+      if (not value2->is_router())
+        continue;
+      std::printf("  <route src=\"%s\" dst=\"%s\">\n  ", value1->get_cname(), value2->get_cname());
+      std::vector<simgrid::kernel::resource::LinkImpl*> route;
+      simgrid::kernel::routing::NetZoneImpl::get_global_route(value1, value2, route, nullptr);
+      for (auto const& link : route)
+        std::printf("<link_ctn id=\"%s\"/>", link->get_cname());
+      std::printf("\n  </route>\n");
+    }
+    for (unsigned int it_dst = 0; it_dst < totalHosts; it_dst++) { // Routes to host
+      const simgrid::s4u::Host* host2 = hosts[it_dst];
+      std::printf("  <route src=\"%s\" dst=\"%s\">\n  ", value1->get_cname(), host2->get_cname());
+      std::vector<simgrid::kernel::resource::LinkImpl*> route;
+      simgrid::kernel::routing::NetPoint* netcardDst = host2->get_netpoint();
+      simgrid::kernel::routing::NetZoneImpl::get_global_route(value1, netcardDst, route, nullptr);
+      for (auto const& link : route)
+        std::printf("<link_ctn id=\"%s\"/>", link->get_cname());
+      std::printf("\n  </route>\n");
     }
   }
   xbt_free(hosts);