X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bfa4e95e4538099a54c5afedd403264c8d99adb6..c1194401ce4a41ff54a7591f4cf33c9ce2756978:/src/surf/xml/surfxml_parseplatf.cpp

diff --git a/src/surf/xml/surfxml_parseplatf.cpp b/src/surf/xml/surfxml_parseplatf.cpp
index ad85acb678..8fb038afa6 100644
--- a/src/surf/xml/surfxml_parseplatf.cpp
+++ b/src/surf/xml/surfxml_parseplatf.cpp
@@ -55,12 +55,11 @@ void sg_platf_trace_connect(simgrid::kernel::routing::TraceConnectCreationArgs*
     default:
       surf_parse_error(std::string("Cannot connect trace ") + trace_connect->trace + " to " + trace_connect->element +
                        ": unknown kind of trace");
-      break;
   }
 }
 
 /* This function acts as a main in the parsing area. */
-void parse_platform_file(std::string file)
+void parse_platform_file(const std::string& file)
 {
   const char* cfile = file.c_str();
   int len           = strlen(cfile);
@@ -106,7 +105,7 @@ void parse_platform_file(std::string file)
     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);
 
-    simgrid::s4u::Host* host = sg_host_by_name(elm.second.c_str());
+    simgrid::s4u::Host* host = simgrid::s4u::Host::by_name_or_null(elm.second);
     xbt_assert(host, "Host %s undefined", elm.second.c_str());
     simgrid::surf::Cpu* cpu = host->pimpl_cpu;
 
@@ -117,7 +116,7 @@ void parse_platform_file(std::string file)
     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);
 
-    simgrid::s4u::Host* host = sg_host_by_name(elm.second.c_str());
+    simgrid::s4u::Host* host = simgrid::s4u::Host::by_name_or_null(elm.second);
     xbt_assert(host, "Host %s undefined", elm.second.c_str());
     simgrid::surf::Cpu* cpu = host->pimpl_cpu;
 
@@ -128,7 +127,7 @@ void parse_platform_file(std::string file)
     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.c_str());
+    sg_link_t link = simgrid::s4u::Link::by_name(elm.second);
     xbt_assert(link, "Link %s undefined", elm.second.c_str());
     link->set_state_profile(profile);
   }
@@ -136,7 +135,7 @@ void parse_platform_file(std::string file)
   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.c_str());
+    sg_link_t link                             = simgrid::s4u::Link::by_name(elm.second);
     xbt_assert(link, "Link %s undefined", elm.second.c_str());
     link->set_bandwidth_profile(profile);
   }
@@ -144,7 +143,7 @@ void parse_platform_file(std::string file)
   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.c_str());
+    sg_link_t link                             = simgrid::s4u::Link::by_name(elm.second);
     xbt_assert(link, "Link %s undefined", elm.second.c_str());
     link->set_latency_profile(profile);
   }