if (e_route != nullptr) {
res->gw_src_ = e_route->gw_src_;
res->gw_dst_ = e_route->gw_dst_;
- for (auto const& link : e_route->link_list_) {
- res->link_list_.push_back(link);
- if (lat)
- *lat += link->get_latency();
- }
+ add_link_latency(res->link_list_, e_route->link_list_, lat);
}
}
void FullZone::add_route(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst,
- const std::vector<resource::LinkImpl*>& link_list, bool symmetrical)
+ const std::vector<s4u::LinkInRoute>& link_list, bool symmetrical)
{
add_route_check_params(src, dst, gw_src, gw_dst, link_list, symmetrical);
dst->get_cname());
/* Add the route to the base */
- routing_table_[src->id()][dst->id()] =
- std::unique_ptr<Route>(new_extended_route(get_hierarchy(), gw_src, gw_dst, link_list, true));
+ routing_table_[src->id()][dst->id()] = std::unique_ptr<Route>(
+ new_extended_route(get_hierarchy(), gw_src, gw_dst, get_link_list_impl(link_list, false), true));
if (symmetrical && src != dst) {
if (gw_dst && gw_src) {
"The route between %s and %s already exists. You should not declare the reverse path as symmetrical.",
dst->get_cname(), src->get_cname());
- routing_table_[dst->id()][src->id()] =
- std::unique_ptr<Route>(new_extended_route(get_hierarchy(), gw_src, gw_dst, link_list, false));
+ routing_table_[dst->id()][src->id()] = std::unique_ptr<Route>(
+ new_extended_route(get_hierarchy(), gw_src, gw_dst, get_link_list_impl(link_list, true), false));
}
}
} // namespace routing