new simgrid::kernel::routing::vivaldi::Coords(netcard, coord);
- s_surf_parsing_link_up_down_t info;
char* link_up = bprintf("link_%s_UP", netcard->cname());
char* link_down = bprintf("link_%s_DOWN", netcard->cname());
- info.linkUp = surf_network_model->createLink(link_up, bw_out, latency, SURF_LINK_SHARED);
- info.linkDown = surf_network_model->createLink(link_down, bw_in, latency, SURF_LINK_SHARED);
- privateLinks_.insert({netcard->id(), info});
+ Link* linkUp = surf_network_model->createLink(link_up, bw_out, latency, SURF_LINK_SHARED);
+ Link* linkDown = surf_network_model->createLink(link_down, bw_in, latency, SURF_LINK_SHARED);
+ privateLinks_.insert({netcard->id(), {linkUp, linkDown}});
free(link_up);
free(link_down);
/* Retrieve the private links */
if (privateLinks_.find(src->id()) != privateLinks_.end()) {
- s_surf_parsing_link_up_down_t info = privateLinks_.at(src->id());
- if (info.linkUp) {
- route->link_list->push_back(info.linkUp);
+ std::pair<Link*, Link*> info = privateLinks_.at(src->id());
+ if (info.first) {
+ route->link_list->push_back(info.first);
if (lat)
- *lat += info.linkUp->latency();
+ *lat += info.first->latency();
}
}
if (privateLinks_.find(dst->id()) != privateLinks_.end()) {
- s_surf_parsing_link_up_down_t info = privateLinks_.at(dst->id());
- if (info.linkDown) {
- route->link_list->push_back(info.linkDown);
+ std::pair<Link*, Link*> info = privateLinks_.at(dst->id());
+ if (info.second) {
+ route->link_list->push_back(info.second);
if (lat)
- *lat += info.linkDown->latency();
+ *lat += info.second->latency();
}
}