X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/321102577020b194dfb7ba89e48687952816849e..9a4a63964b6673ab9ba406356cfdffac2f6d2489:/teshsuite/platforms/flatifier.cpp

diff --git a/teshsuite/platforms/flatifier.cpp b/teshsuite/platforms/flatifier.cpp
index ad9ca31071..728ddfbdfe 100644
--- a/teshsuite/platforms/flatifier.cpp
+++ b/teshsuite/platforms/flatifier.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2022. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2008-2023. 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. */
@@ -13,18 +13,19 @@
 
 #include <algorithm>
 #include <cstring>
+#include <sstream>
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(flatifier, "Logging specific to this platform parsing tool");
 
 namespace sg4 = simgrid::s4u;
 
-static bool parse_cmdline(int* timings, char** platformFile, int argc, char** argv)
+static bool parse_cmdline(bool* timings, char** platformFile, int argc, char** argv)
 {
   bool parse_ok = true;
   for (int i = 1; i < argc; i++) {
     if (std::strlen(argv[i]) > 1 && argv[i][0] == '-' && argv[i][1] == '-') {
       if (not std::strcmp(argv[i], "--timings")) {
-        *timings = 1;
+        *timings = true;
       } else {
         parse_ok = false;
         break;
@@ -33,68 +34,59 @@ static bool parse_cmdline(int* timings, char** platformFile, int argc, char** ar
       *platformFile = argv[i];
     }
   }
-  return parse_ok;
+  return parse_ok && platformFile != nullptr;
 }
 
-static void create_environment(xbt_os_timer_t parse_time, const std::string& platformFile)
+static void dump_hosts(sg4::Engine& engine, std::stringstream& ss)
 {
-  xbt_os_cputimer_start(parse_time);
-  sg4::Engine::get_instance()->load_platform(platformFile);
-  sg4::Engine::get_instance()->seal_platform();
-  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(); });
+  std::vector<sg4::Host*> hosts = engine.get_all_hosts();
 
-  for (auto h : hosts) {
-    std::printf("  <host id=\"%s\" speed=\"%.0f\"", h->get_cname(), h->get_speed());
+  for (auto const* h : hosts) {
+    ss << "  <host id=\"" << h->get_name() << "\" speed=\"" << 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());
-    }
+    if (h->get_core_count() > 1)
+      ss << " core=\"" << 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& [key, _] : *props)
       keys.push_back(key);
     if (not keys.empty()) {
-      std::printf(">\n");
+      ss << ">\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");
+        ss << "    <prop id=\"" << key << "\" value=\"" << props->at(key) << "\"/>\n";
+      ss << "  </host>\n";
     } else {
-      std::printf("/>\n");
+      ss << "/>\n";
     }
   }
 }
 
-static void dump_links()
+static void dump_links(sg4::Engine& engine, std::stringstream& ss)
 {
-  std::vector<sg4::Link*> links = sg4::Engine::get_instance()->get_all_links();
+  std::vector<sg4::Link*> links = engine.get_all_links();
 
   std::sort(links.begin(), links.end(),
             [](const sg4::Link* a, const sg4::Link* b) { return a->get_name() < b->get_name(); });
 
-  for (auto link : links) {
-    std::printf("  <link id=\"");
-
-    std::printf("%s\" bandwidth=\"%.0f\" latency=\"%.9f\"", link->get_cname(), link->get_bandwidth(),
-                link->get_latency());
+  for (auto const* link : links) {
+    ss << "  <link id=\"" << link->get_name() << "\"";
+    ss << " bandwidth=\"" << link->get_bandwidth() << "\"";
+    ss << " latency=\"" << link->get_latency() << "\"";
+    if (link->get_concurrency_limit() != -1)
+      ss << " concurrency=\"" << link->get_concurrency_limit() << "\"";
     if (link->is_shared()) {
-      std::printf("/>\n");
+      ss << "/>\n";
     } else {
-      std::printf(" sharing_policy=\"FATPIPE\"/>\n");
+      ss << " sharing_policy=\"FATPIPE\"/>\n";
     }
   }
 }
 
-static void dump_routers()
+static void dump_routers(sg4::Engine& engine, std::stringstream& ss)
 {
-  std::vector<simgrid::kernel::routing::NetPoint*> netpoints = sg4::Engine::get_instance()->get_all_netpoints();
+  std::vector<simgrid::kernel::routing::NetPoint*> netpoints = engine.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();
@@ -102,43 +94,41 @@ static void dump_routers()
 
   for (auto const& src : netpoints)
     if (src->is_router())
-      std::printf("  <router id=\"%s\"/>\n", src->get_cname());
+      ss << "  <router id=\"" << src->get_name() << "\"/>\n";
 }
 
-static void dump_routes()
+static void dump_routes(sg4::Engine& engine, std::stringstream& ss)
 {
-  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();
+  auto hosts     = engine.get_all_hosts();
+  auto netpoints = engine.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
+  for (auto const* src_host : hosts) { // Routes from host
     const simgrid::kernel::routing::NetPoint* src = src_host->get_netpoint();
-    for (auto dst_host : hosts) { // Routes to host
+    for (auto const* dst_host : hosts) { // Routes to host
       std::vector<simgrid::kernel::resource::StandardLinkImpl*> route;
       const 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());
+      ss << "  <route src=\"" << src_host->get_name() << "\" dst=\"" << dst_host->get_name() << "\">\n  ";
       for (auto const& link : route)
-        std::printf("<link_ctn id=\"%s\"/>", link->get_cname());
-      std::printf("\n  </route>\n");
+        ss << "<link_ctn id=\"" << link->get_name() << "\"/>";
+      ss << "\n  </route>\n";
     }
 
     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());
+      ss << "  <route src=\"" << src_host->get_name() << "\" dst=\"" << dst->get_name() << "\">\n  ";
       std::vector<simgrid::kernel::resource::StandardLinkImpl*> 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");
+        ss << "<link_ctn id=\"" << link->get_name() << "\"/>";
+      ss << "\n  </route>\n";
     }
   }
 
@@ -152,69 +142,65 @@ static void dump_routes()
       simgrid::kernel::routing::NetZoneImpl::get_global_route(value1, value2, route, nullptr);
       if (route.empty())
         continue;
-      std::printf("  <route src=\"%s\" dst=\"%s\">\n  ", value1->get_cname(), value2->get_cname());
+      ss << "  <route src=\"" << value1->get_name() << "\" dst=\"" << value2->get_name() << "\">\n  ";
       for (auto const& link : route)
-        std::printf("<link_ctn id=\"%s\"/>", link->get_cname());
-      std::printf("\n  </route>\n");
+        ss << "<link_ctn id=\"" << link->get_name() << "\"/>";
+      ss << "\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());
+    for (auto const* dst_host : hosts) { // Routes to host
+      ss << "  <route src=\"" << value1->get_name() << "\" dst=\"" << dst_host->get_name() << "\">\n  ";
       std::vector<simgrid::kernel::resource::StandardLinkImpl*> route;
       const 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");
+        ss << "<link_ctn id=\"" << link->get_name() << "\"/>";
+      ss << "\n  </route>\n";
     }
   }
 }
 
-static void dump_platform()
+static std::string dump_platform(sg4::Engine& engine)
 {
-  int version = 4;
-
-  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");
-
-  // Hosts
-  dump_hosts();
-
-  // Routers
-  dump_routers();
-
-  // Links
-  dump_links();
-
-  // Routes
-  dump_routes();
-
-  std::printf("</AS>\n");
-  std::printf("</platform>\n");
+  std::string version = "4.1";
+  std::stringstream ss;
+
+  ss << "<?xml version='1.0'?>\n";
+  ss << "<!DOCTYPE platform SYSTEM \"https://simgrid.org/simgrid.dtd\">\n";
+  ss << "<platform version=\"" << version << "\">\n";
+  ss << "<AS id=\"" << engine.get_netzone_root()->get_name() << "\" routing=\"Full\">\n";
+
+  dump_hosts(engine, ss);
+  dump_routers(engine, ss);
+  dump_links(engine, ss);
+  dump_routes(engine, ss);
+
+  ss << "</AS>\n";
+  ss << "</platform>\n";
+  return ss.str();
 }
 
 int main(int argc, char** argv)
 {
   char* platformFile = nullptr;
-  int timings        = 0;
+  bool timings       = false;
 
   xbt_os_timer_t parse_time = xbt_os_timer_new();
 
   sg4::Engine e(&argc, argv);
 
-  xbt_assert(parse_cmdline(&timings, &platformFile, argc, argv) && platformFile,
+  xbt_assert(parse_cmdline(&timings, &platformFile, argc, argv),
              "Invalid command line arguments: expected [--timings] platformFile");
 
-  XBT_DEBUG("%d,%s", timings, platformFile);
-
-  create_environment(parse_time, platformFile);
+  xbt_os_cputimer_start(parse_time);
+  e.load_platform(platformFile);
+  e.seal_platform();
+  xbt_os_cputimer_stop(parse_time);
 
   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();
+    std::printf("%s", dump_platform(e).c_str());
   }
 
   xbt_os_timer_free(parse_time);