A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
include the CITATION.bib in the archives
[simgrid.git]
/
src
/
surf
/
surf_routing_cluster.c
diff --git
a/src/surf/surf_routing_cluster.c
b/src/surf/surf_routing_cluster.c
index
f19670f
..
fbd7b42
100644
(file)
--- a/
src/surf/surf_routing_cluster.c
+++ b/
src/surf/surf_routing_cluster.c
@@
-23,13
+23,27
@@
static void cluster_get_route_and_latency(AS_t as,
{
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)
@@
-58,6
+72,10
@@
static void cluster_get_route_and_latency(AS_t as,
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);
+
}
}