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
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
surf
/
surf_routing_none.c
diff --git
a/src/surf/surf_routing_none.c
b/src/surf/surf_routing_none.c
index
6a53d45
..
1f403c8
100644
(file)
--- a/
src/surf/surf_routing_none.c
+++ b/
src/surf/surf_routing_none.c
@@
-13,12
+13,12
@@
static xbt_dynar_t none_get_onelink_routes(AS_t rc) {
}
static void none_get_route_and_latency(AS_t rc, sg_routing_edge_t src, sg_routing_edge_t dst,
}
static void none_get_route_and_latency(AS_t rc, sg_routing_edge_t src, sg_routing_edge_t dst,
-
route
_t res,double *lat)
+
sg_platf_route_cbarg
_t res,double *lat)
{
*lat = 0.0;
}
{
*lat = 0.0;
}
-static
route
_t none_get_bypass_route(AS_t rc,
+static
sg_platf_route_cbarg
_t none_get_bypass_route(AS_t rc,
sg_routing_edge_t src,
sg_routing_edge_t dst, double *lat) {
return NULL;
sg_routing_edge_t src,
sg_routing_edge_t dst, double *lat) {
return NULL;
@@
-62,6
+62,8
@@
AS_t model_none_create_sized(size_t childsize) {
void model_none_finalize(AS_t as) {
xbt_dict_free(&as->routing_sons);
xbt_dynar_free(&as->index_network_elm);
void model_none_finalize(AS_t as) {
xbt_dict_free(&as->routing_sons);
xbt_dynar_free(&as->index_network_elm);
+ if(as->link_up_down_list)
+ xbt_dynar_free(&as->link_up_down_list);
xbt_free(as);
}
xbt_free(as);
}