X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a9786d0c1612118b9fc2304ea7aa36b67b232267..694e679d6ec87a97d8347fa7d64617d2a7ff8700:/teshsuite/simdag/flatifier/flatifier.cpp?ds=sidebyside

diff --git a/teshsuite/simdag/flatifier/flatifier.cpp b/teshsuite/simdag/flatifier/flatifier.cpp
index 7d1b4999c3..46668da675 100644
--- a/teshsuite/simdag/flatifier/flatifier.cpp
+++ b/teshsuite/simdag/flatifier/flatifier.cpp
@@ -1,214 +1,221 @@
-/* Copyright (c) 2008-2015. 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. */
 
-#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 "simgrid/kernel/routing/NetPoint.hpp"
+#include "simgrid/s4u/Engine.hpp"
+#include "simgrid/s4u/Host.hpp"
+#include "simgrid/s4u/Link.hpp"
 #include "src/surf/network_interface.hpp"
 
+#include <algorithm>
+#include <cstring>
 
 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 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 std::strcmp(sg_link_name(*(SD_link_t *) n1),sg_link_name(*(SD_link_t *) n2));
-}
+namespace sg4 = simgrid::s4u;
 
-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")) {
+      if (not 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)
+static void create_environment(xbt_os_timer_t parse_time, const std::string& platformFile)
 {
-  try {
-    xbt_os_cputimer_start(parse_time);
-    SD_create_environment(platformFile);
-    xbt_os_cputimer_stop(parse_time);
-  }
-  catch (std::exception& e) {
-    xbt_die("Error while loading %s: %s", platformFile, e.what());
+  xbt_os_cputimer_start(parse_time);
+  sg4::Engine::get_instance()->load_platform(platformFile);
+  xbt_os_cputimer_stop(parse_time);
+}
+
+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) {
+    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) {
+      std::printf(" core=\"%d\"", h->get_core_count());
+    }
+    // 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);
+    if (not keys.empty()) {
+      std::printf(">\n");
+      std::sort(keys.begin(), keys.end());
+      for (const std::string& key : keys)
+        std::printf("    <prop id=\"%s\" value=\"%s\"/>\n", key.c_str(), props->at(key).c_str());
+      std::printf("  </host>\n");
+    } else {
+      std::printf("/>\n");
+    }
   }
 }
 
-int main(int argc, char **argv)
+static void dump_links()
 {
-  char *platformFile = nullptr;
-  int timings=0;
-  int version = 4;
-  unsigned int i;
-  xbt_dict_t props = nullptr;
-  xbt_dict_cursor_t cursor = nullptr;
-  char *key, *data;
-  sg_netcard_t value1;
-  sg_netcard_t value2;
+  std::vector<sg4::Link*> links = sg4::Engine::get_instance()->get_all_links();
 
-  xbt_os_timer_t parse_time = xbt_os_timer_new();
+  std::sort(links.begin(), links.end(), [](const sg4::Link* a, const sg4::Link* b) {
+    return a->get_name() < b->get_name();
+  });
 
-  SD_init(&argc, argv);
+  for (auto link : links) {
+    std::printf("  <link id=\"");
 
-  if (parse_cmdline(&timings, &platformFile, argc, argv) || !platformFile) {
-    xbt_die("Invalid command line arguments: expected [--timings] platformFile");
+    std::printf("%s\" bandwidth=\"%.0f\" latency=\"%.9f\"", link->get_cname(), link->get_bandwidth(), link->get_latency());
+    if (link->is_shared()) {
+      std::printf("/>\n");
+    } else {
+      std::printf(" sharing_policy=\"FATPIPE\"/>\n");
+    }
   }
+}
 
-  XBT_DEBUG("%d,%s", timings, platformFile);
+static void dump_routers()
+{
+  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 const& src : netpoints)
+    if (src->is_router())
+      std::printf("  <router id=\"%s\"/>\n", src->get_cname());
+}
 
-  create_environment(parse_time, platformFile);
+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
+    simgrid::kernel::routing::NetPoint* src = src_host->get_netpoint();
+    for (auto dst_host : hosts) { // Routes to host
+      std::vector<simgrid::kernel::resource::LinkImpl*> route;
+      simgrid::kernel::routing::NetPoint* dst = dst_host->get_netpoint();
+      simgrid::kernel::routing::NetZoneImpl::get_global_route(src, dst, route, nullptr);
+      if (route.empty())
+        continue;
+      std::printf("  <route src=\"%s\" dst=\"%s\">\n  ", src_host->get_cname(), dst_host->get_cname());
+      for (auto const& link : route)
+        std::printf("<link_ctn id=\"%s\"/>", link->get_cname());
+      std::printf("\n  </route>\n");
+    }
 
-  std::vector<simgrid::kernel::routing::NetCard*> netcardList;
-  simgrid::s4u::Engine::instance()->netcardList(&netcardList);
+    for (auto const& dst : netpoints) { // to router
+      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;
+      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 (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");
-      }
+  for (auto const& value1 : netpoints) { // Routes from router
+    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 (auto 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;
+      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)
+        std::printf("<link_ctn id=\"%s\"/>", link->get_cname());
+      std::printf("\n  </route>\n");
+    }
+  }
+}
 
-    // Routers
-    for (auto srcCard : netcardList)
-      if (srcCard->isRouter())
-        std::printf("  <router id=\"%s\"/>\n", srcCard->cname());
+static void dump_platform()
+{
+  int version = 4;
 
-    // Links
-    unsigned int totalLinks = sg_link_count();
-    SD_link_t *links = sg_link_list();
+  std::printf("<?xml version='1.0'?>\n");
+  std::printf("<!DOCTYPE platform SYSTEM \"https://simgrid.org/simgrid.dtd\">\n");
+  std::printf("<platform version=\"%d\">\n", version);
+  std::printf("<AS id=\"AS0\" routing=\"Full\">\n");
 
-    std::qsort((void *) links, totalLinks, sizeof(SD_link_t), name_compare_links);
+  // Hosts
+  dump_hosts();
 
-    for (i = 0; i < totalLinks; i++) {
-      std::printf("  <link id=\"");
+  // Routers
+  dump_routers();
 
-      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");
-      }
-    }
+  // Links
+  dump_links();
 
-    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 = host2->pimpl_netcard;
-        simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(value1, value2, 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->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)
-            std::printf("<link_ctn id=\"%s\"/>",link->getName());
-          delete route;
-          std::printf("\n  </route>\n");
-        }
-      }
-    }
+  // Routes
+  dump_routes();
 
-    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<Link*>* route = new std::vector<Link*>();
-            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::printf("<link_ctn id=\"%s\"/>",link->getName());
-          delete route;
-          std::printf("\n  </route>\n");
-        }
-      }
-    }
+  std::printf("</AS>\n");
+  std::printf("</platform>\n");
+}
+
+int main(int argc, char** argv)
+{
+  char* platformFile = nullptr;
+  int timings        = 0;
 
-    std::printf("</AS>\n");
-    std::printf("</platform>\n");
-    std::free(hosts);
-    std::free(links);
+  xbt_os_timer_t parse_time = xbt_os_timer_new();
+
+  sg4::Engine e(&argc, argv);
+
+  if (not parse_cmdline(&timings, &platformFile, argc, argv) || not platformFile)
+    xbt_die("Invalid command line arguments: expected [--timings] platformFile");
+
+  XBT_DEBUG("%d,%s", timings, platformFile);
+
+  create_environment(parse_time, platformFile);
+
+  if (timings) {
+    XBT_INFO("Parsing time: %fs (%zu hosts, %zu links)", xbt_os_timer_elapsed(parse_time), e.get_host_count(),
+             e.get_link_count());
+  } else {
+    dump_platform();
   }
 
-  SD_exit();
   xbt_os_timer_free(parse_time);
 
   return 0;