-/* 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 <math.h>
#include <stdarg.h> /* va_arg */
-#include "xbt/misc.h"
+#include "simgrid/link.h"
+#include "simgrid/s4u/engine.hpp"
+#include "simgrid/sg_config.h"
+#include "src/kernel/routing/NetPoint.hpp"
+#include "src/surf/network_interface.hpp"
+#include "src/surf/surf_private.h"
+#include "xbt/dict.h"
+#include "xbt/file.h"
#include "xbt/log.h"
+#include "xbt/misc.h"
#include "xbt/str.h"
-#include "xbt/file.h"
-#include "xbt/dict.h"
-#include "src/surf/surf_private.h"
-#include "src/surf/network_interface.hpp"
-#include "simgrid/sg_config.h"
-#include "simgrid/link.h"
+#include <string>
#include "src/surf/xml/platf_private.hpp"
char* surf_parsed_filename = nullptr; // to locate parse error messages
-std::vector<char*> 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
*/
return res;
}
+/* Turn something like "1-4,6,9-11" into the vector {1,2,3,4,6,9,10,11} */
+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*));
+ int end = 0;
+
+ switch (xbt_dynar_length(radical_ends)) {
+ case 1:
+ end = start;
+ break;
+ case 2:
+ end = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 1, char*));
+ break;
+ default:
+ surf_parse_error("Malformed radical: %s", groups);
+ break;
+ }
+
+ for (int i = start; i <= end; i++)
+ exploded->push_back(i);
+
+ xbt_dynar_free(&radical_ends);
+ }
+ xbt_dynar_free(&radical_elements);
+
+ return exploded;
+}
+
struct unit_scale {
const char *unit;
double scale;
/* 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;
-xbt_dict_t as_current_property_set = nullptr;
-int AS_TAG = 0;
-char* as_name_tab[1024];
-void* as_dict_tab[1024];
-int as_prop_nb = 0;
-
+int AS_TAG = 0; // Whether we just opened an AS tag (to see what to do with the properties)
/* dictionary of random generator data */
xbt_dict_t random_data_list = nullptr;
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()
{
* error message in that case.
*
* Yeah, that's terribly hackish, but it works. A better solution should be dealed with in flexml
- * directly: a command line flag could instruct it to do the correct thing when #include is encountered
+ * directly: a command line flag could instruct it to do the correct thing when the include directive is encountered
* on a line. One day maybe, if the maya allow it.
*/
int ETag_surfxml_include_state()
void STag_surfxml_prop()
{
- if(AS_TAG){ // We need a stack here to retrieve the most recently opened AS
- if (!as_current_property_set){
- xbt_assert(as_prop_nb < 1024, "Number of AS property reach the limit!!!");
- as_current_property_set = xbt_dict_new_homogeneous(xbt_free_f); // Maybe, it should raise an error
- as_name_tab[as_prop_nb] = xbt_strdup(A_surfxml_AS_id);
- as_dict_tab[as_prop_nb] = as_current_property_set;
- XBT_DEBUG("PUSH prop set %p for AS '%s'",as_dict_tab[as_prop_nb],as_name_tab[as_prop_nb]);
- as_prop_nb++;
- }
- XBT_DEBUG("add prop %s=%s into current AS property set", A_surfxml_prop_id, A_surfxml_prop_value);
- xbt_dict_set(as_current_property_set, A_surfxml_prop_id, xbt_strdup(A_surfxml_prop_value), nullptr);
+ if (AS_TAG) { // We need to retrieve the most recently opened AS
+ 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));
}
else{
if (!current_property_set)
- current_property_set = xbt_dict_new(); // Maybe, it should raise an error
- xbt_dict_set(current_property_set, A_surfxml_prop_id, xbt_strdup(A_surfxml_prop_value), xbt_free_f);
- XBT_DEBUG("add prop %s=%s into current property set", A_surfxml_prop_id, A_surfxml_prop_value);
+ current_property_set = xbt_dict_new_homogeneous(&xbt_free_f); // Maybe, it should raise an error
+ xbt_dict_set(current_property_set, A_surfxml_prop_id, xbt_strdup(A_surfxml_prop_value), nullptr);
+ XBT_DEBUG("add prop %s=%s into current property set %p", A_surfxml_prop_id, A_surfxml_prop_value,
+ 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;
+ 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.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 = as_current_property_set;
+ 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.radical = A_surfxml_cluster_radical;
+ cluster.radicals = explodesRadical(A_surfxml_cluster_radical);
cluster.speed = surf_parse_get_speed(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);
}
sg_platf_new_cluster(&cluster);
-
- current_property_set = nullptr;
}
void STag_surfxml_cluster(){
+ AS_TAG = 0;
parse_after_config();
xbt_assert(current_property_set == nullptr, "Someone forgot to reset the property set to nullptr in its closing tag (or XML malformed)");
}
cabinet.speed = surf_parse_get_speed(A_surfxml_cabinet_speed, "speed of cabinet", cabinet.id);
cabinet.bw = surf_parse_get_bandwidth(A_surfxml_cabinet_bw, "bw of cabinet", cabinet.id);
cabinet.lat = surf_parse_get_time(A_surfxml_cabinet_lat, "lat of cabinet", cabinet.id);
- cabinet.radical = A_surfxml_cabinet_radical;
+ cabinet.radicals = explodesRadical(A_surfxml_cabinet_radical);
sg_platf_new_cabinet(&cabinet);
}
parse_after_config();
s_sg_platf_peer_cbarg_t peer;
memset(&peer,0,sizeof(peer));
- peer.id = A_surfxml_peer_id;
- peer.speed = surf_parse_get_speed(A_surfxml_peer_speed, "speed of peer", peer.id);
- peer.bw_in = surf_parse_get_bandwidth(A_surfxml_peer_bw___in, "bw_in of peer", peer.id);
- peer.bw_out = surf_parse_get_bandwidth(A_surfxml_peer_bw___out, "bw_out of peer", peer.id);
- peer.lat = surf_parse_get_time(A_surfxml_peer_lat, "lat of peer", peer.id);
- peer.coord = A_surfxml_peer_coordinates;
- peer.availability_trace = A_surfxml_peer_availability___file[0] ? tmgr_trace_new_from_file(A_surfxml_peer_availability___file) : nullptr;
- peer.state_trace = A_surfxml_peer_state___file[0] ? tmgr_trace_new_from_file(A_surfxml_peer_state___file) : nullptr;
+ peer.id = A_surfxml_peer_id;
+ peer.speed = surf_parse_get_speed(A_surfxml_peer_speed, "speed of peer", peer.id);
+ peer.bw_in = surf_parse_get_bandwidth(A_surfxml_peer_bw___in, "bw_in of peer", peer.id);
+ peer.bw_out = surf_parse_get_bandwidth(A_surfxml_peer_bw___out, "bw_out of peer", peer.id);
+ peer.coord = A_surfxml_peer_coordinates;
+ peer.speed_trace = A_surfxml_peer_availability___file[0] ? tmgr_trace_new_from_file(A_surfxml_peer_availability___file) : nullptr;
+ peer.state_trace = A_surfxml_peer_state___file[0] ? tmgr_trace_new_from_file(A_surfxml_peer_state___file) : nullptr;
+
+ if (A_surfxml_peer_lat[0] != '\0')
+ XBT_WARN("The latency parameter in <peer> is now deprecated. Use the z coordinate instead of '%s'.",
+ A_surfxml_peer_lat);
sg_platf_new_peer(&peer);
}
memset(&link,0,sizeof(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(){
- char *link_id;
+ 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_id = xbt_strdup(A_surfxml_link___ctn_id);
+ link = simgrid::surf::LinkImpl::byName(A_surfxml_link___ctn_id);
break;
case A_surfxml_link___ctn_direction_UP:
- link_id = bprintf("%s_UP", A_surfxml_link___ctn_id);
+ link_name = bprintf("%s_UP", A_surfxml_link___ctn_id);
+ link = simgrid::surf::LinkImpl::byName(link_name);
break;
case A_surfxml_link___ctn_direction_DOWN:
- link_id = bprintf("%s_DOWN", A_surfxml_link___ctn_id);
+ link_name = bprintf("%s_DOWN", A_surfxml_link___ctn_id);
+ link = simgrid::surf::LinkImpl::byName(link_name);
break;
}
+ xbt_free(link_name); // no-op if it's already nullptr
- // FIXME we should push the surf link object but it doesn't work because of model rulebased
- // Rule-based routing doesnt' exist anymore, does it?
- parsed_link_list.push_back(link_id);
+ 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)":
+ ""));
+ parsed_link_list.push_back(link);
}
void ETag_surfxml_backbone(){
memset(&link,0,sizeof(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_name: parsed_link_list) {
- simgrid::surf::Link *link = Link::byName(link_name);
+ for (auto link: parsed_link_list)
route.link_list->push_back(link);
- }
parsed_link_list.clear();
sg_platf_new_route(&route);
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_name: parsed_link_list) {
- simgrid::surf::Link *link = Link::byName(link_name);
+ for (auto link: parsed_link_list)
ASroute.link_list->push_back(link);
- }
parsed_link_list.clear();
switch (A_surfxml_ASroute_symmetrical) {
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_name: parsed_link_list) {
- simgrid::surf::Link *link = Link::byName(link_name);
+ 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*>();
- for (auto link_name: parsed_link_list) {
- simgrid::surf::Link *link = Link::byName(link_name);
+ 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(){
AS_TAG = 1;
s_sg_platf_AS_cbarg_t AS = { A_surfxml_AS_id, (int)A_surfxml_AS_routing};
- as_current_property_set = nullptr;
-
sg_platf_new_AS_begin(&AS);
}
void ETag_surfxml_AS(){
- if(as_prop_nb){
- char *name = as_name_tab[as_prop_nb-1];
- xbt_dict_t dict = (xbt_dict_t) as_dict_tab[as_prop_nb-1];
- as_prop_nb--;
- XBT_DEBUG("POP prop %p for AS '%s'",dict,name);
- xbt_lib_set(as_router_lib, name, ROUTING_PROP_ASR_LEVEL, dict);
- xbt_free(name);
- }
sg_platf_new_AS_seal();
}
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;
-
-/* Prop tag functions
- *
- * With XML parser
- */
-xbt_dict_t get_as_router_properties(const char* name)
-{
- return (xbt_dict_t)xbt_lib_get_or_null(as_router_lib, name, ROUTING_PROP_ASR_LEVEL);
-}