X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/050b0ae9372720d3f2e258cd0d6895b36c83ea11..0818ce4261f0fa7f8d872767471e4c2654458eb9:/src/surf/surf_routing_none.c

diff --git a/src/surf/surf_routing_none.c b/src/surf/surf_routing_none.c
index f4d9516528..6a53d45d74 100644
--- a/src/surf/surf_routing_none.c
+++ b/src/surf/surf_routing_none.c
@@ -12,24 +12,30 @@ static xbt_dynar_t none_get_onelink_routes(AS_t rc) {
   return NULL;
 }
 
-static route_extended_t none_get_route(AS_t rc,
-                                       const char *src, const char *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)
 {
-  return NULL;
+  *lat = 0.0;
 }
 
-static route_extended_t none_get_bypass_route(AS_t rc,
-                                              const char *src,
-                                              const char *dst) {
+static route_t none_get_bypass_route(AS_t rc,
+    sg_routing_edge_t src,
+    sg_routing_edge_t dst, double *lat) {
   return NULL;
 }
 
-static void none_parse_PU(AS_t rc, const char *name) {
+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,sg_routing_edge_t,elm);
   /* don't care about PUs */
+  return -1;
 }
 
-static void none_parse_AS(AS_t rc, const char *name) {
-  /* even don't care about sub-ASes */
+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,sg_routing_edge_t,elm);
+  /* even don't care about sub-ASes -- I'm as nihilist as an old punk*/
+  return -1;
 }
 
 /* Creation routing model functions */
@@ -43,19 +49,19 @@ AS_t model_none_create_sized(size_t childsize) {
   new_component->parse_route = NULL;
   new_component->parse_ASroute = NULL;
   new_component->parse_bypassroute = NULL;
-  new_component->get_route = none_get_route;
+  new_component->get_route_and_latency = none_get_route_and_latency;
   new_component->get_onelink_routes = none_get_onelink_routes;
   new_component->get_bypass_route = none_get_bypass_route;
   new_component->finalize = model_none_finalize;
-
-  new_component->routing_sons = xbt_dict_new();
+  new_component->routing_sons = xbt_dict_new_homogeneous(NULL);
+  new_component->index_network_elm = xbt_dynar_new(sizeof(char*),NULL);
 
   return new_component;
 }
 
 void model_none_finalize(AS_t as) {
   xbt_dict_free(&as->routing_sons);
-  xbt_free(as->name);
+  xbt_dynar_free(&as->index_network_elm);
   xbt_free(as);
 }