X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fa222c38f9b796be07ab4351ffc810a61a8fd705..0bac7d0f735ac8ba47a46e1db4f6d7a7164fe0f2:/src/surf/surf_routing_vivaldi.cpp
diff --git a/src/surf/surf_routing_vivaldi.cpp b/src/surf/surf_routing_vivaldi.cpp
index bb993082df..315369c432 100644
--- a/src/surf/surf_routing_vivaldi.cpp
+++ b/src/surf/surf_routing_vivaldi.cpp
@@ -20,9 +20,12 @@ static XBT_INLINE double euclidean_dist_comp(int index, xbt_dynar_t src, xbt_dyn
AS_t model_vivaldi_create(void)
{
- return new AsVivaldi();
+ return new simgrid::surf::AsVivaldi();
}
+namespace simgrid {
+namespace surf {
+
void AsVivaldi::getRouteAndLatency(RoutingEdge *src, RoutingEdge *dst, sg_platf_route_cbarg_t route, double *lat)
{
s_surf_parsing_link_up_down_t info;
@@ -54,8 +57,9 @@ void AsVivaldi::getRouteAndLatency(RoutingEdge *src, RoutingEdge *dst, sg_platf_
*lat += static_cast(info.link_up)->getLatency();
}
}
- src_ctn = (xbt_dynar_t) xbt_lib_get_or_null(host_lib, tmp_src_name, COORD_HOST_LEVEL);
- if(!src_ctn ) src_ctn = (xbt_dynar_t) xbt_lib_get_or_null(host_lib, src->getName(), COORD_HOST_LEVEL);
+ src_ctn = (xbt_dynar_t) simgrid::Host::get_host(tmp_src_name)->facet(COORD_HOST_LEVEL);
+ if (src_ctn == nullptr)
+ src_ctn = (xbt_dynar_t) simgrid::Host::get_host(src->getName())->facet(COORD_HOST_LEVEL);
}
else if(src->getRcType() == SURF_NETWORK_ELEMENT_ROUTER || src->getRcType() == SURF_NETWORK_ELEMENT_AS){
tmp_src_name = ROUTER_PEER(src->getName());
@@ -76,8 +80,11 @@ void AsVivaldi::getRouteAndLatency(RoutingEdge *src, RoutingEdge *dst, sg_platf_
*lat += static_cast(info.link_down)->getLatency();
}
}
- dst_ctn = (xbt_dynar_t) xbt_lib_get_or_null(host_lib, tmp_dst_name, COORD_HOST_LEVEL);
- if(!dst_ctn ) dst_ctn = (xbt_dynar_t) xbt_lib_get_or_null(host_lib, dst->getName(), COORD_HOST_LEVEL);
+ dst_ctn = (xbt_dynar_t) simgrid::Host::get_host(tmp_dst_name)
+ ->facet(COORD_HOST_LEVEL);
+ if (dst_ctn == nullptr)
+ dst_ctn = (xbt_dynar_t) simgrid::Host::get_host(dst->getName())
+ ->facet(COORD_HOST_LEVEL);
}
else if(dst->getRcType() == SURF_NETWORK_ELEMENT_ROUTER || dst->getRcType() == SURF_NETWORK_ELEMENT_AS){
tmp_dst_name = ROUTER_PEER(dst->getName());
@@ -106,3 +113,6 @@ int AsVivaldi::parsePU(RoutingEdge *elm) {
xbt_dynar_push_as(p_indexNetworkElm, sg_routing_edge_t, elm);
return xbt_dynar_length(p_indexNetworkElm)-1;
}
+
+}
+}