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
Platform generation: little modifications to the connectedness check function
[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
d4a598d
..
0342cfd
100644
(file)
--- a/
src/surf/surf_routing_none.c
+++ b/
src/surf/surf_routing_none.c
@@
-12,27
+12,28
@@
static xbt_dynar_t none_get_onelink_routes(AS_t rc) {
return NULL;
}
return NULL;
}
-static void none_get_route_and_latency(AS_t rc,
network_element_t src, network_element
_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)
{
route_t res,double *lat)
{
+ *lat = 0.0;
}
static route_t none_get_bypass_route(AS_t rc,
}
static route_t none_get_bypass_route(AS_t rc,
-
network_element
_t src,
-
network_element_t ds
t) {
+
sg_routing_edge
_t src,
+
sg_routing_edge_t dst, double *la
t) {
return NULL;
}
return NULL;
}
-static int none_parse_PU(AS_t rc,
network_element
_t elm) {
+static int none_parse_PU(AS_t rc,
sg_routing_edge
_t elm) {
XBT_DEBUG("Load process unit \"%s\"", elm->name);
XBT_DEBUG("Load process unit \"%s\"", elm->name);
- xbt_dynar_push_as(rc->index_network_elm,
network_element
_t,elm);
+ xbt_dynar_push_as(rc->index_network_elm,
sg_routing_edge
_t,elm);
/* don't care about PUs */
return -1;
}
/* don't care about PUs */
return -1;
}
-static int none_parse_AS(AS_t rc,
network_element
_t elm) {
+static int none_parse_AS(AS_t rc,
sg_routing_edge
_t elm) {
XBT_DEBUG("Load Autonomous system \"%s\"", elm->name);
XBT_DEBUG("Load Autonomous system \"%s\"", elm->name);
- xbt_dynar_push_as(rc->index_network_elm,
network_element
_t,elm);
+ xbt_dynar_push_as(rc->index_network_elm,
sg_routing_edge
_t,elm);
/* even don't care about sub-ASes -- I'm as nihilist as an old punk*/
return -1;
}
/* even don't care about sub-ASes -- I'm as nihilist as an old punk*/
return -1;
}
@@
-61,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);
}