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

diff --git a/src/surf/xml/surfxml_parseplatf.cpp b/src/surf/xml/surfxml_parseplatf.cpp
index a8d085c5cc..674d7f5daa 100644
--- a/src/surf/xml/surfxml_parseplatf.cpp
+++ b/src/surf/xml/surfxml_parseplatf.cpp
@@ -1,43 +1,40 @@
-/* Copyright (c) 2006-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2006-2021. 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 "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 "surf/surf.hpp"
+#include <simgrid/s4u/Engine.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);
 
 /* 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;
 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(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());
+  surf_parse_assert(traces_set_list.find(trace_connect->trace) != traces_set_list.end(),
+         std::string("Cannot connect trace ")+ trace_connect->trace+ " to "+trace_connect->element+": trace unknown");
 
   switch (trace_connect->kind) {
     case simgrid::kernel::routing::TraceConnectKind::HOST_AVAIL:
@@ -58,115 +55,100 @@ 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;
-  }
-}
-
-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)
+void parse_platform_file(const std::string& file)
 {
-#if SIMGRID_HAVE_LUA
-  int len    = (file == nullptr ? 0 : strlen(file));
-  int is_lua = (file != nullptr && len > 3 && file[len - 3] == 'l' && file[len - 2] == 'u' && file[len - 1] == 'a');
-#endif
+  const char* cfile = file.c_str();
+  size_t len        = strlen(cfile);
+  bool is_lua       = len > 3 && file[len - 3] == 'l' && file[len - 2] == 'u' && file[len - 1] == 'a';
 
   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
+    static bool already_warned = false;
+    if (not already_warned) { // XBT_ATTRIB_DEPRECATED_v332
+      XBT_WARN("You are using a lua platform file. This feature is deprecated and will disappear after SimGrid v3.31.");
+      already_warned = true;
+    }
     lua_State* L = luaL_newstate();
     luaL_openlibs(L);
 
-    luaL_loadfile(L, file); // This loads the file without executing it.
+    luaL_loadfile(L, cfile); // This loads the file without executing it.
 
     /* Run the script */
-    if (lua_pcall(L, 0, 0, 0)) {
-      XBT_ERROR("FATAL ERROR:\n  %s: %s\n\n", "Lua call failed. Error message:", lua_tostring(L, -1));
-      xbt_die("Lua call failed. See Log");
-    }
+    xbt_assert(lua_pcall(L, 0, 0, 0) == 0, "FATAL ERROR:\n  %s: %s\n\n", "Lua call failed. Error message:",
+               lua_tostring(L, -1));
     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
 
-  int parse_status;
-
   /* init the flex parser */
-  after_config_done = 0;
   surf_parse_open(file);
 
   /* Do the actual parsing */
-  parse_status = surf_parse();
+  surf_parse();
 
-  /* connect all traces 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);
+  /* Get the Engine singleton once and for all*/
+  const auto engine = simgrid::s4u::Engine::get_instance();
 
-    simgrid::s4u::Host* host = sg_host_by_name(elm.second.c_str());
-    xbt_assert(host, "Host %s undefined", elm.second.c_str());
-    simgrid::surf::Cpu* cpu = host->pimpl_cpu;
+  /* connect all profiles relative to hosts */
+  for (auto const& elm : trace_connect_list_host_avail) {
+    surf_parse_assert(traces_set_list.find(elm.first) != traces_set_list.end(), std::string("<trace_connect kind=\"HOST_AVAIL\">: Trace ")+elm.first+" undefined.");
+    auto profile = traces_set_list.at(elm.first);
 
-    cpu->setStateTrace(trace);
+    auto host = engine->host_by_name_or_null(elm.second);
+    surf_parse_assert(host, std::string("<trace_connect kind=\"HOST_AVAIL\">: Host ") + elm.second + " undefined.");
+    host->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::s4u::Host* host = sg_host_by_name(elm.second.c_str());
-    xbt_assert(host, "Host %s undefined", elm.second.c_str());
-    simgrid::surf::Cpu* cpu = host->pimpl_cpu;
+    surf_parse_assert(traces_set_list.find(elm.first) != traces_set_list.end(), std::string("<trace_connect kind=\"SPEED\">: Trace ")+elm.first+" undefined.");
+    auto profile = traces_set_list.at(elm.first);
 
-    cpu->setSpeedTrace(trace);
+    auto host = engine->host_by_name_or_null(elm.second);
+    surf_parse_assert(host, std::string("<trace_connect kind=\"SPEED\">: Host ") + elm.second + " undefined.");
+    host->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);
+    surf_parse_assert(traces_set_list.find(elm.first) != traces_set_list.end(), std::string("<trace_connect kind=\"LINK_AVAIL\">: Trace ")+elm.first+" undefined.");
+    auto profile = traces_set_list.at(elm.first);
 
-    sg_link_t link = simgrid::s4u::Link::byName(elm.second.c_str());
-    xbt_assert(link, "Link %s undefined", elm.second.c_str());
-    link->setStateTrace(trace);
+    auto link = engine->link_by_name_or_null(elm.second);
+    surf_parse_assert(link, std::string("<trace_connect kind=\"LINK_AVAIL\">: Link ") + elm.second + " undefined.");
+    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::byName(elm.second.c_str());
-    xbt_assert(link, "Link %s undefined", elm.second.c_str());
-    link->setBandwidthTrace(trace);
+    surf_parse_assert(traces_set_list.find(elm.first) != traces_set_list.end(), std::string("<trace_connect kind=\"BANDWIDTH\">: Trace ")+elm.first+" undefined.");
+    auto profile = traces_set_list.at(elm.first);
+
+    auto link = engine->link_by_name_or_null(elm.second);
+    surf_parse_assert(link, std::string("<trace_connect kind=\"BANDWIDTH\">: Link ") + elm.second + " undefined.");
+    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::byName(elm.second.c_str());
-    xbt_assert(link, "Link %s undefined", elm.second.c_str());
-    link->setLatencyTrace(trace);
+    surf_parse_assert(traces_set_list.find(elm.first) != traces_set_list.end(), std::string("<trace_connect kind=\"LATENCY\">: Trace ")+elm.first+" undefined.");
+    auto profile = traces_set_list.at(elm.first);
+
+    auto link = engine->link_by_name_or_null(elm.second);
+    surf_parse_assert(link, std::string("<trace_connect kind=\"LATENCY\">: Link ") + elm.second + " undefined.");
+    link->set_latency_profile(profile);
   }
 
   surf_parse_close();
-
-  if (parse_status)
-    surf_parse_error(std::string("Parse error in ") + file);
-}
 }