X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/99a15481d052df2d753805deb62b679b22e59392..a4bb00c8480e534de5fdf1b16dccbda13421a9fa:/src/surf/xml/surfxml_parseplatf.cpp diff --git a/src/surf/xml/surfxml_parseplatf.cpp b/src/surf/xml/surfxml_parseplatf.cpp index 2576e498ba..5152815204 100644 --- a/src/surf/xml/surfxml_parseplatf.cpp +++ b/src/surf/xml/surfxml_parseplatf.cpp @@ -3,23 +3,16 @@ /* 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 "surf/surf.hpp" -#include "src/surf/cpu_interface.hpp" -#include "src/surf/network_interface.hpp" +#include + +#include "src/kernel/resource/CpuImpl.hpp" +#include "src/kernel/resource/LinkImpl.hpp" #include "src/surf/surf_interface.hpp" +#include "src/surf/xml/platf.hpp" #include "src/surf/xml/platf_private.hpp" #include - -#if SIMGRID_HAVE_LUA -#include "src/bindings/lua/simgrid_lua.hpp" - -#include /* Always include this when calling Lua */ -#include /* Always include this when calling Lua */ -#include /* Prototype for luaL_openlibs(), */ -#endif - XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse); /* Trace related stuff */ @@ -33,7 +26,8 @@ XBT_PRIVATE std::unordered_map trace_connect_list_link void sg_platf_trace_connect(simgrid::kernel::routing::TraceConnectCreationArgs* trace_connect) { 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"); + 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: @@ -62,86 +56,65 @@ void parse_platform_file(const std::string& file) { 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(); - /* 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, cfile); // This loads the file without executing it. - - /* Run the script */ - 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 - /* init the flex parser */ surf_parse_open(file); /* Do the actual parsing */ surf_parse(); + /* Get the Engine singleton once and for all*/ + const auto engine = simgrid::s4u::Engine::get_instance(); + /* 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 ")+elm.first+" undefined."); + surf_parse_assert(traces_set_list.find(elm.first) != traces_set_list.end(), + std::string(": Trace ") + elm.first + " undefined."); auto profile = traces_set_list.at(elm.first); - auto host = simgrid::s4u::Host::by_name_or_null(elm.second); + auto host = engine->host_by_name_or_null(elm.second); surf_parse_assert(host, std::string(": Host ") + elm.second + " undefined."); host->set_state_profile(profile); } for (auto const& elm : trace_connect_list_host_speed) { - surf_parse_assert(traces_set_list.find(elm.first) != traces_set_list.end(), std::string(": Trace ")+elm.first+" undefined."); + surf_parse_assert(traces_set_list.find(elm.first) != traces_set_list.end(), + std::string(": Trace ") + elm.first + " undefined."); auto profile = traces_set_list.at(elm.first); - auto host = simgrid::s4u::Host::by_name_or_null(elm.second); + auto host = engine->host_by_name_or_null(elm.second); surf_parse_assert(host, std::string(": Host ") + elm.second + " undefined."); host->set_speed_profile(profile); } for (auto const& elm : trace_connect_list_link_avail) { - surf_parse_assert(traces_set_list.find(elm.first) != traces_set_list.end(), std::string(": Trace ")+elm.first+" undefined."); + surf_parse_assert(traces_set_list.find(elm.first) != traces_set_list.end(), + std::string(": Trace ") + elm.first + " undefined."); auto profile = traces_set_list.at(elm.first); - auto link = simgrid::s4u::Link::by_name_or_null(elm.second); + auto link = engine->link_by_name_or_null(elm.second); surf_parse_assert(link, std::string(": Link ") + elm.second + " undefined."); link->set_state_profile(profile); } for (auto const& elm : trace_connect_list_link_bw) { - surf_parse_assert(traces_set_list.find(elm.first) != traces_set_list.end(), std::string(": Trace ")+elm.first+" undefined."); + surf_parse_assert(traces_set_list.find(elm.first) != traces_set_list.end(), + std::string(": Trace ") + elm.first + " undefined."); auto profile = traces_set_list.at(elm.first); - auto link = simgrid::s4u::Link::by_name_or_null(elm.second); + auto link = engine->link_by_name_or_null(elm.second); surf_parse_assert(link, std::string(": Link ") + elm.second + " undefined."); link->set_bandwidth_profile(profile); } for (auto const& elm : trace_connect_list_link_lat) { - surf_parse_assert(traces_set_list.find(elm.first) != traces_set_list.end(), std::string(": Trace ")+elm.first+" undefined."); + surf_parse_assert(traces_set_list.find(elm.first) != traces_set_list.end(), + std::string(": Trace ") + elm.first + " undefined."); auto profile = traces_set_list.at(elm.first); - auto link = simgrid::s4u::Link::by_name_or_null(elm.second); + auto link = engine->link_by_name_or_null(elm.second); surf_parse_assert(link, std::string(": Link ") + elm.second + " undefined."); link->set_latency_profile(profile); }