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

diff --git a/teshsuite/simdag/flatifier/flatifier.cpp b/teshsuite/simdag/flatifier/flatifier.cpp
index bd48f32602..7d1b4999c3 100644
--- a/teshsuite/simdag/flatifier/flatifier.cpp
+++ b/teshsuite/simdag/flatifier/flatifier.cpp
@@ -4,28 +4,43 @@
 /* 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 <cstdio>
+#include <cstdlib>
+#include <cstring>
+
+#include <xbt/dict.h>
+#include <xbt/lib.h>
+#include <xbt/log.h>
+#include <xbt/sysdep.h>
+#include <xbt/xbt_os_time.h>
+
+#include "simgrid/s4u/engine.hpp"
+#include "simgrid/s4u/host.hpp"
+
+#include <simgrid/simdag.h>
+
+#include "src/kernel/routing/NetCard.hpp"
 #include "src/surf/network_interface.hpp"
-#include "simgrid/simdag.h"
-#include "xbt/xbt_os_time.h"
+
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(flatifier, "Logging specific to this platform parsing tool");
 
 static int name_compare_hosts(const void *n1, const void *n2)
 {
-  return strcmp(sg_host_get_name(*(sg_host_t *) n1), sg_host_get_name(*(sg_host_t *) n2));
+  return std::strcmp(sg_host_get_name(*(sg_host_t *) n1), sg_host_get_name(*(sg_host_t *) n2));
 }
 
 static int name_compare_links(const void *n1, const void *n2)
 {
-  return strcmp(sg_link_name(*(SD_link_t *) n1),sg_link_name(*(SD_link_t *) n2));
+  return std::strcmp(sg_link_name(*(SD_link_t *) n1),sg_link_name(*(SD_link_t *) n2));
 }
 
 static int parse_cmdline(int *timings, char **platformFile, int argc, char **argv)
 {
   int wrong_option = 0;
   for (int i = 1; i < argc; i++) {
-    if (strlen(argv[i]) > 1 && argv[i][0] == '-' && argv[i][1] == '-') {
-      if (!strcmp(argv[i], "--timings")) {
+    if (std::strlen(argv[i]) > 1 && argv[i][0] == '-' && argv[i][1] == '-') {
+      if (!std::strcmp(argv[i], "--timings")) {
         *timings = 1;
       } else {
           wrong_option = 1;
@@ -40,14 +55,13 @@ static int parse_cmdline(int *timings, char **platformFile, int argc, char **arg
 
 static void create_environment(xbt_os_timer_t parse_time, const char *platformFile)
 {
-  xbt_ex_t e;
-  TRY {
+  try {
     xbt_os_cputimer_start(parse_time);
     SD_create_environment(platformFile);
     xbt_os_cputimer_stop(parse_time);
   }
-  CATCH(e) {
-    xbt_die("Error while loading %s: %s", platformFile, e.msg);
+  catch (std::exception& e) {
+    xbt_die("Error while loading %s: %s", platformFile, e.what());
   }
 }
 
@@ -59,9 +73,7 @@ int main(int argc, char **argv)
   unsigned int i;
   xbt_dict_t props = nullptr;
   xbt_dict_cursor_t cursor = nullptr;
-  xbt_lib_cursor_t cursor_src = nullptr;
-  xbt_lib_cursor_t cursor_dst = nullptr;
-  char *src,*dst,*key,*data;
+  char *key, *data;
   sg_netcard_t value1;
   sg_netcard_t value2;
 
@@ -77,124 +89,123 @@ int main(int argc, char **argv)
 
   create_environment(parse_time, platformFile);
 
+  std::vector<simgrid::kernel::routing::NetCard*> netcardList;
+  simgrid::s4u::Engine::instance()->netcardList(&netcardList);
+
   if (timings) {
     XBT_INFO("Parsing time: %fs (%zu hosts, %d links)", xbt_os_timer_elapsed(parse_time),
              sg_host_count(), sg_link_count());
   } else {
-    printf("<?xml version='1.0'?>\n");
-    printf("<!DOCTYPE platform SYSTEM \"http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd\">\n");
-    printf("<platform version=\"%d\">\n", version);
-    printf("<AS id=\"AS0\" routing=\"Full\">\n");
+    std::printf("<?xml version='1.0'?>\n");
+    std::printf("<!DOCTYPE platform SYSTEM \"http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd\">\n");
+    std::printf("<platform version=\"%d\">\n", version);
+    std::printf("<AS id=\"AS0\" routing=\"Full\">\n");
 
     // Hosts
     unsigned int totalHosts = sg_host_count();
     sg_host_t *hosts = sg_host_list();
-    qsort((void *) hosts, totalHosts, sizeof(sg_host_t), name_compare_hosts);
+    std::qsort((void *) hosts, totalHosts, sizeof(sg_host_t), name_compare_hosts);
 
     for (i = 0; i < totalHosts; i++) {
-      printf("  <host id=\"%s\" speed=\"%.0f\"", sg_host_get_name(hosts[i]), sg_host_speed(hosts[i]));
+      std::printf("  <host id=\"%s\" speed=\"%.0f\"", hosts[i]->cname(), sg_host_speed(hosts[i]));
       props = sg_host_get_properties(hosts[i]);
-      if (hosts[i]->core_count()>1) {
-        printf(" core=\"%d\"", hosts[i]->core_count());
+      if (hosts[i]->coreCount()>1) {
+        std::printf(" core=\"%d\"", hosts[i]->coreCount());
       }
       if (props && !xbt_dict_is_empty(props)) {
-        printf(">\n");
+        std::printf(">\n");
         xbt_dict_foreach(props, cursor, key, data) {
-          printf("    <prop id=\"%s\" value=\"%s\"/>\n", key, data);
+          std::printf("    <prop id=\"%s\" value=\"%s\"/>\n", key, data);
         }
-        printf("  </host>\n");
+        std::printf("  </host>\n");
       } else {
-        printf("/>\n");
+        std::printf("/>\n");
       }
     }
 
     // Routers
-    xbt_lib_foreach(as_router_lib, cursor_src, key, value1) {
-      value1 = (sg_netcard_t)xbt_lib_get_or_null(as_router_lib, key, ROUTING_ASR_LEVEL);
-      if(value1->isRouter()) {
-        printf("  <router id=\"%s\"/>\n",key);
-      }
-    }
+    for (auto srcCard : netcardList)
+      if (srcCard->isRouter())
+        std::printf("  <router id=\"%s\"/>\n", srcCard->cname());
 
     // Links
     unsigned int totalLinks = sg_link_count();
     SD_link_t *links = sg_link_list();
 
-    qsort((void *) links, totalLinks, sizeof(SD_link_t), name_compare_links);
+    std::qsort((void *) links, totalLinks, sizeof(SD_link_t), name_compare_links);
 
     for (i = 0; i < totalLinks; i++) {
-      printf("  <link id=\"");
+      std::printf("  <link id=\"");
 
-      printf("%s\" bandwidth=\"%.0f\" latency=\"%.9f\"", sg_link_name(links[i]),
+      std::printf("%s\" bandwidth=\"%.0f\" latency=\"%.9f\"", sg_link_name(links[i]),
              sg_link_bandwidth(links[i]), sg_link_latency(links[i]));
       if (sg_link_is_shared(links[i])) {
-        printf("/>\n");
+        std::printf("/>\n");
       } else {
-        printf(" sharing_policy=\"FATPIPE\"/>\n");
+        std::printf(" sharing_policy=\"FATPIPE\"/>\n");
       }
     }
 
-    sg_host_t host1, host2;
-    xbt_dict_foreach(host_list, cursor_src, src, host1){ // Routes from host
-      value1 = sg_host_by_name(src)->pimpl_netcard;
-      xbt_dict_foreach(host_list, cursor_dst, dst, host2){ //to host
+    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;
+      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 = sg_host_by_name(dst)->pimpl_netcard;
-        routing_platf->getRouteAndLatency(value1, value2, route,nullptr);
+        value2 = host2->pimpl_netcard;
+        simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(value1, value2, route, nullptr);
         if (! route->empty()){
-          printf("  <route src=\"%s\" dst=\"%s\">\n  ", src, dst);
+          std::printf("  <route src=\"%s\" dst=\"%s\">\n  ", host1->cname(), host2->cname());
           for (auto link: *route)
-            printf("<link_ctn id=\"%s\"/>",link->getName());
-          printf("\n  </route>\n");
+            std::printf("<link_ctn id=\"%s\"/>",link->getName());
+          std::printf("\n  </route>\n");
         }
         delete route;
       }
-      xbt_lib_foreach(as_router_lib, cursor_dst, dst, value2){ //to router
-        value2 = (sg_netcard_t)xbt_lib_get_or_null(as_router_lib,dst,ROUTING_ASR_LEVEL);
+      for (auto value2 : netcardList) { // to router
         if(value2->isRouter()){
-          printf("  <route src=\"%s\" dst=\"%s\">\n  ", src, dst);
+          std::printf("  <route src=\"%s\" dst=\"%s\">\n  ", host1->cname(), value2->cname());
           std::vector<Link*> *route = new std::vector<Link*>();
-          routing_platf->getRouteAndLatency((sg_netcard_t)value1,(sg_netcard_t)value2,route,nullptr);
+          simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(value1, value2, route, nullptr);
           for (auto link : *route)
-            printf("<link_ctn id=\"%s\"/>",link->getName());
+            std::printf("<link_ctn id=\"%s\"/>",link->getName());
           delete route;
-          printf("\n  </route>\n");
+          std::printf("\n  </route>\n");
         }
       }
     }
 
-    xbt_lib_foreach(as_router_lib, cursor_src, src, value1){ // Routes from router
-      value1 = (sg_netcard_t)xbt_lib_get_or_null(as_router_lib,src,ROUTING_ASR_LEVEL);
+    for (auto value1 : netcardList) { // Routes from router
       if (value1->isRouter()){
-        xbt_lib_foreach(as_router_lib, cursor_dst, dst, value2){ //to router
-          value2 = (sg_netcard_t)xbt_lib_get_or_null(as_router_lib,dst,ROUTING_ASR_LEVEL);
-          if(value2->isRouter()){
-            printf("  <route src=\"%s\" dst=\"%s\">\n  ", src, dst);
-            std::vector<Link*> *route = new std::vector<Link*>();
-            routing_platf->getRouteAndLatency((sg_netcard_t)value1,(sg_netcard_t)value2,route,nullptr);
+        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)
-              printf("<link_ctn id=\"%s\"/>",link->getName());
+              std::printf("<link_ctn id=\"%s\"/>",link->getName());
             delete route;
-            printf("\n  </route>\n");
+            std::printf("\n  </route>\n");
           }
         }
-        xbt_dict_foreach(host_list, cursor_dst, dst, value2){ //to host
-          printf("  <route src=\"%s\" dst=\"%s\">\n  ",src, dst);
+        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 = sg_host_by_name(dst)->pimpl_netcard;
-          routing_platf->getRouteAndLatency((sg_netcard_t)value1,(sg_netcard_t)value2,route, nullptr);
+          value2 = host2->pimpl_netcard;
+          simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(value1, value2, route, nullptr);
           for(auto link : *route)
-            printf("<link_ctn id=\"%s\"/>",link->getName());
+            std::printf("<link_ctn id=\"%s\"/>",link->getName());
           delete route;
-          printf("\n  </route>\n");
+          std::printf("\n  </route>\n");
         }
       }
     }
 
-    printf("</AS>\n");
-    printf("</platform>\n");
-    free(hosts);
-    free(links);
+    std::printf("</AS>\n");
+    std::printf("</platform>\n");
+    std::free(hosts);
+    std::free(links);
   }
 
   SD_exit();