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

diff --git a/src/surf/surf_routing_none.c b/src/surf/surf_routing_none.c
index 85776de552..d312a29797 100644
--- a/src/surf/surf_routing_none.c
+++ b/src/surf/surf_routing_none.c
@@ -12,23 +12,35 @@ static xbt_dynar_t none_get_onelink_routes(AS_t rc) {
   return NULL;
 }
 
-static void none_get_route_and_latency(AS_t rc, const char *src, const char *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,
-                                              const char *src,
-                                              const char *dst) {
+static void none_get_graph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges, AS_t rc)
+{
+	XBT_INFO("No routing no graph");
+}
+
+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 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) {
+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 */
@@ -46,15 +58,17 @@ AS_t model_none_create_sized(size_t childsize) {
   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->get_graph = none_get_graph;
+  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_dynar_free(&as->link_up_down_list);
   xbt_free(as);
 }