-/* Copyright (c) 2006-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2006-2017. 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 "xbt/str.h"
#include "src/surf/xml/platf_private.hpp"
+#include <boost/algorithm/string.hpp>
+#include <boost/algorithm/string/classification.hpp>
+#include <boost/algorithm/string/split.hpp>
+#include <string>
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"
static std::vector<int>* explodesRadical(const char* radicals)
{
std::vector<int>* exploded = new std::vector<int>();
- char* groups;
- unsigned int iter;
// Make all hosts
- xbt_dynar_t radical_elements = xbt_str_split(radicals, ",");
- xbt_dynar_foreach (radical_elements, iter, groups) {
-
- xbt_dynar_t radical_ends = xbt_str_split(groups, "-");
- int start = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 0, char*));
+ std::vector<std::string> radical_elements;
+ boost::split(radical_elements, radicals, boost::is_any_of(","));
+ for (auto group : radical_elements) {
+ std::vector<std::string> radical_ends;
+ boost::split(radical_ends, group, boost::is_any_of("-"));
+ int start = surf_parse_get_int((radical_ends.front()).c_str());
int end = 0;
- switch (xbt_dynar_length(radical_ends)) {
+ switch (radical_ends.size()) {
case 1:
end = start;
break;
case 2:
- end = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 1, char*));
+ end = surf_parse_get_int((radical_ends.back()).c_str());
break;
default:
- surf_parse_error("Malformed radical: %s", groups);
+ surf_parse_error("Malformed radical: %s", group.c_str());
break;
}
-
for (int i = start; i <= end; i++)
exploded->push_back(i);
-
- xbt_dynar_free(&radical_ends);
}
- xbt_dynar_free(&radical_elements);
return exploded;
}
"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 {
+ std::vector<std::string> pstate_list;
+ boost::split(pstate_list, speeds, boost::is_any_of(","));
+ for (auto speed_str : pstate_list) {
+ boost::trim(speed_str);
+ double speed = surf_parse_get_speed(speed_str.c_str(), entity_kind, id);
+ speed_per_pstate.push_back(speed);
+ XBT_DEBUG("Speed value: %f", speed);
+ }
+ }
+ 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)
/* The default current property receiver. Setup in the corresponding opening callbacks. */
xbt_dict_t current_property_set = nullptr;
-xbt_dict_t current_model_property_set = nullptr;
+std::map<std::string, std::string>* current_model_property_set = nullptr;
int AS_TAG = 0; // Whether we just opened an AS tag (to see what to do with the properties)
/* dictionary of random generator data */
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()
{
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()
{
/*
* 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_stack.pop_back();
surf_parse_pop_buffer_state();
- xbt_dynar_pop(surf_input_buffer_stack,&surf_input_buffer);
+ 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_stack.pop_back();
return 1;
}
XBT_DEBUG("Set AS property %s -> %s", A_surfxml_prop_id, A_surfxml_prop_value);
simgrid::s4u::NetZone* netzone = simgrid::s4u::Engine::instance()->netzoneByNameOrNull(A_surfxml_AS_id);
- netzone->setProperty(A_surfxml_prop_id, xbt_strdup(A_surfxml_prop_value));
+ netzone->setProperty(A_surfxml_prop_id, A_surfxml_prop_value);
}
else{
if (!current_property_set)
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);
host.coord = A_surfxml_host_coordinates;
sg_platf_new_host(&host);
- current_property_set = nullptr;
}
void STag_surfxml_host___link(){
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);
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;
}
sg_platf_new_cluster(&cluster);
-
- current_property_set = nullptr;
}
void STag_surfxml_cluster(){
}
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;
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(){
- simgrid::surf::LinkImpl* link;
+ simgrid::surf::LinkImpl* link = nullptr;
char *link_name=nullptr;
switch (A_surfxml_link___ctn_direction) {
case AU_surfxml_link___ctn_direction:
}
xbt_free(link_name); // no-op if it's already nullptr
- surf_parse_assert(link!=nullptr,"No such link: '%s'%s", A_surfxml_link___ctn_id,
- A_surfxml_link___ctn_direction==A_surfxml_link___ctn_direction_UP?" (upward)":
- ( A_surfxml_link___ctn_direction==A_surfxml_link___ctn_direction_DOWN?" (downward)":
- ""));
+ const char* dirname = "";
+ switch (A_surfxml_link___ctn_direction) {
+ case A_surfxml_link___ctn_direction_UP:
+ dirname = " (upward)";
+ break;
+ case A_surfxml_link___ctn_direction_DOWN:
+ dirname = " (downward)";
+ break;
+ default:
+ dirname = "";
+ }
+ surf_parse_assert(link != nullptr, "No such link: '%s'%s", A_surfxml_link___ctn_id, dirname);
parsed_link_list.push_back(link);
}
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);
parsed_link_list.clear();
sg_platf_new_bypassRoute(&route);
+ delete route.link_list;
}
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(){
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);
void STag_surfxml_model___prop(){
if (!current_model_property_set)
- current_model_property_set = xbt_dict_new_homogeneous(xbt_free_f);
+ current_model_property_set = new std::map<std::string, std::string>();
- xbt_dict_set(current_model_property_set, A_surfxml_model___prop_id, xbt_strdup(A_surfxml_model___prop_value), nullptr);
+ current_model_property_set->insert(
+ {std::string(A_surfxml_model___prop_id), std::string(A_surfxml_model___prop_value)});
}
void ETag_surfxml_prop(){/* Nothing to do */}
{
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);
+ char* dir = xbt_dirname(file);
+ surf_path.push_back(std::string(dir));
+ xbt_free(dir);
surf_file_to_parse = surf_fopen(file, "r");
xbt_assert((surf_file_to_parse), "Unable to open \"%s\"\n", 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);
- free(dir);
+ surf_path.pop_back();
}
free(surf_parsed_filename);
}
int_f_void_t surf_parse = _surf_parse;
+
+SG_END_DECL()
