rename the plugins from the command line, and document it

[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 3066653..e3cb42b 100644 (file)
--- a/src/surf/xml/surfxml_parseplatf.cpp
+++ b/src/surf/xml/surfxml_parseplatf.cpp
@@ -3,14 +3,14 @@
 /* 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 "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"
@@ -59,18 +59,6 @@ void sg_platf_trace_connect(simgrid::kernel::routing::TraceConnectCreationArgs*
   }
 }
 
-static int after_config_done;
-void parse_after_config() {
-  if (not after_config_done) {
-    TRACE_start();
-
-    /* Register classical callbacks */
-    storage_register_callbacks();
-
-    after_config_done = 1;
-  }
-}
-
 /* This function acts as a main in the parsing area. */
 void parse_platform_file(const char *file)
 {
@@ -107,7 +95,6 @@ void parse_platform_file(const char *file)
   int parse_status;
 
   /* init the flex parser */
-  after_config_done = 0;
   surf_parse_open(file);
 
   /* Do the actual parsing */
@@ -122,7 +109,7 @@ 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->setStateTrace(trace);
+    cpu->set_state_trace(trace);
   }
 
   for (auto const& elm : trace_connect_list_host_speed) {
@@ -140,25 +127,25 @@ void parse_platform_file(const char *file)
     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);
+    link->set_state_trace(trace);
   }
 
   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);
+    link->set_bandwidth_trace(trace);
   }
 
   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);
+    link->set_latency_trace(trace);
   }
 
   surf_parse_close();