simplication and uniformization

[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 ddcc677..14767ed 100644 (file)
--- a/src/surf/xml/surfxml_parseplatf.cpp
+++ b/src/surf/xml/surfxml_parseplatf.cpp
@@ -1,26 +1,24 @@
-/* Copyright (c) 2006-2017. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2006-2018. 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. */
 
-#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
-extern "C" {
 #include "src/bindings/lua/simgrid_lua.hpp"
 
 #include <lua.h>                /* Always include this when calling Lua */
 #include <lauxlib.h>            /* Always include this when calling Lua */
 #include <lualib.h>             /* Prototype for luaL_openlibs(), */
-}
 #endif
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse);
@@ -33,27 +31,26 @@ XBT_PRIVATE std::unordered_map<std::string, std::string> trace_connect_list_link
 XBT_PRIVATE std::unordered_map<std::string, std::string> trace_connect_list_link_bw;
 XBT_PRIVATE std::unordered_map<std::string, std::string> trace_connect_list_link_lat;
 
-extern "C" {
-void sg_platf_trace_connect(TraceConnectCreationArgs* trace_connect)
+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());
 
   switch (trace_connect->kind) {
-    case TraceConnectKind::HOST_AVAIL:
+    case simgrid::kernel::routing::TraceConnectKind::HOST_AVAIL:
       trace_connect_list_host_avail.insert({trace_connect->trace, trace_connect->element});
       break;
-    case TraceConnectKind::SPEED:
+    case simgrid::kernel::routing::TraceConnectKind::SPEED:
       trace_connect_list_host_speed.insert({trace_connect->trace, trace_connect->element});
       break;
-    case TraceConnectKind::LINK_AVAIL:
+    case simgrid::kernel::routing::TraceConnectKind::LINK_AVAIL:
       trace_connect_list_link_avail.insert({trace_connect->trace, trace_connect->element});
       break;
-    case TraceConnectKind::BANDWIDTH:
+    case simgrid::kernel::routing::TraceConnectKind::BANDWIDTH:
       trace_connect_list_link_bw.insert({trace_connect->trace, trace_connect->element});
       break;
-    case TraceConnectKind::LATENCY:
+    case simgrid::kernel::routing::TraceConnectKind::LATENCY:
       trace_connect_list_link_lat.insert({trace_connect->trace, trace_connect->element});
       break;
     default:
@@ -68,9 +65,6 @@ void parse_after_config() {
   if (not after_config_done) {
     TRACE_start();
 
-    /* Register classical callbacks */
-    storage_register_callbacks();
-
     after_config_done = 1;
   }
 }
@@ -137,14 +131,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);
   }
@@ -152,7 +146,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);
   }
@@ -160,7 +154,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);
   }
@@ -170,4 +164,3 @@ void parse_platform_file(const char *file)
   if (parse_status)
     surf_parse_error(std::string("Parse error in ") + file);
 }
-}