-/* Copyright (c) 2009, 2010, 2011. The SimGrid Team.
+/* Copyright (c) 2009-2013. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
{
s_surf_parsing_link_up_down_t info;
- XBT_DEBUG("cluster_get_route_and_latency from '%s'[%d] to '%s'[%d]",
+ XBT_VERB("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((src->id == dst->id) && info.loopback_link ){
+ xbt_dynar_push_as(route->link_list, void *, info.loopback_link);
+ if (lat)
+ *lat +=
+ surf_network_model->extension.network.get_link_latency(info.
+ loopback_link);
+ return;
+ }
+
+
+ if (info.limiter_link) // limiter for sender
+ xbt_dynar_push_as(route->link_list, void *, info.limiter_link);
+
if (info.link_up) { // link up
xbt_dynar_push_as(route->link_list, void *, info.link_up);
if (lat)
surf_network_model->extension.network.get_link_latency(info.
link_down);
}
+
+ if (info.limiter_link) // limiter for receiver
+ xbt_dynar_push_as(route->link_list, void *, info.limiter_link);
+
}
}
} else {
new_xbt_graph_edge(graph, current, routerNode, edges);
}
+ }
}
- }
- }
+ }
}
static void model_cluster_finalize(AS_t as)