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
*/
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
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);
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);
}