Don't list the possible routings in DTD. We want to add more w/o changing the DTD

[simgrid.git] / src / surf / xml / surfxml_parseplatf.cpp

diff --git a/src/surf/xml/surfxml_parseplatf.cpp b/src/surf/xml/surfxml_parseplatf.cpp
index 88029c7..638d2f5 100644 (file)
--- a/src/surf/xml/surfxml_parseplatf.cpp
+++ b/src/surf/xml/surfxml_parseplatf.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2006-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. */
@@ -32,9 +32,8 @@ XBT_PRIVATE std::unordered_map<std::string, std::string> trace_connect_list_link
 
 void sg_platf_trace_connect(simgrid::kernel::routing::TraceConnectCreationArgs* trace_connect)
 {
-  xbt_assert(traces_set_list.find(trace_connect->trace) != traces_set_list.end(),
-             "Cannot connect trace %s to %s: trace unknown", trace_connect->trace.c_str(),
-             trace_connect->element.c_str());
+  surf_parse_assert(traces_set_list.find(trace_connect->trace) != traces_set_list.end(),
+         std::string("Cannot connect trace ")+ trace_connect->trace+ " to "+trace_connect->element+": trace unknown");
 
   switch (trace_connect->kind) {
     case simgrid::kernel::routing::TraceConnectKind::HOST_AVAIL:
@@ -62,8 +61,8 @@ void sg_platf_trace_connect(simgrid::kernel::routing::TraceConnectCreationArgs*
 void parse_platform_file(const std::string& file)
 {
   const char* cfile = file.c_str();
-  int len           = strlen(cfile);
-  int is_lua        = len > 3 && file[len - 3] == 'l' && file[len - 2] == 'u' && file[len - 1] == 'a';
+  size_t len        = strlen(cfile);
+  bool is_lua       = len > 3 && file[len - 3] == 'l' && file[len - 2] == 'u' && file[len - 1] == 'a';
 
   sg_platf_init();
 
@@ -100,45 +99,47 @@ void parse_platform_file(const std::string& file)
 
   /* connect all profiles relative to hosts */
   for (auto const& elm : trace_connect_list_host_avail) {
-    xbt_assert(traces_set_list.find(elm.first) != traces_set_list.end(), "Trace %s undefined", elm.first.c_str());
-    simgrid::kernel::profile::Profile* profile = traces_set_list.at(elm.first);
+    surf_parse_assert(traces_set_list.find(elm.first) != traces_set_list.end(), std::string("<trace_connect kind=\"HOST_AVAIL\">: Trace ")+elm.first+" undefined.");
+    auto profile = traces_set_list.at(elm.first);
 
-    simgrid::s4u::Host* host = simgrid::s4u::Host::by_name_or_null(elm.second);
-    xbt_assert(host, "Host %s undefined", elm.second.c_str());
+    auto host = simgrid::s4u::Host::by_name_or_null(elm.second);
+    surf_parse_assert(host, std::string("<trace_connect kind=\"HOST_AVAIL\">: Host ") + elm.second + " undefined.");
     host->set_state_profile(profile);
   }
 
   for (auto const& elm : trace_connect_list_host_speed) {
-    xbt_assert(traces_set_list.find(elm.first) != traces_set_list.end(), "Trace %s undefined", elm.first.c_str());
-    simgrid::kernel::profile::Profile* profile = traces_set_list.at(elm.first);
+    surf_parse_assert(traces_set_list.find(elm.first) != traces_set_list.end(), std::string("<trace_connect kind=\"SPEED\">: Trace ")+elm.first+" undefined.");
+    auto profile = traces_set_list.at(elm.first);
 
-    simgrid::s4u::Host* host = simgrid::s4u::Host::by_name_or_null(elm.second);
-    xbt_assert(host, "Host %s undefined", elm.second.c_str());
+    auto host = simgrid::s4u::Host::by_name_or_null(elm.second);
+    surf_parse_assert(host, std::string("<trace_connect kind=\"SPEED\">: Host ") + elm.second + " undefined.");
     host->set_speed_profile(profile);
   }
 
   for (auto const& elm : trace_connect_list_link_avail) {
-    xbt_assert(traces_set_list.find(elm.first) != traces_set_list.end(), "Trace %s undefined", elm.first.c_str());
-    simgrid::kernel::profile::Profile* profile = traces_set_list.at(elm.first);
+    surf_parse_assert(traces_set_list.find(elm.first) != traces_set_list.end(), std::string("<trace_connect kind=\"LINK_AVAIL\">: Trace ")+elm.first+" undefined.");
+    auto profile = traces_set_list.at(elm.first);
 
-    sg_link_t link = simgrid::s4u::Link::by_name(elm.second);
-    xbt_assert(link, "Link %s undefined", elm.second.c_str());
+    auto link = simgrid::s4u::Link::by_name_or_null(elm.second);
+    surf_parse_assert(link, std::string("<trace_connect kind=\"LINK_AVAIL\">: Link ") + elm.second + " undefined.");
     link->set_state_profile(profile);
   }
 
   for (auto const& elm : trace_connect_list_link_bw) {
-    xbt_assert(traces_set_list.find(elm.first) != traces_set_list.end(), "Trace %s undefined", elm.first.c_str());
-    simgrid::kernel::profile::Profile* profile = traces_set_list.at(elm.first);
-    sg_link_t link                             = simgrid::s4u::Link::by_name(elm.second);
-    xbt_assert(link, "Link %s undefined", elm.second.c_str());
+    surf_parse_assert(traces_set_list.find(elm.first) != traces_set_list.end(), std::string("<trace_connect kind=\"BANDWIDTH\">: Trace ")+elm.first+" undefined.");
+    auto profile = traces_set_list.at(elm.first);
+
+    auto link = simgrid::s4u::Link::by_name_or_null(elm.second);
+    surf_parse_assert(link, std::string("<trace_connect kind=\"BANDWIDTH\">: Link ") + elm.second + " undefined.");
     link->set_bandwidth_profile(profile);
   }
 
   for (auto const& elm : trace_connect_list_link_lat) {
-    xbt_assert(traces_set_list.find(elm.first) != traces_set_list.end(), "Trace %s undefined", elm.first.c_str());
-    simgrid::kernel::profile::Profile* profile = traces_set_list.at(elm.first);
-    sg_link_t link                             = simgrid::s4u::Link::by_name(elm.second);
-    xbt_assert(link, "Link %s undefined", elm.second.c_str());
+    surf_parse_assert(traces_set_list.find(elm.first) != traces_set_list.end(), std::string("<trace_connect kind=\"LATENCY\">: Trace ")+elm.first+" undefined.");
+    auto profile = traces_set_list.at(elm.first);
+
+    auto link = simgrid::s4u::Link::by_name_or_null(elm.second);
+    surf_parse_assert(link, std::string("<trace_connect kind=\"LATENCY\">: Link ") + elm.second + " undefined.");
     link->set_latency_profile(profile);
   }