X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f3a267e5ba376a0f0313767a12d518ffdeaa7196..309e5f403c858d0548cc4d7fc72901a79770b2f0:/src/kernel/routing/VivaldiZone.cpp diff --git a/src/kernel/routing/VivaldiZone.cpp b/src/kernel/routing/VivaldiZone.cpp index 39666c092b..b424a4738a 100644 --- a/src/kernel/routing/VivaldiZone.cpp +++ b/src/kernel/routing/VivaldiZone.cpp @@ -9,6 +9,7 @@ #include "simgrid/s4u/Host.hpp" #include "src/surf/network_interface.hpp" #include "src/surf/xml/platf_private.hpp" +#include "surf/surf.hpp" #include @@ -71,8 +72,8 @@ void VivaldiZone::setPeerLink(NetPoint* netpoint, double bw_in, double bw_out, s std::string link_up = "link_" + netpoint->get_name() + "_UP"; std::string link_down = "link_" + netpoint->get_name() + "_DOWN"; - surf::LinkImpl* linkUp = surf_network_model->createLink(link_up, bw_out, 0, SURF_LINK_SHARED); - surf::LinkImpl* linkDown = surf_network_model->createLink(link_down, bw_in, 0, SURF_LINK_SHARED); + resource::LinkImpl* linkUp = surf_network_model->createLink(link_up, bw_out, 0, s4u::Link::SharingPolicy::SHARED); + resource::LinkImpl* linkDown = surf_network_model->createLink(link_down, bw_in, 0, s4u::Link::SharingPolicy::SHARED); private_links_.insert({netpoint->id(), {linkUp, linkDown}}); } @@ -90,7 +91,7 @@ void VivaldiZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArg /* Retrieve the private links */ auto src_link = private_links_.find(src->id()); if (src_link != private_links_.end()) { - std::pair info = src_link->second; + std::pair info = src_link->second; if (info.first) { route->link_list.push_back(info.first); if (lat) @@ -102,7 +103,7 @@ void VivaldiZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArg auto dst_link = private_links_.find(dst->id()); if (dst_link != private_links_.end()) { - std::pair info = dst_link->second; + std::pair info = dst_link->second; if (info.second) { route->link_list.push_back(info.second); if (lat)