X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6edd98218de9a7958d1f1a4396a2d460eac2593a..894300bd1f239a44c84e2ba084b009bd532f9d60:/src/surf/surf_routing_vivaldi.c diff --git a/src/surf/surf_routing_vivaldi.c b/src/surf/surf_routing_vivaldi.c index 3b97eaa037..ed8a80cc3c 100644 --- a/src/surf/surf_routing_vivaldi.c +++ b/src/surf/surf_routing_vivaldi.c @@ -18,7 +18,7 @@ static XBT_INLINE double euclidean_dist_comp(int index, xbt_dynar_t src, xbt_dyn static void vivaldi_get_route_and_latency( AS_t rc, sg_routing_edge_t src_p, sg_routing_edge_t dst_p, - route_t route, double *lat) + sg_platf_route_cbarg_t route, double *lat) { s_surf_parsing_link_up_down_t info; @@ -27,8 +27,8 @@ static void vivaldi_get_route_and_latency( char *dst = (char*)dst_p->name; if(src_p->rc_type == SURF_NETWORK_ELEMENT_AS) { - route->src_gateway = xbt_lib_get_or_null(as_router_lib,ROUTER_PEER(src),ROUTING_ASR_LEVEL); - route->dst_gateway = xbt_lib_get_or_null(as_router_lib,ROUTER_PEER(dst),ROUTING_ASR_LEVEL); + route->gw_src = xbt_lib_get_or_null(as_router_lib,ROUTER_PEER(src),ROUTING_ASR_LEVEL); + route->gw_dst = xbt_lib_get_or_null(as_router_lib,ROUTER_PEER(dst),ROUTING_ASR_LEVEL); } double euclidean_dist; @@ -105,5 +105,6 @@ AS_t model_vivaldi_create(void) AS_t new_component = model_rulebased_create(); new_component->get_route_and_latency = vivaldi_get_route_and_latency; new_component->parse_PU = vivaldi_parse_PU; + new_component->get_graph = generic_get_graph; return new_component; }