-/* 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 "simgrid/link.h"
#include "simgrid/s4u/engine.hpp"
#include "simgrid/sg_config.h"
-#include "src/kernel/routing/NetCard.hpp"
+#include "src/kernel/routing/NetPoint.hpp"
#include "src/surf/network_interface.hpp"
#include "src/surf/surf_private.h"
#include "xbt/dict.h"
#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"
char* surf_parsed_filename = nullptr; // to locate parse error messages
-std::vector<simgrid::surf::Link *> parsed_link_list; /* temporary store of current list link of a route */
+std::vector<simgrid::surf::LinkImpl*> parsed_link_list; /* temporary store of current list link of a route */
+
/*
* Helping functions
*/
"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)
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()
{
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(){
}
void STag_surfxml_router(){
- s_sg_platf_router_cbarg_t router;
- memset(&router, 0, sizeof(router));
-
- router.id = A_surfxml_router_id;
- router.coord = A_surfxml_router_coordinates;
-
- sg_platf_new_router(&router);
+ sg_platf_new_router(A_surfxml_router_id, A_surfxml_router_coordinates);
}
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);
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::Link *link;
+ simgrid::surf::LinkImpl* link;
char *link_name=nullptr;
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
}
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(){
- surf_parse_assert(sg_netcard_by_name_or_null(A_surfxml_route_src),
- "Route src='%s' does name a node.", A_surfxml_route_src);
- surf_parse_assert(sg_netcard_by_name_or_null(A_surfxml_route_dst),
- "Route dst='%s' does name a node.", A_surfxml_route_dst);
+ surf_parse_assert(sg_netpoint_by_name_or_null(A_surfxml_route_src), "Route src='%s' does name a node.",
+ A_surfxml_route_src);
+ surf_parse_assert(sg_netpoint_by_name_or_null(A_surfxml_route_dst), "Route dst='%s' does name a node.",
+ A_surfxml_route_dst);
}
void STag_surfxml_ASroute(){
- surf_parse_assert(sg_netcard_by_name_or_null(A_surfxml_ASroute_src),
- "ASroute src='%s' does name a node.", A_surfxml_route_src);
- surf_parse_assert(sg_netcard_by_name_or_null(A_surfxml_ASroute_dst),
- "ASroute dst='%s' does name a node.", A_surfxml_route_dst);
-
- surf_parse_assert(sg_netcard_by_name_or_null(A_surfxml_ASroute_gw___src),
- "ASroute gw_src='%s' does name a node.", A_surfxml_ASroute_gw___src);
- surf_parse_assert(sg_netcard_by_name_or_null(A_surfxml_ASroute_gw___dst),
- "ASroute gw_dst='%s' does name a node.", A_surfxml_ASroute_gw___dst);
+ surf_parse_assert(sg_netpoint_by_name_or_null(A_surfxml_ASroute_src), "ASroute src='%s' does name a node.",
+ A_surfxml_route_src);
+ surf_parse_assert(sg_netpoint_by_name_or_null(A_surfxml_ASroute_dst), "ASroute dst='%s' does name a node.",
+ A_surfxml_route_dst);
+
+ surf_parse_assert(sg_netpoint_by_name_or_null(A_surfxml_ASroute_gw___src), "ASroute gw_src='%s' does name a node.",
+ A_surfxml_ASroute_gw___src);
+ surf_parse_assert(sg_netpoint_by_name_or_null(A_surfxml_ASroute_gw___dst), "ASroute gw_dst='%s' does name a node.",
+ A_surfxml_ASroute_gw___dst);
}
void STag_surfxml_bypassRoute(){
- surf_parse_assert(sg_netcard_by_name_or_null(A_surfxml_bypassRoute_src),
- "bypassRoute src='%s' does name a node.", A_surfxml_bypassRoute_src);
- surf_parse_assert(sg_netcard_by_name_or_null(A_surfxml_bypassRoute_dst),
- "bypassRoute dst='%s' does name a node.", A_surfxml_bypassRoute_dst);
+ surf_parse_assert(sg_netpoint_by_name_or_null(A_surfxml_bypassRoute_src), "bypassRoute src='%s' does name a node.",
+ A_surfxml_bypassRoute_src);
+ surf_parse_assert(sg_netpoint_by_name_or_null(A_surfxml_bypassRoute_dst), "bypassRoute dst='%s' does name a node.",
+ A_surfxml_bypassRoute_dst);
}
void STag_surfxml_bypassASroute(){
- surf_parse_assert(sg_netcard_by_name_or_null(A_surfxml_bypassASroute_src),
- "bypassASroute src='%s' does name a node.", A_surfxml_bypassASroute_src);
- surf_parse_assert(sg_netcard_by_name_or_null(A_surfxml_bypassASroute_dst),
- "bypassASroute dst='%s' does name a node.", A_surfxml_bypassASroute_dst);
- surf_parse_assert(sg_netcard_by_name_or_null(A_surfxml_bypassASroute_gw___src),
- "bypassASroute gw_src='%s' does name a node.", A_surfxml_bypassASroute_gw___src);
- surf_parse_assert(sg_netcard_by_name_or_null(A_surfxml_bypassASroute_gw___dst),
- "bypassASroute gw_dst='%s' does name a node.", A_surfxml_bypassASroute_gw___dst);
+ surf_parse_assert(sg_netpoint_by_name_or_null(A_surfxml_bypassASroute_src),
+ "bypassASroute src='%s' does name a node.", A_surfxml_bypassASroute_src);
+ surf_parse_assert(sg_netpoint_by_name_or_null(A_surfxml_bypassASroute_dst),
+ "bypassASroute dst='%s' does name a node.", A_surfxml_bypassASroute_dst);
+ surf_parse_assert(sg_netpoint_by_name_or_null(A_surfxml_bypassASroute_gw___src),
+ "bypassASroute gw_src='%s' does name a node.", A_surfxml_bypassASroute_gw___src);
+ surf_parse_assert(sg_netpoint_by_name_or_null(A_surfxml_bypassASroute_gw___dst),
+ "bypassASroute gw_dst='%s' does name a node.", A_surfxml_bypassASroute_gw___dst);
}
void ETag_surfxml_route(){
s_sg_platf_route_cbarg_t route;
memset(&route,0,sizeof(route));
- route.src = sg_netcard_by_name_or_null(A_surfxml_route_src); // tested to not be nullptr in start tag
- route.dst = sg_netcard_by_name_or_null(A_surfxml_route_dst); // tested to not be nullptr in start tag
+ route.src = sg_netpoint_by_name_or_null(A_surfxml_route_src); // tested to not be nullptr in start tag
+ 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<Link*>();
+ route.link_list = new std::vector<simgrid::surf::LinkImpl*>();
route.symmetrical = (A_surfxml_route_symmetrical == A_surfxml_route_symmetrical_YES);
for (auto link: parsed_link_list)
s_sg_platf_route_cbarg_t ASroute;
memset(&ASroute,0,sizeof(ASroute));
- ASroute.src = sg_netcard_by_name_or_null(A_surfxml_ASroute_src); // tested to not be nullptr in start tag
- ASroute.dst = sg_netcard_by_name_or_null(A_surfxml_ASroute_dst); // tested to not be nullptr in start tag
+ ASroute.src = sg_netpoint_by_name_or_null(A_surfxml_ASroute_src); // tested to not be nullptr in start tag
+ ASroute.dst = sg_netpoint_by_name_or_null(A_surfxml_ASroute_dst); // tested to not be nullptr in start tag
- ASroute.gw_src = sg_netcard_by_name_or_null(A_surfxml_ASroute_gw___src); // tested to not be nullptr in start tag
- ASroute.gw_dst = sg_netcard_by_name_or_null(A_surfxml_ASroute_gw___dst); // tested to not be nullptr in start tag
+ 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<Link*>();
+ ASroute.link_list = new std::vector<simgrid::surf::LinkImpl*>();
for (auto link: parsed_link_list)
ASroute.link_list->push_back(link);
s_sg_platf_route_cbarg_t route;
memset(&route,0,sizeof(route));
- route.src = sg_netcard_by_name_or_null(A_surfxml_bypassRoute_src); // tested to not be nullptr in start tag
- route.dst = sg_netcard_by_name_or_null(A_surfxml_bypassRoute_dst); // tested to not be nullptr in start tag
+ route.src = sg_netpoint_by_name_or_null(A_surfxml_bypassRoute_src); // tested to not be nullptr in start tag
+ route.dst = sg_netpoint_by_name_or_null(A_surfxml_bypassRoute_dst); // tested to not be nullptr in start tag
route.gw_src = nullptr;
route.gw_dst = nullptr;
route.symmetrical = false;
- route.link_list = new std::vector<Link*>();
+ route.link_list = new std::vector<simgrid::surf::LinkImpl*>();
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(){
s_sg_platf_route_cbarg_t ASroute;
memset(&ASroute,0,sizeof(ASroute));
- ASroute.src = sg_netcard_by_name_or_null(A_surfxml_bypassASroute_src);
- ASroute.dst = sg_netcard_by_name_or_null(A_surfxml_bypassASroute_dst);
- ASroute.link_list = new std::vector<Link*>();
+ 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<simgrid::surf::LinkImpl*>();
for (auto link: parsed_link_list)
ASroute.link_list->push_back(link);
parsed_link_list.clear();
ASroute.symmetrical = false;
- ASroute.gw_src = sg_netcard_by_name_or_null(A_surfxml_bypassASroute_gw___src);
- ASroute.gw_dst = sg_netcard_by_name_or_null(A_surfxml_bypassASroute_gw___dst);
+ ASroute.gw_src = sg_netpoint_by_name_or_null(A_surfxml_bypassASroute_gw___src);
+ 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);
}
int_f_void_t surf_parse = _surf_parse;
+
+SG_END_DECL()