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
Kill link_lib and have C++ handle the hashmap of all links
[simgrid.git]
/
src
/
surf
/
surf_routing_floyd.cpp
diff --git
a/src/surf/surf_routing_floyd.cpp
b/src/surf/surf_routing_floyd.cpp
index e87df4f4e70d545763b33087eebbc2ba95cb2ebd..adaecedfcaae510374d64c1fac7410f54340fc07 100644
(file)
--- a/
src/surf/surf_routing_floyd.cpp
+++ b/
src/surf/surf_routing_floyd.cpp
@@
-124,7
+124,7
@@
void AsFloyd::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_plat
xbt_dynar_foreach(links, cpt, link) {
xbt_dynar_push_as(res->link_list, sg_routing_link_t, link);
if (lat)
xbt_dynar_foreach(links, cpt, link) {
xbt_dynar_push_as(res->link_list, sg_routing_link_t, link);
if (lat)
- *lat += static_cast<
NetworkLinkPtr
>(link)->getLatency();
+ *lat += static_cast<
Link*
>(link)->getLatency();
}
prev_dst_gw = e_route->gw_dst;
}
prev_dst_gw = e_route->gw_dst;
@@
-193,7
+193,7
@@
void AsFloyd::parseRoute(sg_platf_route_cbarg_t route)
xbt_dynar_t link_route_to_test = xbt_dynar_new(sizeof(sg_routing_link_t), NULL);
xbt_dynar_foreach(route->link_list,cpt,link_name)
{
xbt_dynar_t link_route_to_test = xbt_dynar_new(sizeof(sg_routing_link_t), NULL);
xbt_dynar_foreach(route->link_list,cpt,link_name)
{
- void *link =
xbt_lib_get_or_null(link_lib, link_name, SURF_LINK_LEVEL
);
+ void *link =
Link::byName(link_name
);
xbt_assert(link,"Link : '%s' doesn't exists.",link_name);
xbt_dynar_push(link_route_to_test,&link);
}
xbt_assert(link,"Link : '%s' doesn't exists.",link_name);
xbt_dynar_push(link_route_to_test,&link);
}
@@
-229,7
+229,7
@@
void AsFloyd::parseRoute(sg_platf_route_cbarg_t route)
for(i=xbt_dynar_length(route->link_list) ;i>0 ;i--)
{
link_name = xbt_dynar_get_as(route->link_list,i-1,char *);
for(i=xbt_dynar_length(route->link_list) ;i>0 ;i--)
{
link_name = xbt_dynar_get_as(route->link_list,i-1,char *);
- void *link =
xbt_lib_get_or_null(link_lib, link_name, SURF_LINK_LEVEL
);
+ void *link =
Link::byName(link_name
);
xbt_assert(link,"Link : '%s' doesn't exists.",link_name);
xbt_dynar_push(link_route_to_test,&link);
}
xbt_assert(link,"Link : '%s' doesn't exists.",link_name);
xbt_dynar_push(link_route_to_test,&link);
}