X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c4c51bdbf0da9491133f9d42f16b11da211b664b..36fa571a13985879dc627c70ecc2340af606aa42:/src/surf/xml/surfxml_parseplatf.cpp diff --git a/src/surf/xml/surfxml_parseplatf.cpp b/src/surf/xml/surfxml_parseplatf.cpp index d87f73c1f3..5890b6e44a 100644 --- a/src/surf/xml/surfxml_parseplatf.cpp +++ b/src/surf/xml/surfxml_parseplatf.cpp @@ -4,17 +4,18 @@ /* 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 "xbt/misc.h" -#include "xbt/log.h" -#include "xbt/str.h" -#include "xbt/dict.h" +#include "src/instr/instr_private.h" // TRACE_start(). FIXME: remove by subscribing tracing to the surf signals #include "src/surf/cpu_interface.hpp" #include "src/surf/network_interface.hpp" -#include "src/instr/instr_private.h" // TRACE_start(). FIXME: remove by subscribing tracing to the surf signals +#include "xbt/dict.h" +#include "xbt/log.h" +#include "xbt/misc.h" +#include "xbt/str.h" +#include -#include "src/surf/xml/platf.hpp" +#include "src/surf/xml/platf_private.hpp" -#ifdef HAVE_LUA +#if HAVE_LUA extern "C" { #include "src/bindings/lua/simgrid_lua.h" @@ -26,16 +27,18 @@ extern "C" { 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) */ /* This buffer is used to store the original buffer before substituting it by out own buffer. Useful for the cluster tag */ -static xbt_dynar_t surfxml_bufferstack_stack = NULL; +static std::vector surfxml_bufferstack_stack; int surfxml_bufferstack_size = 2048; -static char *old_buff = NULL; +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]; @@ -45,7 +48,7 @@ void surfxml_bufferstack_push(int new_one) if (!new_one) old_buff = surfxml_bufferstack; else { - xbt_dynar_push(surfxml_bufferstack_stack, &surfxml_bufferstack); + surfxml_bufferstack_stack.push_back(surfxml_bufferstack); surfxml_bufferstack = xbt_new0(char, surfxml_bufferstack_size); } } @@ -56,7 +59,8 @@ void surfxml_bufferstack_pop(int new_one) surfxml_bufferstack = old_buff; else { free(surfxml_bufferstack); - xbt_dynar_pop(surfxml_bufferstack_stack, &surfxml_bufferstack); + surfxml_bufferstack = surfxml_bufferstack_stack.back(); + surfxml_bufferstack_stack.pop_back(); } } @@ -64,12 +68,12 @@ void surfxml_bufferstack_pop(int new_one) * Trace related stuff */ -xbt_dict_t traces_set_list = NULL; -XBT_PRIVATE xbt_dict_t trace_connect_list_host_avail = NULL; -XBT_PRIVATE xbt_dict_t trace_connect_list_host_speed = NULL; -XBT_PRIVATE xbt_dict_t trace_connect_list_link_avail = NULL; -XBT_PRIVATE xbt_dict_t trace_connect_list_link_bw = NULL; -XBT_PRIVATE xbt_dict_t trace_connect_list_link_lat = NULL; +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) { @@ -82,25 +86,25 @@ void sg_platf_trace_connect(sg_platf_trace_connect_cbarg_t trace_connect) case SURF_TRACE_CONNECT_KIND_HOST_AVAIL: xbt_dict_set(trace_connect_list_host_avail, trace_connect->trace, - xbt_strdup(trace_connect->element), NULL); + 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), NULL); + 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), NULL); + 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), NULL); + 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), NULL); + xbt_strdup(trace_connect->element), nullptr); break; default: surf_parse_error("Cannot connect trace %s to %s: kind of trace unknown", @@ -119,7 +123,6 @@ void parse_after_config() { /* Register classical callbacks */ storage_register_callbacks(); - routing_register_callbacks(); after_config_done = 1; } @@ -128,14 +131,14 @@ void parse_after_config() { /* This function acts as a main in the parsing area. */ void parse_platform_file(const char *file) { -#ifdef HAVE_LUA - int is_lua = (file != NULL && strlen(file) > 3 && file[strlen(file)-3] == 'l' && file[strlen(file)-2] == 'u' - && file[strlen(file)-1] == 'a'); +#if 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 sg_platf_init(); -#ifdef HAVE_LUA +#if 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 @@ -148,9 +151,10 @@ void parse_platform_file(const char *file) /* Run the script */ if (lua_pcall(L, 0, 0, 0)) { - XBT_ERROR("FATAL ERROR:\n %s: %s\n\n", "Lua call failed. Errormessage:", lua_tostring(L, -1)); - xbt_die("Lua call failed. See Log"); + 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"); } + lua_close(L); } else #endif @@ -164,22 +168,18 @@ void parse_platform_file(const char *file) after_config_done = 0; surf_parse_open(file); - traces_set_list = xbt_dict_new_homogeneous(NULL); + 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); - /* Init my data */ - if (!surfxml_bufferstack_stack) - surfxml_bufferstack_stack = xbt_dynar_new(sizeof(char *), NULL); - /* Do the actual parsing */ parse_status = surf_parse(); /* connect all traces relative to hosts */ - xbt_dict_cursor_t cursor = NULL; + xbt_dict_cursor_t cursor = nullptr; char *trace_name, *elm; xbt_dict_foreach(trace_connect_list_host_avail, cursor, trace_name, elm) { @@ -190,7 +190,7 @@ void parse_platform_file(const char *file) xbt_assert(host, "Host %s undefined", elm); simgrid::surf::Cpu *cpu = host->pimpl_cpu; - cpu->set_state_trace(trace); + 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); @@ -200,12 +200,12 @@ void parse_platform_file(const char *file) xbt_assert(host, "Host %s undefined", elm); simgrid::surf::Cpu *cpu = host->pimpl_cpu; - cpu->set_speed_trace(trace); + 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); - Link *link = Link::byName(elm); + sg_link_t link = simgrid::s4u::Link::byName(elm); xbt_assert(link, "Link %s undefined", elm); link->setStateTrace(trace); } @@ -213,7 +213,7 @@ void parse_platform_file(const char *file) 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); - Link *link = Link::byName(elm); + sg_link_t link = simgrid::s4u::Link::byName(elm); xbt_assert(link, "Link %s undefined", elm); link->setBandwidthTrace(trace); } @@ -221,7 +221,7 @@ void parse_platform_file(const char *file) 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); - Link *link = Link::byName(elm); + sg_link_t link = simgrid::s4u::Link::byName(elm); xbt_assert(link, "Link %s undefined", elm); link->setLatencyTrace(trace); } @@ -233,14 +233,12 @@ void parse_platform_file(const char *file) xbt_dict_free(&trace_connect_list_link_bw); xbt_dict_free(&trace_connect_list_link_lat); xbt_dict_free(&traces_set_list); - xbt_dynar_free(&surfxml_bufferstack_stack); surf_parse_close(); if (parse_status) surf_parse_error("Parse error in %s", file); - } - - } + +SG_END_DECL()