-static void cluster_get_route(AS_t as,
- const char *src, const char *dst,
- route_t route) {
-
- surf_parsing_link_up_down_t info;
-
- info = xbt_dict_get_or_null(cluster_host_link,src);
- if(info) xbt_dynar_push_as(route->link_list,void*,info->link_up); //link_up
-
- if ( ((as_cluster_t)as)->backbone )
+static void cluster_get_route_and_latency(AS_t as,
+ network_element_t src, network_element_t dst,
+ route_t route, double *lat) {
+
+ s_surf_parsing_link_up_down_t info;
+ XBT_DEBUG("cluster_get_route_and_latency from '%s'[%d] to '%s'[%d]",
+ src->name,src->id,
+ dst->name,dst->id);
+
+ if(src->rc_type != SURF_NETWORK_ELEMENT_ROUTER){ // No specific link for router
+ info = xbt_dynar_get_as(as->link_up_down_list,src->id,s_surf_parsing_link_up_down_t);
+ if(info.link_up) { // link up
+ xbt_dynar_push_as(route->link_list,void*,info.link_up);
+ if (lat)
+ *lat += surf_network_model->extension.network.get_link_latency(info.link_up);
+ }
+ }
+
+ if ( ((as_cluster_t)as)->backbone ) {