X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f885cdb084519981b6014745cceb194b88aea804..abf3b21ad3f4a19475431076e6e2b26f76d2e7d6:/teshsuite/platforms/flatifier.cpp

diff --git a/teshsuite/platforms/flatifier.cpp b/teshsuite/platforms/flatifier.cpp
index 89ebb22776..bce6303dff 100644
--- a/teshsuite/platforms/flatifier.cpp
+++ b/teshsuite/platforms/flatifier.cpp
@@ -37,146 +37,6 @@ static bool parse_cmdline(bool* timings, char** platformFile, int argc, char** a
   return parse_ok && platformFile != nullptr;
 }
 
-static void dump_hosts(sg4::Engine& engine, std::stringstream& ss)
-{
-  std::vector<sg4::Host*> hosts = engine.get_all_hosts();
-
-  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)
-      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()) {
-      ss << ">\n";
-      std::sort(keys.begin(), keys.end());
-      for (const std::string& key : keys)
-        ss << "    <prop id=\"" << key << "\" value=\"" << props->at(key) << "\"/>\n";
-      ss << "  </host>\n";
-    } else {
-      ss << "/>\n";
-    }
-  }
-}
-
-static void dump_links(sg4::Engine& engine, std::stringstream& ss)
-{
-  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 const* link : links) {
-    ss << "  <link id=\"" << link->get_name() << "\" ";
-    ss << "bandwidth=\"" << link->get_bandwidth() << "\" ";
-    ss << "latency=\"" << link->get_latency() << "\"";
-    if (link->is_shared()) {
-      ss << "/>\n";
-    } else {
-      ss << " sharing_policy=\"FATPIPE\"/>\n";
-    }
-  }
-}
-
-static void dump_routers(sg4::Engine& engine, std::stringstream& ss)
-{
-  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();
-            });
-
-  for (auto const& src : netpoints)
-    if (src->is_router())
-      ss << "  <router id=\"" << src->get_name() << "\"/>\n";
-}
-
-static void dump_routes(sg4::Engine& engine, std::stringstream& ss)
-{
-  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 const* src_host : hosts) { // Routes from host
-    const simgrid::kernel::routing::NetPoint* src = src_host->get_netpoint();
-    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;
-      ss << "  <route src=\"" << src_host->get_name() << "\" dst=\"" << dst_host->get_name() << "\">\n  ";
-      for (auto const& link : route)
-        ss << "<link_ctn id=\"" << link->get_name() << "\"/>";
-      ss << "\n  </route>\n";
-    }
-
-    for (auto const& dst : netpoints) { // to router
-      if (not dst->is_router())
-        continue;
-      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)
-        ss << "<link_ctn id=\"" << link->get_name() << "\"/>";
-      ss << "\n  </route>\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::vector<simgrid::kernel::resource::StandardLinkImpl*> route;
-      simgrid::kernel::routing::NetZoneImpl::get_global_route(value1, value2, route, nullptr);
-      if (route.empty())
-        continue;
-      ss << "  <route src=\"" << value1->get_name() << "\" dst=\"" << value2->get_name() << "\">\n  ";
-      for (auto const& link : route)
-        ss << "<link_ctn id=\"" << link->get_name() << "\"/>";
-      ss << "\n  </route>\n";
-    }
-    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)
-        ss << "<link_ctn id=\"" << link->get_name() << "\"/>";
-      ss << "\n  </route>\n";
-    }
-  }
-}
-
-static std::string dump_platform(sg4::Engine& engine)
-{
-  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;
@@ -198,7 +58,7 @@ int main(int argc, char** argv)
     XBT_INFO("Parsing time: %fs (%zu hosts, %zu links)", xbt_os_timer_elapsed(parse_time), e.get_host_count(),
              e.get_link_count());
   } else {
-    std::printf("%s", dump_platform(e).c_str());
+    std::printf("%s", e.flatify_platform().c_str());
   }
 
   xbt_os_timer_free(parse_time);