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
rename the fields of AS for clarity sake
[simgrid.git]
/
src
/
surf
/
surf_routing_cluster.cpp
diff --git
a/src/surf/surf_routing_cluster.cpp
b/src/surf/surf_routing_cluster.cpp
index
913d605
..
f384013
100644
(file)
--- a/
src/surf/surf_routing_cluster.cpp
+++ b/
src/surf/surf_routing_cluster.cpp
@@
-28,7
+28,7
@@
void AsCluster::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cb
if (src->getRcType() != SURF_NETWORK_ELEMENT_ROUTER) { // No specific link for router
if((src->getId() == dst->getId()) && p_has_loopback ){
if (src->getRcType() != SURF_NETWORK_ELEMENT_ROUTER) { // No specific link for router
if((src->getId() == dst->getId()) && p_has_loopback ){
- info = xbt_dynar_get_as(
p_linkUpDownList
, src->getId() * p_nb_links_per_node, s_surf_parsing_link_up_down_t);
+ info = xbt_dynar_get_as(
upDownLinks
, src->getId() * p_nb_links_per_node, s_surf_parsing_link_up_down_t);
xbt_dynar_push_as(route->link_list, void *, info.link_up);
if (lat)
*lat += static_cast<Link*>(info.link_up)->getLatency();
xbt_dynar_push_as(route->link_list, void *, info.link_up);
if (lat)
*lat += static_cast<Link*>(info.link_up)->getLatency();
@@
-37,11
+37,11
@@
void AsCluster::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cb
if (p_has_limiter){ // limiter for sender
if (p_has_limiter){ // limiter for sender
- info = xbt_dynar_get_as(
p_linkUpDownList
, src->getId() * p_nb_links_per_node + p_has_loopback, s_surf_parsing_link_up_down_t);
+ info = xbt_dynar_get_as(
upDownLinks
, src->getId() * p_nb_links_per_node + p_has_loopback, s_surf_parsing_link_up_down_t);
xbt_dynar_push_as(route->link_list, void *, info.link_up);
}
xbt_dynar_push_as(route->link_list, void *, info.link_up);
}
- info = xbt_dynar_get_as(
p_linkUpDownList
, src->getId() * p_nb_links_per_node + p_has_loopback + p_has_limiter, s_surf_parsing_link_up_down_t);
+ info = xbt_dynar_get_as(
upDownLinks
, src->getId() * p_nb_links_per_node + p_has_loopback + p_has_limiter, 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)
if (info.link_up) { // link up
xbt_dynar_push_as(route->link_list, void *, info.link_up);
if (lat)
@@
-58,7
+58,7
@@
void AsCluster::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cb
}
if (dst->getRcType() != SURF_NETWORK_ELEMENT_ROUTER) { // No specific link for router
}
if (dst->getRcType() != SURF_NETWORK_ELEMENT_ROUTER) { // No specific link for router
- info = xbt_dynar_get_as(
p_linkUpDownList
, dst->getId() * p_nb_links_per_node + p_has_loopback + p_has_limiter, s_surf_parsing_link_up_down_t);
+ info = xbt_dynar_get_as(
upDownLinks
, dst->getId() * p_nb_links_per_node + p_has_loopback + p_has_limiter, s_surf_parsing_link_up_down_t);
if (info.link_down) { // link down
xbt_dynar_push_as(route->link_list, void *, info.link_down);
if (info.link_down) { // link down
xbt_dynar_push_as(route->link_list, void *, info.link_down);
@@
-66,7
+66,7
@@
void AsCluster::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cb
*lat += static_cast<Link*>(info.link_down)->getLatency();
}
if (p_has_limiter){ // limiter for receiver
*lat += static_cast<Link*>(info.link_down)->getLatency();
}
if (p_has_limiter){ // limiter for receiver
- info = xbt_dynar_get_as(
p_linkUpDownList
, dst->getId() * p_nb_links_per_node + p_has_loopback, s_surf_parsing_link_up_down_t);
+ info = xbt_dynar_get_as(
upDownLinks
, dst->getId() * p_nb_links_per_node + p_has_loopback, s_surf_parsing_link_up_down_t);
xbt_dynar_push_as(route->link_list, void *, info.link_up);
}
}
xbt_dynar_push_as(route->link_list, void *, info.link_up);
}
}
@@
-100,7
+100,7
@@
void AsCluster::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges)
if (src->getRcType() != SURF_NETWORK_ELEMENT_ROUTER) {
previous = new_xbt_graph_node(graph, src->getName(), nodes);
if (src->getRcType() != SURF_NETWORK_ELEMENT_ROUTER) {
previous = new_xbt_graph_node(graph, src->getName(), nodes);
- info = xbt_dynar_get_as(
p_linkUpDownList
, src->getId(), s_surf_parsing_link_up_down_t);
+ info = xbt_dynar_get_as(
upDownLinks
, src->getId(), s_surf_parsing_link_up_down_t);
if (info.link_up) { // link up
if (info.link_up) { // link up
@@
-158,7
+158,7
@@
void AsCluster::create_links_for_node(sg_platf_cluster_cbarg_t cluster, int id,
info.link_up = sg_link_by_name(link_id);
info.link_down = info.link_up;
}
info.link_up = sg_link_by_name(link_id);
info.link_down = info.link_up;
}
- xbt_dynar_set(
p_linkUpDownList
, position, &info);
+ xbt_dynar_set(
upDownLinks
, position, &info);
xbt_free(link_id);
}
xbt_free(link_id);
}