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

diff --git a/src/surf/xml/surfxml_parseplatf.cpp b/src/surf/xml/surfxml_parseplatf.cpp
index 479475007d..8fb038afa6 100644
--- a/src/surf/xml/surfxml_parseplatf.cpp
+++ b/src/surf/xml/surfxml_parseplatf.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2006-2019. 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. */
@@ -23,7 +23,7 @@
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse);
 
 /* Trace related stuff */
-XBT_PRIVATE std::unordered_map<std::string, tmgr_trace_t> traces_set_list;
+XBT_PRIVATE std::unordered_map<std::string, simgrid::kernel::profile::Profile*> traces_set_list;
 XBT_PRIVATE std::unordered_map<std::string, std::string> trace_connect_list_host_avail;
 XBT_PRIVATE std::unordered_map<std::string, std::string> trace_connect_list_host_speed;
 XBT_PRIVATE std::unordered_map<std::string, std::string> trace_connect_list_link_avail;
@@ -55,27 +55,24 @@ 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)
 {
-#if SIMGRID_HAVE_LUA
   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';
-#endif
 
   sg_platf_init();
 
-#if SIMGRID_HAVE_LUA
   /* Check if file extension is "lua". If so, we will use
    * the lua bindings to parse the platform file (since it is
    * written in lua). If not, we will use the (old?) XML parser
    */
   if (is_lua) {
+#if SIMGRID_HAVE_LUA
     lua_State* L = luaL_newstate();
     luaL_openlibs(L);
 
@@ -88,8 +85,10 @@ void parse_platform_file(std::string file)
     }
     lua_close(L);
     return;
-  }
+#else
+    XBT_WARN("This looks like a lua platform file, but your SimGrid was not compiled with lua. Loading it as XML.");
 #endif
+  }
 
   // Use XML parser
 
@@ -101,52 +100,52 @@ void parse_platform_file(std::string file)
   /* Do the actual parsing */
   parse_status = surf_parse();
 
-  /* connect all traces relative to hosts */
+  /* 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());
-    tmgr_trace_t trace = traces_set_list.at(elm.first);
+    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;
 
-    cpu->set_state_trace(trace);
+    cpu->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());
-    tmgr_trace_t trace = traces_set_list.at(elm.first);
+    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;
 
-    cpu->set_speed_trace(trace);
+    cpu->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());
-    tmgr_trace_t trace = traces_set_list.at(elm.first);
+    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_trace(trace);
+    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());
-    tmgr_trace_t trace = traces_set_list.at(elm.first);
-    sg_link_t link     = simgrid::s4u::Link::by_name(elm.second.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());
-    link->set_bandwidth_trace(trace);
+    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());
-    tmgr_trace_t trace = traces_set_list.at(elm.first);
-    sg_link_t link     = simgrid::s4u::Link::by_name(elm.second.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());
-    link->set_latency_trace(trace);
+    link->set_latency_profile(profile);
   }
 
   surf_parse_close();