X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ae8140f19db6cb86f753e32499eab49190846d1f..cfcc26205c43c7ee01341db3d2910f5efbd2fa6b:/src/surf/surf_routing_none.c

diff --git a/src/surf/surf_routing_none.c b/src/surf/surf_routing_none.c
index d4a598df46..1f403c8f42 100644
--- 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;
 }
 
-static void none_get_route_and_latency(AS_t rc, network_element_t src, network_element_t dst,
-                                       route_t res,double *lat)
+static void none_get_route_and_latency(AS_t rc, sg_routing_edge_t src, sg_routing_edge_t dst,
+    sg_platf_route_cbarg_t res,double *lat)
 {
+  *lat = 0.0;
 }
 
-static route_t none_get_bypass_route(AS_t rc,
-    network_element_t src,
-    network_element_t dst) {
+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;
 }
 
-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_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;
 }
 
-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_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;
 }
@@ -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);
+  if(as->link_up_down_list)
+    xbt_dynar_free(&as->link_up_down_list);
   xbt_free(as);
 }