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

diff --git a/teshsuite/simdag/flatifier/flatifier.cpp b/teshsuite/simdag/flatifier/flatifier.cpp
index 6035034bfd..5baf8683a3 100644
--- a/teshsuite/simdag/flatifier/flatifier.cpp
+++ b/teshsuite/simdag/flatifier/flatifier.cpp
@@ -1,23 +1,16 @@
-/* Copyright (c) 2008-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2008-2017. 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. */
 
-#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/host.hpp>
+#include "simgrid/s4u/Engine.hpp"
+#include "simgrid/s4u/Host.hpp"
 
-#include <simgrid/simdag.h>
+#include "simgrid/simdag.h"
 
+#include "src/kernel/routing/NetPoint.hpp"
 #include "src/surf/network_interface.hpp"
 
 
@@ -33,22 +26,22 @@ static int name_compare_links(const void *n1, const void *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)
+static bool parse_cmdline(int* timings, char** platformFile, int argc, char** argv)
 {
-  int wrong_option = 0;
+  bool parse_ok = true;
   for (int i = 1; i < argc; i++) {
     if (std::strlen(argv[i]) > 1 && argv[i][0] == '-' && argv[i][1] == '-') {
       if (!std::strcmp(argv[i], "--timings")) {
         *timings = 1;
       } else {
-          wrong_option = 1;
-          break;
+        parse_ok = false;
+        break;
       }
     } else {
       *platformFile = argv[i];
     }
   }
-  return wrong_option;
+  return parse_ok;
 }
 
 static void create_environment(xbt_os_timer_t parse_time, const char *platformFile)
@@ -63,153 +56,149 @@ static void create_environment(xbt_os_timer_t parse_time, const char *platformFi
   }
 }
 
-int main(int argc, char **argv)
+static void dump_platform()
 {
-  char *platformFile = nullptr;
-  int timings=0;
   int version = 4;
-  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;
-  sg_netcard_t value1;
-  sg_netcard_t value2;
+  char *key, *data;
+
+  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();
+  std::qsort((void*)hosts, totalHosts, sizeof(sg_host_t), name_compare_hosts);
+
+  for (unsigned int i = 0; i < totalHosts; 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]->coreCount() > 1) {
+      std::printf(" core=\"%d\"", hosts[i]->coreCount());
+    }
+    if (props && !xbt_dict_is_empty(props)) {
+      std::printf(">\n");
+      xbt_dict_foreach (props, cursor, key, data) {
+        std::printf("    <prop id=\"%s\" value=\"%s\"/>\n", key, data);
+      }
+      std::printf("  </host>\n");
+    } else {
+      std::printf("/>\n");
+    }
+  }
 
-  xbt_os_timer_t parse_time = xbt_os_timer_new();
+  // Routers
+  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();
+            });
 
-  SD_init(&argc, argv);
+  for (auto srcCard : netcardList)
+    if (srcCard->isRouter())
+      std::printf("  <router id=\"%s\"/>\n", srcCard->cname());
 
-  if (parse_cmdline(&timings, &platformFile, argc, argv) || !platformFile) {
-    xbt_die("Invalid command line arguments: expected [--timings] platformFile");
-  }
+  // Links
+  unsigned int totalLinks    = sg_link_count();
+  simgrid::s4u::Link** links = sg_link_list();
 
-  XBT_DEBUG("%d,%s", timings, platformFile);
+  std::qsort((void*)links, totalLinks, sizeof(SD_link_t), name_compare_links);
 
-  create_environment(parse_time, platformFile);
+  for (unsigned int i = 0; i < totalLinks; i++) {
+    simgrid::s4u::Link* link = links[i];
+    std::printf("  <link id=\"");
 
-  if (timings) {
-    XBT_INFO("Parsing time: %fs (%zu hosts, %d links)", xbt_os_timer_elapsed(parse_time),
-             sg_host_count(), sg_link_count());
-  } else {
-    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();
-    std::qsort((void *) hosts, totalHosts, sizeof(sg_host_t), name_compare_hosts);
-
-    for (i = 0; i < totalHosts; 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]->coreCount()>1) {
-        std::printf(" core=\"%d\"", hosts[i]->coreCount());
-      }
-      if (props && !xbt_dict_is_empty(props)) {
-        std::printf(">\n");
-        xbt_dict_foreach(props, cursor, key, data) {
-          std::printf("    <prop id=\"%s\" value=\"%s\"/>\n", key, data);
-        }
-        std::printf("  </host>\n");
-      } else {
-        std::printf("/>\n");
-      }
+    std::printf("%s\" bandwidth=\"%.0f\" latency=\"%.9f\"", link->name(), link->bandwidth(), link->latency());
+    if (sg_link_is_shared(link)) {
+      std::printf("/>\n");
+    } else {
+      std::printf(" sharing_policy=\"FATPIPE\"/>\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()) {
-        std::printf("  <router id=\"%s\"/>\n",key);
+  for (unsigned int it_src = 0; it_src < totalHosts; it_src++) { // Routes from host
+    simgrid::s4u::Host* host1                      = hosts[it_src];
+    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<simgrid::surf::LinkImpl*> 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)
+          std::printf("<link_ctn id=\"%s\"/>", link->cname());
+        std::printf("\n  </route>\n");
       }
     }
-
-    // Links
-    unsigned int totalLinks = sg_link_count();
-    SD_link_t *links = sg_link_list();
-
-    std::qsort((void *) links, totalLinks, sizeof(SD_link_t), name_compare_links);
-
-    for (i = 0; i < totalLinks; i++) {
-      std::printf("  <link id=\"");
-
-      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])) {
-        std::printf("/>\n");
-      } else {
-        std::printf(" sharing_policy=\"FATPIPE\"/>\n");
+    for (auto netcardDst : netcardList) { // to router
+      if (netcardDst->isRouter()) {
+        std::printf("  <route src=\"%s\" dst=\"%s\">\n  ", host1->cname(), netcardDst->cname());
+        std::vector<simgrid::surf::LinkImpl*> route;
+        simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(netcardSrc, netcardDst, &route, nullptr);
+        for (auto link : route)
+          std::printf("<link_ctn id=\"%s\"/>", link->cname());
+        std::printf("\n  </route>\n");
       }
     }
+  }
 
-    sg_host_t host1, host2;
-    for (unsigned int it_src = 0; it_src < totalHosts; it_src++) { // Routes from host
-      host1 = hosts[it_src];
-      value1 = sg_host_by_name(host1->name().c_str())->pimpl_netcard;
-      for (unsigned int it_dst = 0; it_dst < totalHosts; it_dst++) { // Routes to host
-        host2 = hosts[it_dst];
-        std::vector<Link*> *route = new std::vector<Link*>();
-        value2 = host2->pimpl_netcard;
-        routing_platf->getRouteAndLatency(value1, value2, route,nullptr);
-        if (! route->empty()){
-          std::printf("  <route src=\"%s\" dst=\"%s\">\n  ", host1->name().c_str(), host2->name().c_str());
-          for (auto link: *route)
-            std::printf("<link_ctn id=\"%s\"/>",link->getName());
+  for (auto value1 : netcardList) { // Routes from router
+    if (value1->isRouter()) {
+      for (auto value2 : netcardList) { // to router
+        if (value2->isRouter()) {
+          std::printf("  <route src=\"%s\" dst=\"%s\">\n  ", value1->cname(), value2->cname());
+          std::vector<simgrid::surf::LinkImpl*> route;
+          simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(value1, value2, &route, nullptr);
+          for (auto link : route)
+            std::printf("<link_ctn id=\"%s\"/>", link->cname());
           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);
-        if(value2->isRouter()){
-          std::printf("  <route src=\"%s\" dst=\"%s\">\n  ", host1->name().c_str(), dst);
-          std::vector<Link*> *route = new std::vector<Link*>();
-          routing_platf->getRouteAndLatency((sg_netcard_t)value1,(sg_netcard_t)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<simgrid::surf::LinkImpl*> 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->cname());
+        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);
-      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()){
-            std::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 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
-          host2 = hosts[it_dst];
-          std::printf("  <route src=\"%s\" dst=\"%s\">\n  ",src, host2->name().c_str());
-          std::vector<Link*> *route = new std::vector<Link*>();
-          value2 = host2->pimpl_netcard;
-          routing_platf->getRouteAndLatency((sg_netcard_t)value1,(sg_netcard_t)value2,route, nullptr);
-          for(auto link : *route)
-            std::printf("<link_ctn id=\"%s\"/>",link->getName());
-          delete route;
-          std::printf("\n  </route>\n");
-        }
-      }
-    }
+  std::printf("</AS>\n");
+  std::printf("</platform>\n");
+  std::free(hosts);
+  std::free(links);
+}
+
+int main(int argc, char** argv)
+{
+  char* platformFile = nullptr;
+  int timings        = 0;
+
+  xbt_os_timer_t parse_time = xbt_os_timer_new();
+
+  SD_init(&argc, argv);
+
+  xbt_assert(parse_cmdline(&timings, &platformFile, argc, argv) && platformFile,
+             "Invalid command line arguments: expected [--timings] platformFile");
 
-    std::printf("</AS>\n");
-    std::printf("</platform>\n");
-    std::free(hosts);
-    std::free(links);
+  XBT_DEBUG("%d,%s", timings, platformFile);
+
+  create_environment(parse_time, platformFile);
+
+  if (timings) {
+    XBT_INFO("Parsing time: %fs (%zu hosts, %d links)", xbt_os_timer_elapsed(parse_time), sg_host_count(),
+             sg_link_count());
+  } else {
+    dump_platform();
   }
 
   SD_exit();