X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a9786d0c1612118b9fc2304ea7aa36b67b232267..c1103c3a2b794d6f7e4599cf0182d72937b9a021:/teshsuite/simdag/flatifier/flatifier.cpp

diff --git a/teshsuite/simdag/flatifier/flatifier.cpp b/teshsuite/simdag/flatifier/flatifier.cpp
index 7d1b4999c3..ffa3c588fe 100644
--- a/teshsuite/simdag/flatifier/flatifier.cpp
+++ b/teshsuite/simdag/flatifier/flatifier.cpp
@@ -19,7 +19,7 @@
 
 #include <simgrid/simdag.h>
 
-#include "src/kernel/routing/NetCard.hpp"
+#include "src/kernel/routing/NetPoint.hpp"
 #include "src/surf/network_interface.hpp"
 
 
@@ -74,8 +74,6 @@ int main(int argc, char **argv)
   xbt_dict_t props = nullptr;
   xbt_dict_cursor_t cursor = nullptr;
   char *key, *data;
-  sg_netcard_t value1;
-  sg_netcard_t value2;
 
   xbt_os_timer_t parse_time = xbt_os_timer_new();
 
@@ -89,8 +87,12 @@ int main(int argc, char **argv)
 
   create_environment(parse_time, platformFile);
 
-  std::vector<simgrid::kernel::routing::NetCard*> netcardList;
-  simgrid::s4u::Engine::instance()->netcardList(&netcardList);
+  std::vector<simgrid::kernel::routing::NetPoint*> netcardList;
+  simgrid::s4u::Engine::instance()->netpointList(&netcardList);
+  std::sort(netcardList.begin(), netcardList.end(),
+            [](simgrid::kernel::routing::NetPoint* a, simgrid::kernel::routing::NetPoint* b) {
+              return a->name() < b->name();
+            });
 
   if (timings) {
     XBT_INFO("Parsing time: %fs (%zu hosts, %d links)", xbt_os_timer_elapsed(parse_time),
@@ -148,28 +150,26 @@ int main(int argc, char **argv)
 
     for (unsigned int it_src = 0; it_src < totalHosts; it_src++) { // Routes from host
       simgrid::s4u::Host* host1 = hosts[it_src];
-      value1 = host1->pimpl_netcard;
+      simgrid::kernel::routing::NetPoint* netcardSrc = host1->pimpl_netpoint;
       for (unsigned int it_dst = 0; it_dst < totalHosts; it_dst++) { // Routes to host
         simgrid::s4u::Host* host2 = hosts[it_dst];
-        std::vector<Link*> *route = new std::vector<Link*>();
-        value2 = host2->pimpl_netcard;
-        simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(value1, value2, route, nullptr);
-        if (! route->empty()){
+        std::vector<Link*> route;
+        simgrid::kernel::routing::NetPoint* netcardDst = host2->pimpl_netpoint;
+        simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(netcardSrc, netcardDst, &route, nullptr);
+        if (!route.empty()) {
           std::printf("  <route src=\"%s\" dst=\"%s\">\n  ", host1->cname(), host2->cname());
-          for (auto link: *route)
+          for (auto link : route)
             std::printf("<link_ctn id=\"%s\"/>",link->getName());
           std::printf("\n  </route>\n");
         }
-        delete route;
       }
-      for (auto value2 : netcardList) { // to router
-        if(value2->isRouter()){
-          std::printf("  <route src=\"%s\" dst=\"%s\">\n  ", host1->cname(), value2->cname());
-          std::vector<Link*> *route = new std::vector<Link*>();
-          simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(value1, value2, route, nullptr);
-          for (auto link : *route)
+      for (auto netcardDst : netcardList) { // to router
+        if (netcardDst->isRouter()) {
+          std::printf("  <route src=\"%s\" dst=\"%s\">\n  ", host1->cname(), netcardDst->cname());
+          std::vector<Link*> route;
+          simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(netcardSrc, netcardDst, &route, nullptr);
+          for (auto link : route)
             std::printf("<link_ctn id=\"%s\"/>",link->getName());
-          delete route;
           std::printf("\n  </route>\n");
         }
       }
@@ -180,23 +180,21 @@ int main(int argc, char **argv)
         for (auto value2 : netcardList) { // to router
           if (value2->isRouter()) {
             std::printf("  <route src=\"%s\" dst=\"%s\">\n  ", value1->cname(), value2->cname());
-            std::vector<Link*>* route = new std::vector<Link*>();
-            simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(value1, value2, route, nullptr);
-            for(auto link :*route)
+            std::vector<Link*> route;
+            simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(value1, value2, &route, nullptr);
+            for (auto link : route)
               std::printf("<link_ctn id=\"%s\"/>",link->getName());
-            delete route;
             std::printf("\n  </route>\n");
           }
         }
         for (unsigned int it_dst = 0; it_dst < totalHosts; it_dst++) { // Routes to host
           simgrid::s4u::Host* host2 = hosts[it_dst];
           std::printf("  <route src=\"%s\" dst=\"%s\">\n  ", value1->cname(), host2->cname());
-          std::vector<Link*> *route = new std::vector<Link*>();
-          value2 = host2->pimpl_netcard;
-          simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(value1, value2, route, nullptr);
-          for(auto link : *route)
+          std::vector<Link*> route;
+          simgrid::kernel::routing::NetPoint* netcardDst = host2->pimpl_netpoint;
+          simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(value1, netcardDst, &route, nullptr);
+          for (auto link : route)
             std::printf("<link_ctn id=\"%s\"/>",link->getName());
-          delete route;
           std::printf("\n  </route>\n");
         }
       }