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

diff --git a/src/surf/xml/surfxml_parseplatf.cpp b/src/surf/xml/surfxml_parseplatf.cpp
index d287f06c6e..3edce862c9 100644
--- a/src/surf/xml/surfxml_parseplatf.cpp
+++ b/src/surf/xml/surfxml_parseplatf.cpp
@@ -3,14 +3,15 @@
 /* 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. */
 
-#include "src/instr/instr_private.hpp" // TRACE_start(). FIXME: remove by subscribing tracing to the surf signals
+#include "surf/surf.hpp"
+#include "instr/instr_interface.hpp" // TRACE_start(). FIXME: remove by subscribing tracing to the surf signals
 #include "src/surf/cpu_interface.hpp"
 #include "src/surf/network_interface.hpp"
-#include "xbt/log.h"
-#include "xbt/misc.h"
+#include "src/surf/surf_interface.hpp"
+#include "src/surf/xml/platf_private.hpp"
+
 #include <vector>
 
-#include "src/surf/xml/platf_private.hpp"
 
 #if SIMGRID_HAVE_LUA
 #include "src/bindings/lua/simgrid_lua.hpp"
@@ -133,14 +134,14 @@ void parse_platform_file(const char *file)
     xbt_assert(host, "Host %s undefined", elm.second.c_str());
     simgrid::surf::Cpu* cpu = host->pimpl_cpu;
 
-    cpu->setSpeedTrace(trace);
+    cpu->set_speed_trace(trace);
   }
 
   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);
 
-    sg_link_t link = simgrid::s4u::Link::byName(elm.second.c_str());
+    sg_link_t link = simgrid::s4u::Link::by_name(elm.second.c_str());
     xbt_assert(link, "Link %s undefined", elm.second.c_str());
     link->setStateTrace(trace);
   }
@@ -148,7 +149,7 @@ void parse_platform_file(const char *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());
     tmgr_trace_t trace = traces_set_list.at(elm.first);
-    sg_link_t link     = simgrid::s4u::Link::byName(elm.second.c_str());
+    sg_link_t link     = simgrid::s4u::Link::by_name(elm.second.c_str());
     xbt_assert(link, "Link %s undefined", elm.second.c_str());
     link->setBandwidthTrace(trace);
   }
@@ -156,7 +157,7 @@ void parse_platform_file(const char *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());
     tmgr_trace_t trace = traces_set_list.at(elm.first);
-    sg_link_t link     = simgrid::s4u::Link::byName(elm.second.c_str());
+    sg_link_t link     = simgrid::s4u::Link::by_name(elm.second.c_str());
     xbt_assert(link, "Link %s undefined", elm.second.c_str());
     link->setLatencyTrace(trace);
   }