X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/04ad4b7ab779a793f594e0910632f12a511d419a..d809b28aed8516d8e281c908502638df19e784dd:/src/surf/xml/surfxml_parseplatf.cpp diff --git a/src/surf/xml/surfxml_parseplatf.cpp b/src/surf/xml/surfxml_parseplatf.cpp index ba3dab8eee..3edce862c9 100644 --- a/src/surf/xml/surfxml_parseplatf.cpp +++ b/src/surf/xml/surfxml_parseplatf.cpp @@ -1,124 +1,68 @@ -/* Copyright (c) 2006-2015. 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.h" // 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/dict.h" -#include "xbt/log.h" -#include "xbt/misc.h" -#include "xbt/str.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 -extern "C" { -#include "src/bindings/lua/simgrid_lua.h" +#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); -SG_BEGIN_DECL() - -/* - * Allow the cluster tag to mess with the parsing buffer. - * (this will probably become obsolete once the cluster tag do not mess with the parsing callbacks directly) - */ +/* Trace related stuff */ +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; +XBT_PRIVATE std::unordered_map trace_connect_list_link_bw; +XBT_PRIVATE std::unordered_map trace_connect_list_link_lat; -/* This buffer is used to store the original buffer before substituting it by out own buffer. Useful for the cluster tag */ -static std::vector surfxml_bufferstack_stack; -int surfxml_bufferstack_size = 2048; - -static char *old_buff = nullptr; - -XBT_IMPORT_NO_EXPORT(unsigned int) surfxml_buffer_stack_stack_ptr; -XBT_IMPORT_NO_EXPORT(unsigned int) surfxml_buffer_stack_stack[1024]; - -void surfxml_bufferstack_push(int new_one) +void sg_platf_trace_connect(simgrid::kernel::routing::TraceConnectCreationArgs* trace_connect) { - if (!new_one) - old_buff = surfxml_bufferstack; - else { - surfxml_bufferstack_stack.push_back(surfxml_bufferstack); - surfxml_bufferstack = xbt_new0(char, surfxml_bufferstack_size); - } -} - -void surfxml_bufferstack_pop(int new_one) -{ - if (!new_one) - surfxml_bufferstack = old_buff; - else { - free(surfxml_bufferstack); - surfxml_bufferstack = surfxml_bufferstack_stack.back(); - surfxml_bufferstack_stack.pop_back(); - } -} - -/* - * Trace related stuff - */ - -xbt_dict_t traces_set_list = nullptr; -XBT_PRIVATE xbt_dict_t trace_connect_list_host_avail = nullptr; -XBT_PRIVATE xbt_dict_t trace_connect_list_host_speed = nullptr; -XBT_PRIVATE xbt_dict_t trace_connect_list_link_avail = nullptr; -XBT_PRIVATE xbt_dict_t trace_connect_list_link_bw = nullptr; -XBT_PRIVATE xbt_dict_t trace_connect_list_link_lat = nullptr; - -void sg_platf_trace_connect(sg_platf_trace_connect_cbarg_t trace_connect) -{ - xbt_assert(xbt_dict_get_or_null(traces_set_list, trace_connect->trace), - "Cannot connect trace %s to %s: trace unknown", - trace_connect->trace, - trace_connect->element); + 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 SURF_TRACE_CONNECT_KIND_HOST_AVAIL: - xbt_dict_set(trace_connect_list_host_avail, - trace_connect->trace, - xbt_strdup(trace_connect->element), nullptr); - break; - case SURF_TRACE_CONNECT_KIND_SPEED: - xbt_dict_set(trace_connect_list_host_speed, trace_connect->trace, - xbt_strdup(trace_connect->element), nullptr); - break; - case SURF_TRACE_CONNECT_KIND_LINK_AVAIL: - xbt_dict_set(trace_connect_list_link_avail, - trace_connect->trace, - xbt_strdup(trace_connect->element), nullptr); - break; - case SURF_TRACE_CONNECT_KIND_BANDWIDTH: - xbt_dict_set(trace_connect_list_link_bw, - trace_connect->trace, - xbt_strdup(trace_connect->element), nullptr); - break; - case SURF_TRACE_CONNECT_KIND_LATENCY: - xbt_dict_set(trace_connect_list_link_lat, trace_connect->trace, - xbt_strdup(trace_connect->element), nullptr); - break; - default: - surf_parse_error("Cannot connect trace %s to %s: kind of trace unknown", - trace_connect->trace, trace_connect->element); - break; + case simgrid::kernel::routing::TraceConnectKind::HOST_AVAIL: + trace_connect_list_host_avail.insert({trace_connect->trace, trace_connect->element}); + break; + case simgrid::kernel::routing::TraceConnectKind::SPEED: + trace_connect_list_host_speed.insert({trace_connect->trace, trace_connect->element}); + break; + case simgrid::kernel::routing::TraceConnectKind::LINK_AVAIL: + trace_connect_list_link_avail.insert({trace_connect->trace, trace_connect->element}); + break; + case simgrid::kernel::routing::TraceConnectKind::BANDWIDTH: + trace_connect_list_link_bw.insert({trace_connect->trace, trace_connect->element}); + break; + case simgrid::kernel::routing::TraceConnectKind::LATENCY: + trace_connect_list_link_lat.insert({trace_connect->trace, trace_connect->element}); + break; + 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 (!after_config_done) { + if (not after_config_done) { TRACE_start(); /* Register classical callbacks */ @@ -155,91 +99,71 @@ void parse_platform_file(const char *file) xbt_die("Lua call failed. See Log"); } lua_close(L); + return; } - else #endif - { // Use XML parser - - int parse_status; - /* init the flex parser */ - surfxml_buffer_stack_stack_ptr = 1; - surfxml_buffer_stack_stack[0] = 0; - after_config_done = 0; - surf_parse_open(file); + // Use XML parser - traces_set_list = xbt_dict_new_homogeneous(nullptr); - trace_connect_list_host_avail = xbt_dict_new_homogeneous(free); - trace_connect_list_host_speed = xbt_dict_new_homogeneous(free); - trace_connect_list_link_avail = xbt_dict_new_homogeneous(free); - trace_connect_list_link_bw = xbt_dict_new_homogeneous(free); - trace_connect_list_link_lat = xbt_dict_new_homogeneous(free); + int parse_status; - /* Do the actual parsing */ - parse_status = surf_parse(); + /* init the flex parser */ + after_config_done = 0; + surf_parse_open(file); - /* connect all traces relative to hosts */ - xbt_dict_cursor_t cursor = nullptr; - char* trace_name; - char* elm; + /* Do the actual parsing */ + parse_status = surf_parse(); - xbt_dict_foreach(trace_connect_list_host_avail, cursor, trace_name, elm) { - tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name); - xbt_assert(trace, "Trace %s undefined", trace_name); + /* 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); - simgrid::s4u::Host *host = sg_host_by_name(elm); - xbt_assert(host, "Host %s undefined", elm); - simgrid::surf::Cpu *cpu = host->pimpl_cpu; + 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; - cpu->setStateTrace(trace); - } - xbt_dict_foreach(trace_connect_list_host_speed, cursor, trace_name, elm) { - tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name); - xbt_assert(trace, "Trace %s undefined", trace_name); + cpu->setStateTrace(trace); + } - simgrid::s4u::Host *host = sg_host_by_name(elm); - xbt_assert(host, "Host %s undefined", elm); - simgrid::surf::Cpu *cpu = host->pimpl_cpu; + 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); - cpu->setSpeedTrace(trace); - } - xbt_dict_foreach(trace_connect_list_link_avail, cursor, trace_name, elm) { - tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name); - xbt_assert(trace, "Trace %s undefined", trace_name); - sg_link_t link = simgrid::s4u::Link::byName(elm); - xbt_assert(link, "Link %s undefined", elm); - link->setStateTrace(trace); - } + 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; - xbt_dict_foreach(trace_connect_list_link_bw, cursor, trace_name, elm) { - tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name); - xbt_assert(trace, "Trace %s undefined", trace_name); - sg_link_t link = simgrid::s4u::Link::byName(elm); - xbt_assert(link, "Link %s undefined", elm); - link->setBandwidthTrace(trace); - } + cpu->set_speed_trace(trace); + } - xbt_dict_foreach(trace_connect_list_link_lat, cursor, trace_name, elm) { - tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name); - xbt_assert(trace, "Trace %s undefined", trace_name); - sg_link_t link = simgrid::s4u::Link::byName(elm); - xbt_assert(link, "Link %s undefined", elm); - link->setLatencyTrace(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); - /* Free my data */ - xbt_dict_free(&trace_connect_list_host_avail); - xbt_dict_free(&trace_connect_list_host_speed); - xbt_dict_free(&trace_connect_list_link_avail); - xbt_dict_free(&trace_connect_list_link_bw); - xbt_dict_free(&trace_connect_list_link_lat); - xbt_dict_free(&traces_set_list); + 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); + } - surf_parse_close(); + 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::by_name(elm.second.c_str()); + xbt_assert(link, "Link %s undefined", elm.second.c_str()); + link->setBandwidthTrace(trace); + } - if (parse_status) - surf_parse_error("Parse error in %s", 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::by_name(elm.second.c_str()); + xbt_assert(link, "Link %s undefined", elm.second.c_str()); + link->setLatencyTrace(trace); } -} -SG_END_DECL() + surf_parse_close(); + + if (parse_status) + surf_parse_error(std::string("Parse error in ") + file); +}