X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5d4bf7d1cd502bc979d98e35067872186f2a0a21..a91f50abdce08089b633bb5496b3f0c92a4b7c2e:/src/surf/xml/surfxml_sax_cb.cpp diff --git a/src/surf/xml/surfxml_sax_cb.cpp b/src/surf/xml/surfxml_sax_cb.cpp index 420cabf1b6..f747566778 100644 --- a/src/surf/xml/surfxml_sax_cb.cpp +++ b/src/surf/xml/surfxml_sax_cb.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2006-2015. The SimGrid Team. + /* Copyright (c) 2006-2015. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -19,11 +19,14 @@ #include "xbt/log.h" #include "xbt/misc.h" #include "xbt/str.h" +#include #include "src/surf/xml/platf_private.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_parse, surf, "Logging specific to the SURF parsing module"); -#undef CLEANUP + +SG_BEGIN_DECL() + int ETag_surfxml_include_state(); #include "simgrid_dtd.c" @@ -267,6 +270,28 @@ double surf_parse_get_speed(const char *string, const char *entity_kind, const c "Append 'f' or 'flops' to your speed to get flop per second", "f"); } +static std::vector surf_parse_get_all_speeds(char* speeds, const char* entity_kind, const char* id){ + + std::vector speed_per_pstate; + + if (strchr(speeds, ',') == nullptr){ + double speed = surf_parse_get_speed(speeds, entity_kind, id); + speed_per_pstate.push_back(speed); + } else { + xbt_dynar_t pstate_list = xbt_str_split(speeds, ","); + unsigned int i; + char* speed_str; + xbt_dynar_foreach(pstate_list, i, speed_str) { + xbt_str_trim(speed_str, nullptr); + double speed = surf_parse_get_speed(speed_str,entity_kind, id); + speed_per_pstate.push_back(speed); + XBT_DEBUG("Speed value: %f", speed); + } + xbt_dynar_free(&pstate_list); + } + return speed_per_pstate; +} + /* * All the callback lists that can be overridden anywhere. * (this list should probably be reduced to the bare minimum to allow the models to work) @@ -299,14 +324,15 @@ void ETag_surfxml_storage() s_sg_platf_storage_cbarg_t storage; memset(&storage,0,sizeof(storage)); + storage.properties = current_property_set; + current_property_set = nullptr; + storage.id = A_surfxml_storage_id; storage.type_id = A_surfxml_storage_typeId; storage.content = A_surfxml_storage_content; storage.content_type = A_surfxml_storage_content___type; - storage.properties = current_property_set; storage.attach = A_surfxml_storage_attach; sg_platf_new_storage(&storage); - current_property_set = nullptr; } void STag_surfxml_storage___type() { @@ -320,17 +346,19 @@ void ETag_surfxml_storage___type() s_sg_platf_storage_type_cbarg_t storage_type; memset(&storage_type,0,sizeof(storage_type)); + storage_type.properties = current_property_set; + current_property_set = nullptr; + + storage_type.model_properties = current_model_property_set; + current_model_property_set = nullptr; + storage_type.content = A_surfxml_storage___type_content; storage_type.content_type = A_surfxml_storage___type_content___type; storage_type.id = A_surfxml_storage___type_id; storage_type.model = A_surfxml_storage___type_model; - storage_type.properties = current_property_set; - storage_type.model_properties = current_model_property_set; storage_type.size = surf_parse_get_size(A_surfxml_storage___type_size, "size of storage type", storage_type.id); sg_platf_new_storage_type(&storage_type); - current_property_set = nullptr; - current_model_property_set = nullptr; } void STag_surfxml_mount() { @@ -349,23 +377,23 @@ void ETag_surfxml_mount() /* * Stuff relative to the tag */ -static xbt_dynar_t surf_input_buffer_stack = nullptr; -static xbt_dynar_t surf_file_to_parse_stack = nullptr; -static xbt_dynar_t surf_parsed_filename_stack = nullptr; +static std::vector surf_input_buffer_stack; +static std::vector surf_file_to_parse_stack; +static std::vector surf_parsed_filename_stack; void STag_surfxml_include() { parse_after_config(); XBT_DEBUG("STag_surfxml_include '%s'",A_surfxml_include_file); - xbt_dynar_push(surf_parsed_filename_stack,&surf_parsed_filename); // save old file name + surf_parsed_filename_stack.push_back(surf_parsed_filename); // save old file name surf_parsed_filename = xbt_strdup(A_surfxml_include_file); - xbt_dynar_push(surf_file_to_parse_stack, &surf_file_to_parse); //save old file descriptor + surf_file_to_parse_stack.push_back(surf_file_to_parse); // save old file descriptor surf_file_to_parse = surf_fopen(A_surfxml_include_file, "r"); // read new file descriptor xbt_assert((surf_file_to_parse), "Unable to open \"%s\"\n", A_surfxml_include_file); - xbt_dynar_push(surf_input_buffer_stack,&surf_input_buffer); + surf_input_buffer_stack.push_back(surf_input_buffer); surf_input_buffer = surf_parse__create_buffer(surf_file_to_parse, YY_BUF_SIZE); surf_parse_push_buffer_state(surf_input_buffer); @@ -393,18 +421,21 @@ int ETag_surfxml_include_state() fflush(nullptr); XBT_DEBUG("ETag_surfxml_include_state '%s'",A_surfxml_include_file); - if(xbt_dynar_is_empty(surf_input_buffer_stack)) // nope, that's a true premature EOF. Let the parser die verbosely. + if (surf_input_buffer_stack.empty()) // nope, that's a true premature EOF. Let the parser die verbosely. return 0; // Yeah, we were in an Restore state and proceed. fclose(surf_file_to_parse); - xbt_dynar_pop(surf_file_to_parse_stack, &surf_file_to_parse); + surf_file_to_parse = surf_file_to_parse_stack.back(); + surf_file_to_parse_stack.pop_back(); surf_parse_pop_buffer_state(); - xbt_dynar_pop(surf_input_buffer_stack,&surf_input_buffer); + surf_input_buffer = surf_input_buffer_stack.back(); + surf_input_buffer_stack.pop_back(); // Restore the filename for error messages free(surf_parsed_filename); - xbt_dynar_pop(surf_parsed_filename_stack,&surf_parsed_filename); + surf_parsed_filename = surf_parsed_filename_stack.back(); + surf_parsed_filename_stack.pop_back(); return 1; } @@ -475,31 +506,13 @@ void STag_surfxml_prop() void ETag_surfxml_host() { s_sg_platf_host_cbarg_t host; memset(&host,0,sizeof(host)); - char* buf; - host.properties = current_property_set; + current_property_set = nullptr; host.id = A_surfxml_host_id; - buf = A_surfxml_host_speed; - XBT_DEBUG("Buffer: %s", buf); - if (strchr(buf, ',') == nullptr){ - double speed = surf_parse_get_speed(A_surfxml_host_speed,"speed of host", host.id); - host.speed_per_pstate.push_back(speed); - } - else { - xbt_dynar_t pstate_list = xbt_str_split(buf, ","); - unsigned int i; - char* speed_str; - xbt_dynar_foreach(pstate_list, i, speed_str) { - xbt_str_trim(speed_str, nullptr); - double speed = surf_parse_get_speed(speed_str,"speed of host", host.id); - host.speed_per_pstate.push_back(speed); - XBT_DEBUG("Speed value: %f", speed); - } - xbt_dynar_free(&pstate_list); - } + host.speed_per_pstate = surf_parse_get_all_speeds(A_surfxml_host_speed, "speed of host", host.id); XBT_DEBUG("pstate: %s", A_surfxml_host_pstate); host.core_amount = surf_parse_get_int(A_surfxml_host_core); @@ -509,7 +522,6 @@ void ETag_surfxml_host() { host.coord = A_surfxml_host_coordinates; sg_platf_new_host(&host); - current_property_set = nullptr; } void STag_surfxml_host___link(){ @@ -531,12 +543,13 @@ void ETag_surfxml_cluster(){ s_sg_platf_cluster_cbarg_t cluster; memset(&cluster,0,sizeof(cluster)); cluster.properties = current_property_set; + current_property_set = nullptr; cluster.id = A_surfxml_cluster_id; cluster.prefix = A_surfxml_cluster_prefix; cluster.suffix = A_surfxml_cluster_suffix; cluster.radicals = explodesRadical(A_surfxml_cluster_radical); - cluster.speed = surf_parse_get_speed(A_surfxml_cluster_speed, "speed of cluster", cluster.id); + cluster.speeds = surf_parse_get_all_speeds(A_surfxml_cluster_speed, "speed of cluster", cluster.id); cluster.core_amount = surf_parse_get_int(A_surfxml_cluster_core); cluster.bw = surf_parse_get_bandwidth(A_surfxml_cluster_bw, "bw of cluster", cluster.id); cluster.lat = surf_parse_get_time(A_surfxml_cluster_lat, "lat of cluster", cluster.id); @@ -583,8 +596,7 @@ void ETag_surfxml_cluster(){ cluster.sharing_policy = SURF_LINK_FATPIPE; break; default: - surf_parse_error("Invalid cluster sharing policy for cluster %s", - cluster.id); + surf_parse_error("Invalid cluster sharing policy for cluster %s", cluster.id); break; } switch (AX_surfxml_cluster_bb___sharing___policy) { @@ -595,14 +607,11 @@ void ETag_surfxml_cluster(){ cluster.bb_sharing_policy = SURF_LINK_SHARED; break; default: - surf_parse_error("Invalid bb sharing policy in cluster %s", - cluster.id); + surf_parse_error("Invalid bb sharing policy in cluster %s", cluster.id); break; } sg_platf_new_cluster(&cluster); - - current_property_set = nullptr; } void STag_surfxml_cluster(){ @@ -651,14 +660,15 @@ void STag_surfxml_link(){ } void ETag_surfxml_link(){ - s_sg_platf_link_cbarg_t link; - memset(&link,0,sizeof(link)); + LinkCreationArgs link; link.properties = current_property_set; - link.id = A_surfxml_link_id; - link.bandwidth = surf_parse_get_bandwidth(A_surfxml_link_bandwidth, "bandwidth of link", link.id); + current_property_set = nullptr; + + link.id = std::string(A_surfxml_link_id); + link.bandwidth = surf_parse_get_bandwidth(A_surfxml_link_bandwidth, "bandwidth of link", link.id.c_str()); link.bandwidth_trace = A_surfxml_link_bandwidth___file[0] ? tmgr_trace_new_from_file(A_surfxml_link_bandwidth___file) : nullptr; - link.latency = surf_parse_get_time(A_surfxml_link_latency, "latency of link", link.id); + link.latency = surf_parse_get_time(A_surfxml_link_latency, "latency of link", link.id.c_str()); link.latency_trace = A_surfxml_link_latency___file[0] ? tmgr_trace_new_from_file(A_surfxml_link_latency___file) : nullptr; link.state_trace = A_surfxml_link_state___file[0] ? tmgr_trace_new_from_file(A_surfxml_link_state___file):nullptr; @@ -673,13 +683,11 @@ void ETag_surfxml_link(){ link.policy = SURF_LINK_FULLDUPLEX; break; default: - surf_parse_error("Invalid sharing policy in link %s", link.id); + surf_parse_error("Invalid sharing policy in link %s", link.id.c_str()); break; } sg_platf_new_link(&link); - - current_property_set = nullptr; } void STag_surfxml_link___ctn(){ @@ -689,15 +697,15 @@ void STag_surfxml_link___ctn(){ switch (A_surfxml_link___ctn_direction) { case AU_surfxml_link___ctn_direction: case A_surfxml_link___ctn_direction_NONE: - link = Link::byName(A_surfxml_link___ctn_id); + link = simgrid::surf::LinkImpl::byName(A_surfxml_link___ctn_id); break; case A_surfxml_link___ctn_direction_UP: link_name = bprintf("%s_UP", A_surfxml_link___ctn_id); - link = Link::byName(link_name); + link = simgrid::surf::LinkImpl::byName(link_name); break; case A_surfxml_link___ctn_direction_DOWN: link_name = bprintf("%s_DOWN", A_surfxml_link___ctn_id); - link = Link::byName(link_name); + link = simgrid::surf::LinkImpl::byName(link_name); break; } xbt_free(link_name); // no-op if it's already nullptr @@ -710,17 +718,16 @@ void STag_surfxml_link___ctn(){ } void ETag_surfxml_backbone(){ - s_sg_platf_link_cbarg_t link; - memset(&link,0,sizeof(link)); + LinkCreationArgs link; link.properties = nullptr; - link.id = A_surfxml_backbone_id; - link.bandwidth = surf_parse_get_bandwidth(A_surfxml_backbone_bandwidth, "bandwidth of backbone", link.id); - link.latency = surf_parse_get_time(A_surfxml_backbone_latency, "latency of backbone", link.id); + link.id = std::string(A_surfxml_backbone_id); + link.bandwidth = surf_parse_get_bandwidth(A_surfxml_backbone_bandwidth, "bandwidth of backbone", link.id.c_str()); + link.latency = surf_parse_get_time(A_surfxml_backbone_latency, "latency of backbone", link.id.c_str()); link.policy = SURF_LINK_SHARED; sg_platf_new_link(&link); - routing_cluster_add_backbone(sg_link_by_name(A_surfxml_backbone_id)); + routing_cluster_add_backbone(simgrid::surf::LinkImpl::byName(A_surfxml_backbone_id)); } void STag_surfxml_route(){ @@ -768,7 +775,7 @@ void ETag_surfxml_route(){ route.dst = sg_netpoint_by_name_or_null(A_surfxml_route_dst); // tested to not be nullptr in start tag route.gw_src = nullptr; route.gw_dst = nullptr; - route.link_list = new std::vector(); + route.link_list = new std::vector(); route.symmetrical = (A_surfxml_route_symmetrical == A_surfxml_route_symmetrical_YES); for (auto link: parsed_link_list) @@ -789,7 +796,7 @@ void ETag_surfxml_ASroute(){ ASroute.gw_src = sg_netpoint_by_name_or_null(A_surfxml_ASroute_gw___src); // tested to not be nullptr in start tag ASroute.gw_dst = sg_netpoint_by_name_or_null(A_surfxml_ASroute_gw___dst); // tested to not be nullptr in start tag - ASroute.link_list = new std::vector(); + ASroute.link_list = new std::vector(); for (auto link: parsed_link_list) ASroute.link_list->push_back(link); @@ -818,13 +825,14 @@ void ETag_surfxml_bypassRoute(){ route.gw_src = nullptr; route.gw_dst = nullptr; route.symmetrical = false; - route.link_list = new std::vector(); + route.link_list = new std::vector(); for (auto link: parsed_link_list) route.link_list->push_back(link); parsed_link_list.clear(); sg_platf_new_bypassRoute(&route); + delete route.link_list; } void ETag_surfxml_bypassASroute(){ @@ -833,7 +841,7 @@ void ETag_surfxml_bypassASroute(){ ASroute.src = sg_netpoint_by_name_or_null(A_surfxml_bypassASroute_src); ASroute.dst = sg_netpoint_by_name_or_null(A_surfxml_bypassASroute_dst); - ASroute.link_list = new std::vector(); + ASroute.link_list = new std::vector(); for (auto link: parsed_link_list) ASroute.link_list->push_back(link); parsed_link_list.clear(); @@ -844,6 +852,7 @@ void ETag_surfxml_bypassASroute(){ ASroute.gw_dst = sg_netpoint_by_name_or_null(A_surfxml_bypassASroute_gw___dst); sg_platf_new_bypassRoute(&ASroute); + delete ASroute.link_list; } void ETag_surfxml_trace(){ @@ -910,14 +919,13 @@ void ETag_surfxml_config(){ xbt_dict_cursor_t cursor = nullptr; char *key; char *elem; - char *cfg; xbt_dict_foreach(current_property_set, cursor, key, elem) { - cfg = bprintf("%s:%s",key,elem); - if(xbt_cfg_is_default_value(key)) + if (xbt_cfg_is_default_value(key)) { + char* cfg = bprintf("%s:%s", key, elem); xbt_cfg_set_parse(cfg); - else + free(cfg); + } else XBT_INFO("The custom configuration '%s' is already defined by user!",key); - free(cfg); } XBT_DEBUG("End configuration name = %s",A_surfxml_config_id); @@ -1000,14 +1008,6 @@ void surf_parse_open(const char *file) { xbt_assert(file, "Cannot parse the nullptr file. Bypassing the parser is strongly deprecated nowadays."); - if (!surf_input_buffer_stack) - surf_input_buffer_stack = xbt_dynar_new(sizeof(YY_BUFFER_STATE), nullptr); - if (!surf_file_to_parse_stack) - surf_file_to_parse_stack = xbt_dynar_new(sizeof(FILE *), nullptr); - - if (!surf_parsed_filename_stack) - surf_parsed_filename_stack = xbt_dynar_new(sizeof(char *), &xbt_free_ref); - surf_parsed_filename = xbt_strdup(file); char *dir = xbt_dirname(file); xbt_dynar_push(surf_path, &dir); @@ -1021,9 +1021,6 @@ void surf_parse_open(const char *file) void surf_parse_close() { - xbt_dynar_free(&surf_input_buffer_stack); - xbt_dynar_free(&surf_file_to_parse_stack); - xbt_dynar_free(&surf_parsed_filename_stack); if (surf_parsed_filename) { char *dir = nullptr; xbt_dynar_pop(surf_path, &dir); @@ -1046,3 +1043,5 @@ static int _surf_parse() { } int_f_void_t surf_parse = _surf_parse; + +SG_END_DECL()