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

diff --git a/teshsuite/simdag/flatifier/flatifier.cpp b/teshsuite/simdag/flatifier/flatifier.cpp
index a43c039394..6e18fe0e9e 100644
--- a/teshsuite/simdag/flatifier/flatifier.cpp
+++ b/teshsuite/simdag/flatifier/flatifier.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2008-2020. 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. */
@@ -35,41 +35,39 @@ static bool parse_cmdline(int* timings, char** platformFile, int argc, char** ar
 
 static void create_environment(xbt_os_timer_t parse_time, const char *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);
+  SD_create_environment(platformFile);
+  xbt_os_cputimer_stop(parse_time);
 }
 
 static void dump_hosts()
 {
-  std::map<std::string, std::string>* props = nullptr;
   unsigned int totalHosts = sg_host_count();
   sg_host_t* hosts        = sg_host_list();
   std::sort(hosts, hosts + totalHosts,
-            [](sg_host_t a, sg_host_t b) { return strcmp(sg_host_get_name(a), sg_host_get_name(b)) < 0; });
+            [](const_sg_host_t a, const_sg_host_t b) { return strcmp(sg_host_get_name(a), sg_host_get_name(b)) < 0; });
 
   for (unsigned int i = 0; i < totalHosts; i++) {
     std::printf("  <host id=\"%s\" speed=\"%.0f\"", hosts[i]->get_cname(), sg_host_speed(hosts[i]));
-    props = hosts[i]->getProperties();
-    if (hosts[i]->getCoreCount() > 1) {
-      std::printf(" core=\"%d\"", hosts[i]->getCoreCount());
+    const std::unordered_map<std::string, std::string>* props = hosts[i]->get_properties();
+    if (hosts[i]->get_core_count() > 1) {
+      std::printf(" core=\"%d\"", hosts[i]->get_core_count());
     }
-    if (props && not props->empty()) {
+    // 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");
-      for (auto const& kv : *props) {
-        std::printf("    <prop id=\"%s\" value=\"%s\"/>\n", kv.first.c_str(), kv.second.c_str());
-      }
+      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");
     }
   }
-  std::free(hosts);
+  xbt_free(hosts);
 }
 
 static void dump_links()
@@ -77,14 +75,15 @@ static void dump_links()
   unsigned int totalLinks    = sg_link_count();
   simgrid::s4u::Link** links = sg_link_list();
 
-  std::sort(links, links + totalLinks,
-            [](simgrid::s4u::Link* a, simgrid::s4u::Link* b) { return strcmp(sg_link_name(a), sg_link_name(b)) < 0; });
+  std::sort(links, links + totalLinks, [](const simgrid::s4u::Link* a, const simgrid::s4u::Link* b) {
+    return strcmp(sg_link_name(a), sg_link_name(b)) < 0;
+  });
 
   for (unsigned int i = 0; i < totalLinks; i++) {
-    simgrid::s4u::Link* link = links[i];
+    const simgrid::s4u::Link* link = links[i];
     std::printf("  <link id=\"");
 
-    std::printf("%s\" bandwidth=\"%.0f\" latency=\"%.9f\"", link->get_cname(), link->bandwidth(), link->latency());
+    std::printf("%s\" bandwidth=\"%.0f\" latency=\"%.9f\"", link->get_cname(), link->get_bandwidth(), link->get_latency());
     if (sg_link_is_shared(link)) {
       std::printf("/>\n");
     } else {
@@ -92,21 +91,21 @@ static void dump_links()
     }
   }
 
-  std::free(links);
+  xbt_free(links);
 }
 
 static void dump_routers()
 {
-  std::vector<simgrid::kernel::routing::NetPoint*> netcardList;
-  simgrid::s4u::Engine::getInstance()->getNetpointList(&netcardList);
-  std::sort(netcardList.begin(), netcardList.end(),
-            [](simgrid::kernel::routing::NetPoint* a, simgrid::kernel::routing::NetPoint* b) {
+  std::vector<simgrid::kernel::routing::NetPoint*> netpoints =
+      simgrid::s4u::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& srcCard : netcardList)
-    if (srcCard->is_router())
-      std::printf("  <router id=\"%s\"/>\n", srcCard->get_cname());
+  for (auto const& src : netpoints)
+    if (src->is_router())
+      std::printf("  <router id=\"%s\"/>\n", src->get_cname());
 }
 
 static void dump_routes()
@@ -114,22 +113,22 @@ static void dump_routes()
   unsigned int totalHosts = sg_host_count();
   sg_host_t* hosts        = sg_host_list();
   std::sort(hosts, hosts + totalHosts,
-            [](sg_host_t a, sg_host_t b) { return strcmp(sg_host_get_name(a), sg_host_get_name(b)) < 0; });
-  std::vector<simgrid::kernel::routing::NetPoint*> netcardList;
-  simgrid::s4u::Engine::getInstance()->getNetpointList(&netcardList);
-  std::sort(netcardList.begin(), netcardList.end(),
-            [](simgrid::kernel::routing::NetPoint* a, simgrid::kernel::routing::NetPoint* b) {
+            [](const_sg_host_t a, const_sg_host_t b) { return strcmp(sg_host_get_name(a), sg_host_get_name(b)) < 0; });
+  std::vector<simgrid::kernel::routing::NetPoint*> netpoints =
+      simgrid::s4u::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 (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;
+    const simgrid::s4u::Host* host1         = hosts[it_src];
+    simgrid::kernel::routing::NetPoint* src = host1->get_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::get_global_route(netcardSrc, netcardDst, route, nullptr);
+      const simgrid::s4u::Host* host2 = hosts[it_dst];
+      std::vector<simgrid::kernel::resource::LinkImpl*> route;
+      simgrid::kernel::routing::NetPoint* dst = host2->get_netpoint();
+      simgrid::kernel::routing::NetZoneImpl::get_global_route(src, dst, route, nullptr);
       if (not route.empty()) {
         std::printf("  <route src=\"%s\" dst=\"%s\">\n  ", host1->get_cname(), host2->get_cname());
         for (auto const& link : route)
@@ -138,11 +137,11 @@ static void dump_routes()
       }
     }
 
-    for (auto const& netcardDst : netcardList) { // to router
-      if (netcardDst->is_router()) {
-        std::printf("  <route src=\"%s\" dst=\"%s\">\n  ", host1->get_cname(), netcardDst->get_cname());
-        std::vector<simgrid::surf::LinkImpl*> route;
-        simgrid::kernel::routing::NetZoneImpl::get_global_route(netcardSrc, netcardDst, route, nullptr);
+    for (auto const& dst : netpoints) { // to router
+      if (dst->is_router()) {
+        std::printf("  <route src=\"%s\" dst=\"%s\">\n  ", host1->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");
@@ -150,12 +149,12 @@ static void dump_routes()
     }
   }
 
-  for (auto const& value1 : netcardList) { // Routes from router
+  for (auto const& value1 : netpoints) { // Routes from router
     if (value1->is_router()) {
-      for (auto const& value2 : netcardList) { // to router
+      for (auto const& value2 : netpoints) { // to router
         if (value2->is_router()) {
           std::printf("  <route src=\"%s\" dst=\"%s\">\n  ", value1->get_cname(), value2->get_cname());
-          std::vector<simgrid::surf::LinkImpl*> route;
+          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());
@@ -163,10 +162,10 @@ static void dump_routes()
         }
       }
       for (unsigned int it_dst = 0; it_dst < totalHosts; it_dst++) { // Routes to host
-        simgrid::s4u::Host* host2 = hosts[it_dst];
+        const simgrid::s4u::Host* host2 = hosts[it_dst];
         std::printf("  <route src=\"%s\" dst=\"%s\">\n  ", value1->get_cname(), host2->get_cname());
-        std::vector<simgrid::surf::LinkImpl*> route;
-        simgrid::kernel::routing::NetPoint* netcardDst = host2->pimpl_netpoint;
+        std::vector<simgrid::kernel::resource::LinkImpl*> route;
+        simgrid::kernel::routing::NetPoint* netcardDst = host2->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());
@@ -174,7 +173,7 @@ static void dump_routes()
       }
     }
   }
-  std::free(hosts);
+  xbt_free(hosts);
 }
 
 static void dump_platform()
@@ -182,7 +181,7 @@ static void dump_platform()
   int version = 4;
 
   std::printf("<?xml version='1.0'?>\n");
-  std::printf("<!DOCTYPE platform SYSTEM \"http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd\">\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");
 
@@ -211,8 +210,8 @@ int main(int argc, char** argv)
 
   SD_init(&argc, argv);
 
-  xbt_assert(parse_cmdline(&timings, &platformFile, argc, argv) && platformFile,
-             "Invalid command line arguments: expected [--timings] platformFile");
+  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);