X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/88fad0aaff9eb463f048bfdfe4ad6218aba44ddb..c1194401ce4a41ff54a7591f4cf33c9ce2756978:/src/surf/xml/surfxml_parseplatf.cpp diff --git a/src/surf/xml/surfxml_parseplatf.cpp b/src/surf/xml/surfxml_parseplatf.cpp index d287f06c6e..8fb038afa6 100644 --- a/src/surf/xml/surfxml_parseplatf.cpp +++ b/src/surf/xml/surfxml_parseplatf.cpp @@ -1,16 +1,16 @@ -/* Copyright (c) 2006-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-2019. 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 "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 -#include "src/surf/xml/platf_private.hpp" #if SIMGRID_HAVE_LUA #include "src/bindings/lua/simgrid_lua.hpp" @@ -23,7 +23,7 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse); /* Trace related stuff */ -XBT_PRIVATE std::unordered_map traces_set_list; +XBT_PRIVATE std::unordered_map traces_set_list; XBT_PRIVATE std::unordered_map trace_connect_list_host_avail; XBT_PRIVATE std::unordered_map trace_connect_list_host_speed; XBT_PRIVATE std::unordered_map trace_connect_list_link_avail; @@ -55,42 +55,28 @@ 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(); + int len = strlen(cfile); + int 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 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)) { @@ -99,66 +85,67 @@ void parse_platform_file(const char *file) } 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(); - /* connect all traces relative to hosts */ + /* connect all profiles 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); + simgrid::kernel::profile::Profile* profile = traces_set_list.at(elm.first); - simgrid::s4u::Host* host = sg_host_by_name(elm.second.c_str()); + simgrid::s4u::Host* host = simgrid::s4u::Host::by_name_or_null(elm.second); xbt_assert(host, "Host %s undefined", elm.second.c_str()); simgrid::surf::Cpu* cpu = host->pimpl_cpu; - cpu->setStateTrace(trace); + cpu->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::kernel::profile::Profile* profile = traces_set_list.at(elm.first); - simgrid::s4u::Host* host = sg_host_by_name(elm.second.c_str()); + simgrid::s4u::Host* host = simgrid::s4u::Host::by_name_or_null(elm.second); xbt_assert(host, "Host %s undefined", elm.second.c_str()); simgrid::surf::Cpu* cpu = host->pimpl_cpu; - cpu->setSpeedTrace(trace); + cpu->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); + simgrid::kernel::profile::Profile* profile = 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); xbt_assert(link, "Link %s undefined", elm.second.c_str()); - link->setStateTrace(trace); + 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()); + simgrid::kernel::profile::Profile* profile = traces_set_list.at(elm.first); + sg_link_t link = simgrid::s4u::Link::by_name(elm.second); xbt_assert(link, "Link %s undefined", elm.second.c_str()); - link->setBandwidthTrace(trace); + 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()); + simgrid::kernel::profile::Profile* profile = traces_set_list.at(elm.first); + sg_link_t link = simgrid::s4u::Link::by_name(elm.second); xbt_assert(link, "Link %s undefined", elm.second.c_str()); - link->setLatencyTrace(trace); + link->set_latency_profile(profile); } surf_parse_close();