- XBT_DEBUG("vivaldi getLocalRoute from '%s'[%d] '%s'[%d]", src->cname(), src->id(), dst->cname(), dst->id());
-
- if (src->isNetZone()) {
- std::string srcName = "router_" + src->name();
- std::string dstName = "router_" + dst->name();
- route->gw_src = simgrid::s4u::Engine::getInstance()->getNetpointByNameOrNull(srcName.c_str());
- route->gw_dst = simgrid::s4u::Engine::getInstance()->getNetpointByNameOrNull(dstName.c_str());
- }
-
- /* Retrieve the private links */
- try {
- std::pair<surf::LinkImpl*, surf::LinkImpl*> info = privateLinks_.at(src->id());
- if (info.first) {
- route->link_list->push_back(info.first);
- if (lat)
- *lat += info.first->latency();
- }
- } catch (std::out_of_range& unfound) {
- XBT_DEBUG("Source of private link (%u) doesn't exist", src->id());
- }
-
- try {
- std::pair<surf::LinkImpl*, surf::LinkImpl*> info = privateLinks_.at(dst->id());
- if (info.second) {
- route->link_list->push_back(info.second);
- if (lat)
- *lat += info.second->latency();
- }
- } catch (std::out_of_range& unfound) {
- XBT_DEBUG("Destination of private link (%u) doesn't exist", dst->id());
+ XBT_DEBUG("vivaldi getLocalRoute from '%s'[%lu] '%s'[%lu]", src->get_cname(), src->id(), dst->get_cname(), dst->id());
+ const auto* engine = s4u::Engine::get_instance();
+ if (src->is_netzone()) {
+ std::string srcName = "router_" + src->get_name();
+ std::string dstName = "router_" + dst->get_name();
+ route->gw_src_ = engine->netpoint_by_name_or_null(srcName);
+ route->gw_dst_ = engine->netpoint_by_name_or_null(dstName);