-/* 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
#include "xbt/log.h"
#include "xbt/misc.h"
#include "xbt/str.h"
+#include <string>
#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"
"Append 'f' or 'flops' to your speed to get flop per second", "f");
}
+static std::vector<double> surf_parse_get_all_speeds(char* speeds, const char* entity_kind, const char* id){
+
+ std::vector<double> 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)
/*
* Stuff relative to the <include> 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<YY_BUFFER_STATE> surf_input_buffer_stack;
+static std::vector<FILE*> surf_file_to_parse_stack;
+static std::vector<char*> 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);
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 <include> 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;
}
host.id = A_surfxml_host_id;
- char* 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);
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);
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) {
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;
}
}
void ETag_surfxml_link(){
- s_sg_platf_link_cbarg_t link;
- memset(&link,0,sizeof(link));
+ LinkCreationArgs link;
link.properties = current_property_set;
current_property_set = nullptr;
- link.id = A_surfxml_link_id;
- link.bandwidth = surf_parse_get_bandwidth(A_surfxml_link_bandwidth, "bandwidth of link", link.id);
+ 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;
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;
}
}
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);
{
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);
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);
}
int_f_void_t surf_parse = _surf_parse;
+
+SG_END_DECL()
