Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
clean the hierarchical routing code
authornavarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Tue, 28 Sep 2010 08:52:47 +0000 (08:52 +0000)
committernavarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Tue, 28 Sep 2010 08:52:47 +0000 (08:52 +0000)
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8244 48e7efb5-ca39-0410-a469-dd3cf9ba447f

src/surf/surf_routing.c

index f11bd97..83e08a1 100644 (file)
 #include "xbt/set.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route,surf,"Routing part of surf");
-    
-////////////////////////////////////////////////////////////////////////////////
-// HERE START THE NEW CODE
-////////////////////////////////////////////////////////////////////////////////
-
-//...... DEBUG ONLY .... //
-static void print_tree(routing_component_t rc);
-static void print_global(void);
-static void print_AS_start(void);
-static void print_AS_end(void);
-static void print_host(void);
-static void print_link(void);
-static void print_route(void);
-static void print_ctn(void);
-static void DEBUG_exit(void);
-
-////////////////////////////////////////////////////////////////////////////////
-// HERE START THE NEW CODE
-////////////////////////////////////////////////////////////////////////////////
 
 /* Global vars */
 routing_global_t global_routing = NULL;
@@ -61,15 +42,6 @@ static void  model_none_load(void);   /* none routing model */
 static void  model_none_unload(void); /* none routing model */
 static void  model_none_end(void);    /* none routing model */
 
-/* Table of routing models */
-// typedef enum {
-//   SURF_MODEL_FULL = 0,
-//   SURF_MODEL_FLOYD,
-//   SURF_MODEL_DIJKSTRA,
-//   SURF_MODEL_DIJKSTRACACHE,
-//   SURF_MODEL_NONE
-// } e_surf_model_type_t;
-
 /* this lines are olny for replace use like index in the model table */
 #define SURF_MODEL_FULL           0
 #define SURF_MODEL_FLOYD          1
@@ -118,7 +90,6 @@ static void generic_src_dst_check(routing_component_t rc, const char* src, const
 /* **************************** GLOBAL FUNCTIONS **************************** */
   
 /* global parse functions */
-
 static char* src = NULL;    /* temporary store the source name of a route */
 static char* dst = NULL;    /* temporary store the destination name of a route */
 static char* gw_src = NULL; /* temporary store the gateway source name of a route */
@@ -159,6 +130,8 @@ static void parse_S_route_new_and_endpoints(void) {
     THROW2(arg_error,0,"Route between %s to %s can not be defined",A_surfxml_route_src,A_surfxml_route_dst);
   src = A_surfxml_route_src;
   dst = A_surfxml_route_dst;
+  xbt_assert2(strlen(src)>0||strlen(dst)>0,
+      "Some limits are null in the route between \"%s\" and \"%s\"",src,dst);
   link_list = xbt_dynar_new(sizeof(char*), &xbt_free_ref);
 }
 
@@ -172,6 +145,8 @@ static void parse_S_ASroute_new_and_endpoints(void) {
   dst = A_surfxml_ASroute_dst;
   gw_src = A_surfxml_ASroute_gw_src;
   gw_dst = A_surfxml_ASroute_gw_dst;
+  xbt_assert2(strlen(src)>0||strlen(dst)>0||strlen(gw_src)>0||strlen(gw_dst)>0,
+      "Some limits are null in the route between \"%s\" and \"%s\"",src,dst);
   link_list = xbt_dynar_new(sizeof(char*), &xbt_free_ref);
 }
 
@@ -185,6 +160,8 @@ static void parse_S_bypassRoute_new_and_endpoints(void) {
   dst = A_surfxml_bypassRoute_dst;
   gw_src = A_surfxml_bypassRoute_gw_src;
   gw_dst = A_surfxml_bypassRoute_gw_dst;
+  xbt_assert2(strlen(src)>0||strlen(dst)>0||strlen(gw_src)>0||strlen(gw_dst)>0,
+      "Some limits are null in the route between \"%s\" and \"%s\"",src,dst);
   link_list = xbt_dynar_new(sizeof(char*), &xbt_free_ref);
 }
 
@@ -203,7 +180,6 @@ static void parse_E_link_c_ctn_new_elem(void) {
 static void parse_E_route_store_route(void) {
   route_t route = xbt_new0(s_route_t,1);
   route->link_list = link_list;
-  //TODO: NULL?
   xbt_assert1(generic_processing_units_exist(current_routing,src),"the \"%s\" processing units gateway does not exist",src);
   xbt_assert1(generic_processing_units_exist(current_routing,dst),"the \"%s\" processing units gateway does not exist",dst);
   xbt_assert1(current_routing->set_route,"no defined method \"set_route\" in \"%s\"",current_routing->name);
@@ -221,7 +197,6 @@ static void parse_E_ASroute_store_route(void) {
   e_route->generic_route.link_list = link_list;
   e_route->src_gateway = xbt_strdup(gw_src);
   e_route->dst_gateway = xbt_strdup(gw_dst);
-  //TODO: NULL?
   xbt_assert1(generic_autonomous_system_exist(current_routing,src),"the \"%s\" autonomous system does not exist",src);
   xbt_assert1(generic_autonomous_system_exist(current_routing,dst),"the \"%s\" autonomous system does not exist",dst);
   xbt_assert1(generic_processing_units_exist(current_routing,gw_src),"the \"%s\" processing units gateway does not exist",gw_src);
@@ -243,7 +218,6 @@ static void parse_E_bypassRoute_store_route(void) {
   e_route->generic_route.link_list = link_list;
   e_route->src_gateway = xbt_strdup(gw_src);
   e_route->dst_gateway = xbt_strdup(gw_dst);
-  //TODO: NULL?
   xbt_assert1(generic_autonomous_system_exist(current_routing,src),"the \"%s\" autonomous system does not exist",src);
   xbt_assert1(generic_autonomous_system_exist(current_routing,dst),"the \"%s\" autonomous system does not exist",dst);
   xbt_assert1(generic_processing_units_exist(current_routing,gw_src),"the \"%s\" processing units gateway does not exist",gw_src);
@@ -330,6 +304,8 @@ static void parse_E_AS(void) {
   if( current_routing == NULL ) {
     THROW1(arg_error,0,"Close AS(%s), that never open",A_surfxml_AS_id);
   } else {
+      xbt_assert1(!xbt_dict_get_or_null(global_routing->where_network_elements,current_routing->name),
+          "The AS \"%s\" already exist",current_routing->name);
       xbt_dict_set(global_routing->where_network_elements,current_routing->name,current_routing->routing_father,NULL);
       (*(current_routing->routing->unload))();
       (*(current_routing->routing->end))();
@@ -354,7 +330,7 @@ static xbt_dynar_t elements_father(const char* src,const char* dst) {
   
   xbt_assert0(src&&dst,"bad parameters for \"elements_father\" method");
   
-  xbt_dynar_t result = xbt_dynar_new(sizeof(char*), NULL); // &xbt_free_ref
+  xbt_dynar_t result = xbt_dynar_new(sizeof(char*), NULL);
   
   routing_component_t src_as, dst_as;
   int index_src, index_dst, index_father_src, index_father_dst;
@@ -410,9 +386,9 @@ static xbt_dynar_t elements_father(const char* src,const char* dst) {
     father = xbt_dynar_get_ptr(path_src,index_father_src);
   
   /* (5) result generation */
-  xbt_dynar_push(result,father); // first same the father of src and dst
-  xbt_dynar_push(result,current_src); // second the first different father of src 
-  xbt_dynar_push(result,current_dst); // three  the first different father of dst
+  xbt_dynar_push(result,father); /* first same the father of src and dst */
+  xbt_dynar_push(result,current_src); /* second the first different father of src */
+  xbt_dynar_push(result,current_dst); /* three  the first different father of dst */
   
   xbt_dynar_free(&path_src);
   xbt_dynar_free(&path_dst);
@@ -627,11 +603,6 @@ void routing_model_create(size_t size_of_links, void* loopback) {
   
   surfxml_add_callback(STag_surfxml_AS_cb_list, &parse_S_AS);
   surfxml_add_callback(ETag_surfxml_AS_cb_list, &parse_E_AS);
-  
-  /* DEBUG ONLY */  
-  //surfxml_add_callback(ETag_surfxml_platform_cb_list, &DEBUG_exit);
-  
-  // TODO checked if ANY AS are duplicated
 }
 
 /* ************************************************************************** */
@@ -729,7 +700,7 @@ static void model_full_unload(void) {
 
 static void  model_full_end(void) {
   
-  char *key, *end; //*src_name, *dst_name
+  char *key, *end;
   const char* sep = "#";
   int src_id, dst_id;
   unsigned int i, j;
@@ -770,7 +741,7 @@ static void  model_full_end(void) {
   if(current_routing->hierarchy == SURF_ROUTING_BASE) {
     for (i = 0; i < table_size; i++) {
       e_route = TO_ROUTE_FULL(i, i);
-      if(!e_route) { // && !xbt_dynar_length(e_route->generic_route.link_list)
+      if(!e_route) {
         e_route = xbt_new0(s_route_extended_t,1);
         e_route->src_gateway = NULL;
         e_route->dst_gateway = NULL;
@@ -839,7 +810,7 @@ static route_extended_t floyd_get_route(routing_component_t rc, const char* src,
   do {
     prev_pred = pred;
     pred = TO_FLOYD_PRED(*src_id, pred);
-    if(pred == -1) // if no pred in route -> no route to host
+    if(pred == -1) /* if no pred in route -> no route to host */
       break;      
     xbt_assert2(TO_FLOYD_LINK(pred,prev_pred),"Invalid link for the route between \"%s\" or \"%s\"", src, dst);
     
@@ -853,22 +824,14 @@ static route_extended_t floyd_get_route(routing_component_t rc, const char* src,
     if(first) first_gw = gw_dst;
     
     if(rc->hierarchy == SURF_ROUTING_RECURSIVE && !first && strcmp(gw_dst,prev_gw_src)) {
-      //routing_component_t src_as = xbt_dict_get_or_null(global_routing->where_network_elements,gw_dst);
-      //routing_component_t dst_as = xbt_dict_get_or_null(global_routing->where_network_elements,prev_gw_src);
-      //xbt_assert4(src_as==dst_as,"bad routing, differents AS gateways in route \"%s\" to \"%s\" (\"%s\"-\"%s\")",src,dst,gw_dst,prev_gw_src);
-      //route_extended_t e_route_as_to_as = (*(src_as->get_route))(src_as,gw_dst,prev_gw_src);
-      // TODO: - check for error - is possible to generate a route like =  as----as----as
       xbt_dynar_t e_route_as_to_as = (*(global_routing->get_route))(gw_dst,prev_gw_src);
       xbt_assert2(e_route_as_to_as,"no route between \"%s\" and \"%s\"",gw_dst,prev_gw_src);
-      //links = e_route_as_to_as->generic_route.link_list;
       links = e_route_as_to_as;
       int pos = 0;
       xbt_dynar_foreach(links, cpt, link) {
         xbt_dynar_insert_at(new_e_route->generic_route.link_list,pos,&link);
         pos++;
       }
-//       xbt_dynar_free(&(e_route_as_to_as->generic_route.link_list));
-//       xbt_free(e_route_as_to_as);
     }
     
     links = e_route->generic_route.link_list;
@@ -938,7 +901,7 @@ static void  model_floyd_end(void) {
   routing_component_floyd_t routing = ((routing_component_floyd_t)current_routing);
   xbt_dict_cursor_t cursor = NULL;
   double * cost_table;
-  char *key,*data, *end; //*src_name, *dst_name;
+  char *key,*data, *end;
   const char *sep = "#";
   xbt_dynar_t keys;
   int src_id, dst_id;
@@ -948,16 +911,16 @@ static void  model_floyd_end(void) {
   int table_size = xbt_dict_length(routing->to_index);
   
   /* Create Cost, Predecessor and Link tables */
-  cost_table = xbt_new0(double, table_size*table_size); //link cost from host to host
-  routing->predecessor_table = xbt_new0(int, table_size*table_size); //predecessor host numbers
-  routing->link_table = xbt_new0(route_extended_t, table_size*table_size); //actual link between src and dst
+  cost_table = xbt_new0(double, table_size*table_size); /* link cost from host to host */
+  routing->predecessor_table = xbt_new0(int, table_size*table_size); /* predecessor host numbers */
+  routing->link_table = xbt_new0(route_extended_t, table_size*table_size); /* actual link between src and dst */
 
   /* Initialize costs and predecessors*/
   for(i = 0; i<table_size;i++)
     for(j = 0; j<table_size;j++) {
         TO_FLOYD_COST(i,j) = DBL_MAX;
         TO_FLOYD_PRED(i,j) = -1;
-        TO_FLOYD_LINK(i,j) = NULL; // FIXED by david
+        TO_FLOYD_LINK(i,j) = NULL; /* fixed, missing in the previous version */
     }
 
    /* Put the routes in position */
@@ -967,8 +930,8 @@ static void  model_floyd_end(void) {
     dst_id = strtol(xbt_dynar_get_as(keys, 1, char *), &end, 10);
     TO_FLOYD_LINK(src_id,dst_id) = generic_new_extended_route(current_routing->hierarchy,data,0);
     TO_FLOYD_PRED(src_id,dst_id) = src_id;
-    //link cost
-    TO_FLOYD_COST(src_id,dst_id) = ((TO_FLOYD_LINK(src_id,dst_id))->generic_route.link_list)->used; // assume 1 for now // TODO DAVID REDO
+    /* set link cost */
+    TO_FLOYD_COST(src_id,dst_id) = ((TO_FLOYD_LINK(src_id,dst_id))->generic_route.link_list)->used; /* count of links, old model assume 1 */
     xbt_dynar_free(&keys);
   }
 
@@ -976,7 +939,7 @@ static void  model_floyd_end(void) {
   if(current_routing->hierarchy == SURF_ROUTING_BASE) {
     for (i = 0; i < table_size; i++) {
       route_extended_t e_route = TO_FLOYD_LINK(i, i);
-      if(!e_route) { // && !xbt_dynar_length(e_route->generic_route.link_list)
+      if(!e_route) {
         e_route = xbt_new0(s_route_extended_t,1);
         e_route->src_gateway = NULL;
         e_route->dst_gateway = NULL;
@@ -988,7 +951,7 @@ static void  model_floyd_end(void) {
       }
     }
   }
-  //Calculate path costs 
+  /* Calculate path costs */
   for(c=0;c<table_size;c++) {
     for(a=0;a<table_size;a++) {
       for(b=0;b<table_size;b++) {
@@ -1013,7 +976,7 @@ static void  model_floyd_end(void) {
   /* delete parse dict */
   xbt_dict_free(&(routing->parse_routes));
 
-  //cleanup
+  /* cleanup */
   xbt_free(cost_table);
 }
 
@@ -1034,7 +997,7 @@ typedef struct {
 
 typedef struct graph_node_data {
   int id; 
-  int graph_id; //used for caching internal graph id's
+  int graph_id; /* used for caching internal graph id's */
 } s_graph_node_data_t, * graph_node_data_t;
 
 typedef struct graph_node_map_element {
@@ -1081,12 +1044,12 @@ static xbt_node_t route_graph_new_node(routing_component_dijkstra_t rc, int id,
   graph_node_data_t data = NULL;
   graph_node_map_element_t elm = NULL;
 
-  data = xbt_new0(struct graph_node_data, 1); // FIXED by david
+  data = xbt_new0(struct graph_node_data, 1);
   data->id = id;
   data->graph_id = graph_id;
   node = xbt_graph_new_node(routing->route_graph, data);
 
-  elm = xbt_new0(struct graph_node_map_element, 1); // FIXED by david
+  elm = xbt_new0(struct graph_node_map_element, 1);
   elm->node = node;
   xbt_dict_set_ext(routing->graph_node_map, (char*)(&id), sizeof(int), (xbt_set_elm_t)elm, &graph_node_map_elem_free);
 
@@ -1101,7 +1064,7 @@ static graph_node_map_element_t graph_node_map_search(routing_component_dijkstra
 
 /* Parsing */
 
-static void route_new_dijkstra(routing_component_dijkstra_t rc, int src_id, int dst_id, route_extended_t e_route       ) {
+static void route_new_dijkstra(routing_component_dijkstra_t rc, int src_id, int dst_id, route_extended_t e_route ) {
   routing_component_dijkstra_t routing = (routing_component_dijkstra_t) rc;
 
   xbt_node_t src = NULL;
@@ -1115,7 +1078,7 @@ static void route_new_dijkstra(routing_component_dijkstra_t rc, int src_id, int
   if(dst_elm)
     dst = dst_elm->node;
 
-  //add nodes if they don't exist in the graph
+  /* add nodes if they don't exist in the graph */
   if(src_id == dst_id && src == NULL && dst == NULL) {
     src = route_graph_new_node(rc,src_id, -1);
     dst = src;
@@ -1128,7 +1091,7 @@ static void route_new_dijkstra(routing_component_dijkstra_t rc, int src_id, int
     }
   }
 
-  //add link as edge to graph
+  /* add link as edge to graph */
   xbt_graph_new_edge(routing->route_graph, src, dst, e_route);
 }
 
@@ -1203,7 +1166,7 @@ static route_extended_t dijkstra_get_route(routing_component_t rc, const char* s
   src_node_id = ((graph_node_data_t)xbt_graph_node_get_data(src_elm->node))->graph_id;
   dst_node_id = ((graph_node_data_t)xbt_graph_node_get_data(dst_elm->node))->graph_id;
 
-  /* if the src and dst are the same */ // FIXED by david
+  /* if the src and dst are the same */  /* fixed, missing in the previous version */
   if( src_node_id == dst_node_id ) {
     
     xbt_node_t node_s_v = xbt_dynar_get_as(nodes, src_node_id, xbt_node_t);
@@ -1227,19 +1190,19 @@ static route_extended_t dijkstra_get_route(routing_component_t rc, const char* s
     elm = (route_cache_element_t)xbt_dict_get_or_null_ext(routing->route_cache, (char*)(&src_id), sizeof(int));
   }
 
-  if(elm) { //cached mode and cache hit
+  if(elm) { /* cached mode and cache hit */
     pred_arr = elm->pred_arr;
-  } else { //not cached mode or cache miss
+  } else { /* not cached mode or cache miss */
     double * cost_arr = NULL;
     xbt_heap_t pqueue = NULL;
     int i = 0;
 
     int nr_nodes = xbt_dynar_length(nodes);
-    cost_arr = xbt_new0(double, nr_nodes); // link cost from src to other hosts
-    pred_arr = xbt_new0(int, nr_nodes);    // predecessors in path from src
+    cost_arr = xbt_new0(double, nr_nodes); /* link cost from src to other hosts */
+    pred_arr = xbt_new0(int, nr_nodes);    /* predecessors in path from src */
     pqueue = xbt_heap_new(nr_nodes, xbt_free);
 
-    //initialize
+    /* initialize */
     cost_arr[src_node_id] = 0.0;
 
     for(i = 0; i < nr_nodes; i++) {
@@ -1249,14 +1212,14 @@ static route_extended_t dijkstra_get_route(routing_component_t rc, const char* s
 
       pred_arr[i] = 0;
 
-      //initialize priority queue
+      /* initialize priority queue */
       nodeid = xbt_new0(int, 1);
       *nodeid = i;
       xbt_heap_push(pqueue, nodeid, cost_arr[i]);
 
     }
 
-    // apply dijkstra using the indexes from the graph's node array
+    /* apply dijkstra using the indexes from the graph's node array */
     while(xbt_heap_size(pqueue) > 0) {
       int * v_id = xbt_heap_pop(pqueue);
       xbt_node_t v_node = xbt_dynar_get_as(nodes, *v_id, xbt_node_t);
@@ -1268,8 +1231,8 @@ static route_extended_t dijkstra_get_route(routing_component_t rc, const char* s
         xbt_node_t u_node = xbt_graph_edge_get_target(edge);
         graph_node_data_t data = xbt_graph_node_get_data(u_node);
         int u_id = data->graph_id;
-       route_extended_t tmp_e_route = (route_extended_t)xbt_graph_edge_get_data(edge); // added TODO DAVID REDO
-        int cost_v_u = (tmp_e_route->generic_route.link_list)->used; //fixed link cost for now // TODO DAVID REDO
+       route_extended_t tmp_e_route = (route_extended_t)xbt_graph_edge_get_data(edge);
+        int cost_v_u = (tmp_e_route->generic_route.link_list)->used;  /* count of links, old model assume 1 */
 
         if(cost_v_u + cost_arr[*v_id] < cost_arr[u_id]) {
           pred_arr[u_id] = *v_id;
@@ -1280,7 +1243,7 @@ static route_extended_t dijkstra_get_route(routing_component_t rc, const char* s
         }
       }
 
-      //free item popped from pqueue
+      /* free item popped from pqueue */
       xbt_free(v_id);
     }
 
@@ -1288,7 +1251,7 @@ static route_extended_t dijkstra_get_route(routing_component_t rc, const char* s
     xbt_heap_free(pqueue);
   }
   
-  //compose route path with links
+  /* compose route path with links */
   char *gw_src,*gw_dst, *prev_gw_src,*prev_gw_dst, *first_gw;
   
   for(v = dst_node_id; v != src_node_id; v = pred_arr[v]) {
@@ -1308,22 +1271,14 @@ static route_extended_t dijkstra_get_route(routing_component_t rc, const char* s
     if(v==dst_node_id) first_gw = gw_dst;
     
     if(rc->hierarchy == SURF_ROUTING_RECURSIVE && v!=dst_node_id && strcmp(gw_dst,prev_gw_src)) {
-      //routing_component_t src_as = xbt_dict_get_or_null(global_routing->where_network_elements,gw_dst);
-      //routing_component_t dst_as = xbt_dict_get_or_null(global_routing->where_network_elements,prev_gw_src);
-      //xbt_assert4(src_as==dst_as,"bad routing, differents AS gateways in route \"%s\" to \"%s\" (\"%s\"-\"%s\")",src,dst,gw_dst,prev_gw_src);
-      //route_extended_t e_route_as_to_as = (*(src_as->get_route))(src_as,gw_dst,prev_gw_src);
-      // TODO: - check for error - is possible to generate a route like =  as----as----as
       xbt_dynar_t e_route_as_to_as = (*(global_routing->get_route))(gw_dst,prev_gw_src);
       xbt_assert2(e_route_as_to_as,"no route between \"%s\" and \"%s\"",gw_dst,prev_gw_src);
-      //links = e_route_as_to_as->generic_route.link_list;
       links = e_route_as_to_as;
       int pos = 0;
       xbt_dynar_foreach(links, cpt, link) {
         xbt_dynar_insert_at(new_e_route->generic_route.link_list,pos,&link);
         pos++;
       }
-//       xbt_dynar_free(&(e_route_as_to_as->generic_route.link_list));
-//       xbt_free(e_route_as_to_as);
     }
     
     links = e_route->generic_route.link_list;
@@ -1339,8 +1294,8 @@ static route_extended_t dijkstra_get_route(routing_component_t rc, const char* s
   }
 
   if(routing->cached && elm == NULL) {
-    //add to predecessor list of the current src-host to cache
-    elm = xbt_new0(struct route_cache_element, 1); // FIXED by david
+    /* add to predecessor list of the current src-host to cache */
+    elm = xbt_new0(struct route_cache_element, 1);
     elm->pred_arr = pred_arr;
     elm->size = size;
     xbt_dict_set_ext(routing->route_cache, (char*)(&src_id), sizeof(int), (xbt_set_elm_t)elm, &route_cache_elem_free);
@@ -1522,7 +1477,7 @@ static route_extended_t NEW_get_route(routing_component_t rc, const char* src,co
 static route_extended_t NEW_get_bypass_route(routing_component_t rc, const char* src,const char* dst) {return NULL;}
 static void NEW_finalize(routing_component_t rc) {}
 
-// /*** Creation routing model functions ***/
+/*** Creation routing model functions ***/
 static void* model_NEW_create(void) {
   routing_component_full_t new_component =  xbt_new0(s_routing_component_full_t,1);
   new_component->generic_routing.set_processing_units = model_NEW_set_processing_units;
@@ -1546,7 +1501,7 @@ static void  model_NEW_end(void) {}    /* mandatory */
 static void generic_set_processing_units(routing_component_t rc, const char* name) {
   DEBUG1("Load process unit \"%s\"",name);
   model_type_t modeltype = rc->routing;
-  int *id = xbt_new0(int,1); // xbt_malloc(sizeof(int)); ?
+  int *id = xbt_new0(int,1);
   xbt_dict_t _to_index;
   if(modeltype==&routing_models[SURF_MODEL_FULL])
     _to_index = ((routing_component_full_t)rc)->to_index;
@@ -1566,7 +1521,7 @@ static void generic_set_processing_units(routing_component_t rc, const char* nam
 static void generic_set_autonomous_system(routing_component_t rc, const char* name) {
   DEBUG1("Load Autonomous system \"%s\"",name);
   model_type_t modeltype = rc->routing;
-  int *id = xbt_new0(int,1); // xbt_malloc(sizeof(int)); ?
+  int *id = xbt_new0(int,1);
   xbt_dict_t _to_index;
   if(modeltype==&routing_models[SURF_MODEL_FULL])
     _to_index = ((routing_component_full_t)rc)->to_index;
@@ -1919,1121 +1874,3 @@ static void generic_src_dst_check(routing_component_t rc, const char* src, const
   xbt_assert2(rc == dst_as,
       "The routing component of src and dst is not the same as the network elements belong (%s==%s)",rc->name,dst_as->name);
 }
-        
-////////////////////////////////////////////////////////////////////////////////
-// HERE FINISH THE NEW CODE
-////////////////////////////////////////////////////////////////////////////////
-
-//...... DEBUG ONLY .... //
-static void print_tree(routing_component_t rc) {
-  printf("(%s %s)\n",rc->name,rc->routing->name);
-  printf("  ");
-  xbt_dict_cursor_t cursor = NULL;
-  char *key;
-  int *val;  
-  if( rc->routing == &(routing_models[SURF_MODEL_FULL]) )
-  { xbt_dict_foreach(((routing_component_full_t)rc)->to_index, cursor, key, val) { printf("<%s-%d> ",key,*val); } }
-  else if( rc->routing == &(routing_models[SURF_MODEL_FLOYD]) )
-  { xbt_dict_foreach(((routing_component_floyd_t)rc)->to_index, cursor, key, val) { printf("<%s-%d> ",key,*val); } 
-  }
-  else
-      xbt_assert0(0, "Invalid model for call \"print_tree\"");
-  printf("\n");  
-  routing_component_t elem;
-  xbt_dict_foreach(rc->routing_sons, cursor, key, elem) {
-    printf("<--\n");  
-    print_tree(elem);
-    printf("-->\n");
-  }
-}
-
-//...... DEBUG ONLY .... //
-static void print_global() {
-  xbt_dict_cursor_t cursor = NULL;
-  char *key;
-  routing_component_t elem;  
-  xbt_dict_foreach(global_routing->where_network_elements, cursor, key, elem) { printf("<%s>\n",key); }
-}
-
-//...... DEBUG ONLY .... //
-static void print_AS_start(void) { printf("AS!!! %s y se rutea \"%s\"\n",A_surfxml_AS_id,A_surfxml_AS_routing); }
-static void print_AS_end(void)   { printf("AS!!! %s\n",A_surfxml_AS_id); }
-static void print_host(void)     { printf("host!!! %s\n",A_surfxml_host_id); }
-static void print_link(void)     { printf("link!!! %s\n",A_surfxml_link_id); }
-static void print_route(void)    { printf("route!!! %s a %s\n",A_surfxml_route_src,A_surfxml_route_dst); }
-static void print_ctn(void)      { printf("ctn!!! %s\n",A_surfxml_link_c_ctn_id); }
-
-//...... DEBUG ONLY .... //
-static void DEBUG_exit(void) {
-  
-//   printf("-------- print tree elements -----\n");
-//   print_tree(global_routing->root);
-//   printf("----------------------------------\n\n");
-//   
-//   printf("-------- network_elements --------\n");
-//   print_global();
-//   printf("----------------------------------\n\n");
-  
-//   const char* names[] = { "11.A","11.B","11.C","121.A","121.B","122.A","13.A","13.B"};
-//   int i,j,total = 8;
-
-//   printf("-- print all the example routes --\n");
-//   const char* names[] = { "11.A","11.B","11.C"};
-//   int i,j,total = 3;
-
-//   const char* names[] = { "141.A","141.B","143.A","143.B"};
-//   int i,j,total = 4;
-
-//   const char* names[] = { "15.A","15.B","15.C" };
-//   int i,j,total = 3;
-
-//   const char* names[] = { "142.A","142.B","142.C", "11.A","11.B","11.C","141.A","141.B","143.A","143.B","11.A","11.B","11.C","121.A","121.B","122.A","13.A","13.B"};
-//   int i,j,total = 3+4+8+3;
-
-//   const char* names[] = { "142.A","142.B","142.C" };
-//   int i,j,total = 3;
-
-   const char* names[] = { "11.A","11.B","11.C",
-                           "121.A","121.B",
-                           "122.A",
-                           "13.A","13.B",
-                           "141.A","141.B",
-                           "142.A","142.B","142.C",
-                           "143.A","143.B",
-                           "15.A","15.B","15.C"};
-   unsigned int i,j,total = 3+2+1+2+2+3+2+3;
-
-// const char* names[] = { "141.A","143.A" };
-// int i,j,total = 2;
-   
-  printf("-- print all the example routes --\n");
-  xbt_dynar_t links;
-  void* link;
-  for(i=0;i<total;i++) {
-    for(j=0;j<total;j++) {
-      printf("route from %s to %s >>>\n ",names[i],names[j]);
-      links = (*(global_routing->get_route))(names[i],names[j]);
-      printf(">>>");
-      unsigned int cpt=0;
-      xbt_dynar_foreach(links, cpt, link) {
-        s_surf_resource_t* generic_resource = link;
-        printf(" %s",generic_resource->name);
-      }
-      printf("\n");
-    }
-  }
-  printf("----------------------------------\n\n");
-  
-  printf("---------- call finalize ---------\n");
-  (*(global_routing->finalize))();
-  printf("----------------------------------\n");
-  
-  exit(0); 
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// HERE END THE NEW CODE
-////////////////////////////////////////////////////////////////////////////////
-
-
-// /* ************************************************************************** */
-// /* *************************** FULL ROUTING ********************************* */
-// typedef struct {
-//   s_routing_t generic_routing;
-//   xbt_dynar_t *routing_table;
-//   void *loopback;
-//   size_t size_of_link;
-// } s_routing_full_t,*routing_full_t;
-// 
-// #define ROUTE_FULL(i,j) ((routing_full_t)used_routing)->routing_table[(i)+(j)*(used_routing)->host_count]
-// #define HOST2ROUTER(id) ((id)+(2<<29))
-// #define ROUTER2HOST(id) ((id)-(2>>29))
-// #define ISROUTER(id) ((id)>=(2<<29))
-// 
-// /*
-//  * Free the onelink routes
-//  */
-// static void onelink_route_elem_free(void *e) {
-//   s_onelink_t tmp = (s_onelink_t)e;
-//   if(tmp) {
-//     free(tmp);
-//   }
-// }
-// 
-// /*
-//  * Parsing
-//  */
-// static void routing_full_parse_Shost(void) {
-//   int *val = xbt_malloc(sizeof(int));
-//   DEBUG2("Seen host %s (#%d)",A_surfxml_host_id,used_routing->host_count);
-//   *val = used_routing->host_count++;
-//   xbt_dict_set(used_routing->host_id,A_surfxml_host_id,val,xbt_free);
-// #ifdef HAVE_TRACING
-//   TRACE_surf_host_define_id (A_surfxml_host_id, *val);
-// #endif
-// }
-// 
-// static void routing_full_parse_Srouter(void) {
-//     int *val = xbt_malloc(sizeof(int));
-//   DEBUG3("Seen router %s (%d -> #%d)",A_surfxml_router_id,used_routing->router_count,
-//             HOST2ROUTER(used_routing->router_count));
-//   *val = HOST2ROUTER(used_routing->router_count++);
-//   xbt_dict_set(used_routing->host_id,A_surfxml_router_id,val,xbt_free);
-// #ifdef HAVE_TRACING
-//   TRACE_surf_host_define_id (A_surfxml_host_id, *val);
-//   TRACE_surf_host_declaration (A_surfxml_host_id, 0);
-// #endif
-// }
-// 
-// static int src_id = -1;
-// static int dst_id = -1;
-// static void routing_full_parse_Sroute_set_endpoints(void)
-// {
-//   src_id = *(int*)xbt_dict_get(used_routing->host_id,A_surfxml_route_src);
-//   dst_id = *(int*)xbt_dict_get(used_routing->host_id,A_surfxml_route_dst);
-//   DEBUG4("Route %s %d -> %s %d",A_surfxml_route_src,src_id,A_surfxml_route_dst,dst_id);
-//   route_action = A_surfxml_route_action;
-// }
-// 
-// static void routing_full_parse_Eroute(void)
-// {
-//   char *name;
-//   if (src_id != -1 && dst_id != -1) {
-//     name = bprintf("%x#%x", src_id, dst_id);
-//     manage_route(route_table, name, route_action, 0);
-//     free(name);
-//   }
-// }
-// 
-// /* Cluster tag functions */
-// 
-// static void routing_full_parse_change_cpu_data(const char *hostName,
-//                                   const char *surfxml_host_power,
-//                                   const char *surfxml_host_availability,
-//                                   const char *surfxml_host_availability_file,
-//                                   const char *surfxml_host_state_file)
-// {
-//   int AX_ptr = 0;
-// 
-//   SURFXML_BUFFER_SET(host_id, hostName);
-//   SURFXML_BUFFER_SET(host_power, surfxml_host_power /*hostPower */ );
-//   SURFXML_BUFFER_SET(host_availability, surfxml_host_availability);
-//   SURFXML_BUFFER_SET(host_availability_file, surfxml_host_availability_file);
-//   SURFXML_BUFFER_SET(host_state_file, surfxml_host_state_file);
-// }
-// 
-// static void routing_full_parse_change_link_data(const char *linkName,
-//                                    const char *surfxml_link_bandwidth,
-//                                    const char *surfxml_link_bandwidth_file,
-//                                    const char *surfxml_link_latency,
-//                                    const char *surfxml_link_latency_file,
-//                                    const char *surfxml_link_state_file)
-// {
-//   int AX_ptr = 0;
-// 
-//   SURFXML_BUFFER_SET(link_id, linkName);
-//   SURFXML_BUFFER_SET(link_bandwidth, surfxml_link_bandwidth);
-//   SURFXML_BUFFER_SET(link_bandwidth_file, surfxml_link_bandwidth_file);
-//   SURFXML_BUFFER_SET(link_latency, surfxml_link_latency);
-//   SURFXML_BUFFER_SET(link_latency_file, surfxml_link_latency_file);
-//   SURFXML_BUFFER_SET(link_state_file, surfxml_link_state_file);
-// }
-// 
-// static void routing_full_parse_Scluster(void)
-// {
-//   static int AX_ptr = 0;
-// 
-//   char *cluster_id = A_surfxml_cluster_id;
-//   char *cluster_prefix = A_surfxml_cluster_prefix;
-//   char *cluster_suffix = A_surfxml_cluster_suffix;
-//   char *cluster_radical = A_surfxml_cluster_radical;
-//   char *cluster_power = A_surfxml_cluster_power;
-//   char *cluster_bw = A_surfxml_cluster_bw;
-//   char *cluster_lat = A_surfxml_cluster_lat;
-//   char *cluster_bb_bw = A_surfxml_cluster_bb_bw;
-//   char *cluster_bb_lat = A_surfxml_cluster_bb_lat;
-//   char *backbone_name;
-//   unsigned int it1,it2;
-//   char *name1,*name2;
-//   xbt_dynar_t names = NULL;
-//   surfxml_bufferstack_push(1);
-// 
-//   /* Make set a set to parse the prefix/suffix/radical into a neat list of names */
-//   DEBUG4("Make <set id='%s' prefix='%s' suffix='%s' radical='%s'>",
-//       cluster_id,cluster_prefix,cluster_suffix,cluster_radical);
-//   SURFXML_BUFFER_SET(set_id, cluster_id);
-//   SURFXML_BUFFER_SET(set_prefix, cluster_prefix);
-//   SURFXML_BUFFER_SET(set_suffix, cluster_suffix);
-//   SURFXML_BUFFER_SET(set_radical, cluster_radical);
-// 
-//   SURFXML_START_TAG(set);
-//   SURFXML_END_TAG(set);
-// 
-//   names = xbt_dict_get(set_list,cluster_id);
-// 
-//   xbt_dynar_foreach(names,it1,name1) {
-//     /* create the host */
-//     routing_full_parse_change_cpu_data(name1, cluster_power, "1.0", "", "");
-//     A_surfxml_host_state = A_surfxml_host_state_ON;
-// 
-//     SURFXML_START_TAG(host);
-//     SURFXML_END_TAG(host);
-// 
-//     /* Here comes the link */
-//     routing_full_parse_change_link_data(name1, cluster_bw, "", cluster_lat, "", "");
-//     A_surfxml_link_state = A_surfxml_link_state_ON;
-//     A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
-// 
-//     SURFXML_START_TAG(link);
-//     SURFXML_END_TAG(link);
-//   }
-// 
-//   /* Make backbone link */
-//   backbone_name = bprintf("%s_bb", cluster_id);
-//   routing_full_parse_change_link_data(backbone_name, cluster_bb_bw, "", cluster_bb_lat, "",
-//                          "");
-//   A_surfxml_link_state = A_surfxml_link_state_ON;
-//   A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FATPIPE;
-// 
-//   SURFXML_START_TAG(link);
-//   SURFXML_END_TAG(link);
-// 
-//   /* And now the internal routes */
-//   xbt_dynar_foreach(names,it1,name1) {
-//     xbt_dynar_foreach(names,it2,name2) {
-//       if (strcmp(name1,name2)) {
-//         A_surfxml_route_action = A_surfxml_route_action_POSTPEND;
-//         SURFXML_BUFFER_SET(route_src,name1);
-//         SURFXML_BUFFER_SET(route_dst,name2);
-//         SURFXML_START_TAG(route); {
-//           /* FIXME: name1 link is added by error about 20 lines below, so don't add it here
-//           SURFXML_BUFFER_SET(link_c_ctn_id, name1);
-//           SURFXML_START_TAG(link_c_ctn);
-//           SURFXML_END_TAG(link_c_ctn);
-//            */
-//           SURFXML_BUFFER_SET(link_c_ctn_id, backbone_name);
-//           SURFXML_START_TAG(link_c_ctn);
-//           SURFXML_END_TAG(link_c_ctn);
-// 
-//           SURFXML_BUFFER_SET(link_c_ctn_id, name2);
-//           SURFXML_START_TAG(link_c_ctn);
-//           SURFXML_END_TAG(link_c_ctn);
-// 
-//         } SURFXML_END_TAG(route);
-//       }
-//     }
-//   }
-// 
-//   /* Make route multi with the outside world, i.e. cluster->$* */
-// 
-//   /* FIXME
-//    * This also adds an elements to the routes within the cluster,
-//    * and I guess it's wrong, but since this element is commented out in the above
-//    * code creating the internal routes, we're good.
-//    * To fix it, I'd say that we need a way to understand "$*-${cluster_id}" as "whole world, but the guys in that cluster"
-//    * But for that, we need to install a real expression parser for src/dst attributes
-//    *
-//    * FIXME
-//    * This also adds a dumb element (the private link) in place of the loopback. Then, since
-//    * the loopback is added only if no link to self already exist, this fails.
-//    * That's really dumb.
-//    *
-//    * FIXME
-//    * It seems to me that it does not add the backbone to the path to outside world...
-//    */
-//   SURFXML_BUFFER_SET(route_c_multi_src, cluster_id);
-//   SURFXML_BUFFER_SET(route_c_multi_dst, "$*");
-//   A_surfxml_route_c_multi_symmetric = A_surfxml_route_c_multi_symmetric_NO;
-//   A_surfxml_route_c_multi_action = A_surfxml_route_c_multi_action_PREPEND;
-// 
-//   SURFXML_START_TAG(route_c_multi);
-// 
-//   SURFXML_BUFFER_SET(link_c_ctn_id, "$src");
-// 
-//   SURFXML_START_TAG(link_c_ctn);
-//   SURFXML_END_TAG(link_c_ctn);
-// 
-//   SURFXML_END_TAG(route_c_multi);
-// 
-//   free(backbone_name);
-// 
-//   /* Restore buff */
-//   surfxml_bufferstack_pop(1);
-// }
-// 
-// 
-// static void routing_full_parse_end(void) {
-//   routing_full_t routing = (routing_full_t) used_routing;
-//   int nb_link = 0;
-//   unsigned int cpt = 0;
-//   xbt_dict_cursor_t cursor = NULL;
-//   char *key, *data, *end;
-//   const char *sep = "#";
-//   xbt_dynar_t links, keys;
-//   char *link_name = NULL;
-//   int i,j;
-// 
-//   int host_count = routing->generic_routing.host_count;
-// 
-//   /* Create the routing table */
-//   routing->routing_table = xbt_new0(xbt_dynar_t, host_count * host_count);
-//   for (i=0;i<host_count;i++)
-//     for (j=0;j<host_count;j++)
-//       ROUTE_FULL(i,j) = xbt_dynar_new(routing->size_of_link,NULL);
-// 
-//   /* Put the routes in position */
-//   xbt_dict_foreach(route_table, cursor, key, data) {
-//     nb_link = 0;
-//     links = (xbt_dynar_t) data;
-//     keys = xbt_str_split_str(key, sep);
-// 
-//     src_id = strtol(xbt_dynar_get_as(keys, 0, char *), &end, 16);
-//     dst_id = strtol(xbt_dynar_get_as(keys, 1, char *), &end, 16);
-//     xbt_dynar_free(&keys);
-// 
-//     if(xbt_dynar_length(links) == 1){
-//       s_onelink_t new_link = (s_onelink_t) xbt_malloc0(sizeof(s_onelink));
-//       new_link->src_id = src_id;
-//       new_link->dst_id = dst_id;
-//       link_name = xbt_dynar_getfirst_as(links, char*);
-//       new_link->link_ptr = xbt_dict_get_or_null(surf_network_model->resource_set, link_name);
-//       DEBUG3("Adding onelink route from (#%d) to (#%d), link_name %s",src_id, dst_id, link_name);
-//       xbt_dict_set(onelink_routes, link_name, (void *)new_link, onelink_route_elem_free);
-// #ifdef HAVE_TRACING
-//       TRACE_surf_link_save_endpoints (link_name, src_id, dst_id);
-// #endif
-//     }
-// 
-//     if(ISROUTER(src_id) || ISROUTER(dst_id)) {
-//                             DEBUG2("There is route with a router here: (%d ,%d)",src_id,dst_id);
-//                             /* Check there is only one link in the route and store the information */
-//                             continue;
-//     }
-// 
-//     DEBUG4("Handle %d %d (from %d hosts): %ld links",
-//         src_id,dst_id,routing->generic_routing.host_count,xbt_dynar_length(links));
-//     xbt_dynar_foreach(links, cpt, link_name) {
-//       void* link = xbt_dict_get_or_null(surf_network_model->resource_set, link_name);
-//       if (link)
-//         xbt_dynar_push(ROUTE_FULL(src_id,dst_id),&link);
-//       else
-//         THROW1(mismatch_error,0,"Link %s not found", link_name);
-//     }
-//   }
-// 
-//   /* Add the loopback if needed */
-//   for (i = 0; i < host_count; i++)
-//     if (!xbt_dynar_length(ROUTE_FULL(i, i)))
-//       xbt_dynar_push(ROUTE_FULL(i,i),&routing->loopback);
-// 
-//   /* Shrink the dynar routes (save unused slots) */
-//   for (i=0;i<host_count;i++)
-//     for (j=0;j<host_count;j++)
-//       xbt_dynar_shrink(ROUTE_FULL(i,j),0);
-// }
-// 
-// /*
-//  * Business methods
-//  */
-// static xbt_dynar_t routing_full_get_route(int src,int dst) {
-//   xbt_assert0(!(ISROUTER(src) || ISROUTER(dst)), "Ask for route \"from\" or \"to\" a router node");
-//   return ROUTE_FULL(src,dst);
-// }
-// 
-// static xbt_dict_t routing_full_get_onelink_routes(void){
-//   return onelink_routes;
-// }
-// 
-// static int routing_full_is_router(int id){
-//     return ISROUTER(id);
-// }
-// 
-// static void routing_full_finalize(void) {
-//   routing_full_t routing = (routing_full_t)used_routing;
-//   int i,j;
-// 
-//   if (routing) {
-//     for (i = 0; i < used_routing->host_count; i++)
-//       for (j = 0; j < used_routing->host_count; j++)
-//         xbt_dynar_free(&ROUTE_FULL(i, j));
-//     free(routing->routing_table);
-//     xbt_dict_free(&used_routing->host_id);
-//     xbt_dict_free(&onelink_routes);
-//     free(routing);
-//     routing=NULL;
-//   }
-// }
-// 
-// static void routing_model_full_create(size_t size_of_link,void *loopback) {
-//   /* initialize our structure */
-//   routing_full_t routing = xbt_new0(s_routing_full_t,1);
-//   routing->generic_routing.name = "Full";
-//   routing->generic_routing.host_count = 0;
-//   routing->generic_routing.get_route = routing_full_get_route;
-//   routing->generic_routing.get_onelink_routes = routing_full_get_onelink_routes;
-//   routing->generic_routing.is_router = routing_full_is_router;
-//   routing->generic_routing.finalize = routing_full_finalize;
-// 
-//   routing->size_of_link = size_of_link;
-//   routing->loopback = loopback;
-// 
-//   /* Set it in position */
-//   used_routing = (routing_t) routing;
-// 
-//   /* Set the dict for onehop routes */
-//   onelink_routes =  xbt_dict_new();
-// 
-//   routing->generic_routing.host_id = xbt_dict_new();
-//   
-//   /* Setup the parsing callbacks we need */
-// //   surfxml_add_callback(STag_surfxml_host_cb_list, &routing_full_parse_Shost);
-// //   surfxml_add_callback(STag_surfxml_router_cb_list, &routing_full_parse_Srouter);
-// //   surfxml_add_callback(ETag_surfxml_platform_cb_list, &routing_full_parse_end);
-// //   surfxml_add_callback(STag_surfxml_route_cb_list, &routing_full_parse_Sroute_set_endpoints);
-// //   surfxml_add_callback(ETag_surfxml_route_cb_list, &routing_full_parse_Eroute);
-// //   surfxml_add_callback(STag_surfxml_cluster_cb_list, &routing_full_parse_Scluster);
-// 
-// //   surfxml_add_callback(STag_surfxml_host_cb_list, &routing_full_parse_Shost);
-// //   surfxml_add_callback(STag_surfxml_router_cb_list, &routing_full_parse_Srouter);
-//   
-// }
-
-/* ************************************************************************** */
-
-// static void routing_shortest_path_parse_Scluster(void)
-// {
-//   static int AX_ptr = 0;
-// 
-//   char *cluster_id = A_surfxml_cluster_id;
-//   char *cluster_prefix = A_surfxml_cluster_prefix;
-//   char *cluster_suffix = A_surfxml_cluster_suffix;
-//   char *cluster_radical = A_surfxml_cluster_radical;
-//   char *cluster_power = A_surfxml_cluster_power;
-//   char *cluster_bb_bw = A_surfxml_cluster_bb_bw;
-//   char *cluster_bb_lat = A_surfxml_cluster_bb_lat;
-//   char *backbone_name;
-// 
-//   surfxml_bufferstack_push(1);
-// 
-//   /* Make set */
-//   SURFXML_BUFFER_SET(set_id, cluster_id);
-//   SURFXML_BUFFER_SET(set_prefix, cluster_prefix);
-//   SURFXML_BUFFER_SET(set_suffix, cluster_suffix);
-//   SURFXML_BUFFER_SET(set_radical, cluster_radical);
-// 
-//   SURFXML_START_TAG(set);
-//   SURFXML_END_TAG(set);
-// 
-//   /* Make foreach */
-//   SURFXML_BUFFER_SET(foreach_set_id, cluster_id);
-// 
-//   SURFXML_START_TAG(foreach);
-// 
-//   /* Make host for the foreach */
-//   routing_full_parse_change_cpu_data("$1", cluster_power, "1.0", "", "");
-//   A_surfxml_host_state = A_surfxml_host_state_ON;
-// 
-//   SURFXML_START_TAG(host);
-//   SURFXML_END_TAG(host);
-// 
-//   SURFXML_END_TAG(foreach);
-// 
-//   /* Make backbone link */
-//   backbone_name = bprintf("%s_bb", cluster_id);
-//   routing_full_parse_change_link_data(backbone_name, cluster_bb_bw, "", cluster_bb_lat, "",
-//                          "");
-//   A_surfxml_link_state = A_surfxml_link_state_ON;
-//   A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FATPIPE;
-// 
-//   SURFXML_START_TAG(link);
-//   SURFXML_END_TAG(link);
-// 
-//   free(backbone_name);
-// 
-//   /* Restore buff */
-//   surfxml_bufferstack_pop(1);
-// }
-// 
-// /* ************************************************************************** */
-// /* *************************** FLOYD ROUTING ********************************* */
-// typedef struct {
-//   s_routing_t generic_routing;
-//   int *predecessor_table;
-//   void** link_table;
-//   xbt_dynar_t last_route;
-//   void *loopback;
-//   size_t size_of_link;
-// } s_routing_floyd_t,*routing_floyd_t;
-// 
-// #define FLOYD_COST(i,j) cost_table[(i)+(j)*(used_routing)->host_count]
-// #define FLOYD_PRED(i,j) ((routing_floyd_t)used_routing)->predecessor_table[(i)+(j)*(used_routing)->host_count]
-// #define FLOYD_LINK(i,j) ((routing_floyd_t)used_routing)->link_table[(i)+(j)*(used_routing)->host_count]
-// 
-// static void routing_floyd_parse_end(void) {
-// 
-//   routing_floyd_t routing = (routing_floyd_t) used_routing;
-//   int nb_link = 0;
-//   void* link_list = NULL;
-//   double * cost_table;
-//   xbt_dict_cursor_t cursor = NULL;
-//   char *key,*data, *end;
-//   const char *sep = "#";
-//   xbt_dynar_t links, keys;
-// 
-//   unsigned int i,j;
-//   unsigned int a,b,c;
-//   int host_count = routing->generic_routing.host_count;
-//   char * link_name = NULL;
-//   void * link = NULL;
-// 
-//   /* Create Cost, Predecessor and Link tables */
-//   cost_table = xbt_new0(double, host_count * host_count); //link cost from host to host
-//   routing->predecessor_table = xbt_new0(int, host_count*host_count); //predecessor host numbers
-//   routing->link_table = xbt_new0(void*,host_count*host_count); //actual link between src and dst
-//   routing->last_route = xbt_dynar_new(routing->size_of_link, NULL);
-// 
-//   /* Initialize costs and predecessors*/
-//   for(i = 0; i<host_count;i++)
-//     for(j = 0; j<host_count;j++) {
-//         FLOYD_COST(i,j) = DBL_MAX;
-//         FLOYD_PRED(i,j) = -1;
-//     }
-// 
-//    /* Put the routes in position */
-//   xbt_dict_foreach(route_table, cursor, key, data) {
-//     nb_link = 0;
-//     links = (xbt_dynar_t)data;
-//     keys = xbt_str_split_str(key, sep);
-// 
-//     
-//     src_id = strtol(xbt_dynar_get_as(keys, 0, char*), &end, 16);
-//     dst_id = strtol(xbt_dynar_get_as(keys, 1, char*), &end, 16);
-//     xbt_dynar_free(&keys);
-//  
-//     DEBUG4("Handle %d %d (from %d hosts): %ld links",
-//         src_id,dst_id,routing->generic_routing.host_count,xbt_dynar_length(links));
-//     xbt_assert3(xbt_dynar_length(links) == 1, "%ld links in route between host %d and %d, should be 1", xbt_dynar_length(links), src_id, dst_id);
-//     
-//     link_name = xbt_dynar_getfirst_as(links, char*);
-//     link = xbt_dict_get_or_null(surf_network_model->resource_set, link_name);
-// 
-//     if (link)
-//       link_list = link;
-//     else
-//       THROW1(mismatch_error,0,"Link %s not found", link_name);
-//     
-// 
-//     FLOYD_LINK(src_id,dst_id) = link_list;
-//     FLOYD_PRED(src_id, dst_id) = src_id;
-// 
-//     //link cost
-//     FLOYD_COST(src_id, dst_id) = 1; // assume 1 for now
-// 
-//   }
-// 
-//     /* Add the loopback if needed */
-//   for (i = 0; i < host_count; i++)
-//     if (!FLOYD_PRED(i, i)) {
-//       FLOYD_PRED(i, i) = i;
-//       FLOYD_COST(i, i) = 1;
-//       FLOYD_LINK(i, i) = routing->loopback;
-//     }
-// 
-// 
-//   //Calculate path costs 
-// 
-//   for(c=0;c<host_count;c++) {
-//     for(a=0;a<host_count;a++) {
-//       for(b=0;b<host_count;b++) {
-//         if(FLOYD_COST(a,c) < DBL_MAX && FLOYD_COST(c,b) < DBL_MAX) {
-//           if(FLOYD_COST(a,b) == DBL_MAX || (FLOYD_COST(a,c)+FLOYD_COST(c,b) < FLOYD_COST(a,b))) {
-//             FLOYD_COST(a,b) = FLOYD_COST(a,c)+FLOYD_COST(c,b);
-//             FLOYD_PRED(a,b) = FLOYD_PRED(c,b);
-//           }
-//         }
-//       }
-//     }
-//   }
-// 
-//   //cleanup
-//   free(cost_table);
-// }
-// 
-// /*
-//  * Business methods
-//  */
-// static xbt_dynar_t routing_floyd_get_route(int src_id,int dst_id) {
-// 
-//   routing_floyd_t routing = (routing_floyd_t) used_routing;
-// 
-//   int pred = dst_id;
-//   int prev_pred = 0;
-// 
-//   xbt_dynar_reset(routing->last_route);
-// 
-//   do {
-//     prev_pred = pred;
-//     pred = FLOYD_PRED(src_id, pred);
-// 
-//     if(pred == -1) // if no pred in route -> no route to host
-//         break;
-// 
-//     xbt_dynar_unshift(routing->last_route, &FLOYD_LINK(pred,prev_pred));
-// 
-//   } while(pred != src_id);
-// 
-//   xbt_assert2(pred != -1, "no route from host %d to %d", src_id, dst_id);
-// 
-//   return routing->last_route;
-// }
-// 
-// static void routing_floyd_finalize(void) {
-//   routing_floyd_t routing = (routing_floyd_t)used_routing;
-// 
-//   if (routing) {
-//     free(routing->link_table);
-//     free(routing->predecessor_table);
-//     xbt_dynar_free(&routing->last_route);
-//     xbt_dict_free(&used_routing->host_id);
-//     free(routing);
-//     routing=NULL;
-//   }
-// }
-// 
-// static xbt_dict_t routing_floyd_get_onelink_routes(void){
-//   xbt_assert0(0,"The get_onelink_routes feature is not supported in routing model Floyd");
-// }
-// 
-// static int routing_floyd_is_router(int id){
-//   xbt_assert0(0,"The get_is_router feature is not supported in routing model Floyd");
-// }
-// 
-// static void routing_model_floyd_create(size_t size_of_link,void *loopback) {
-//   /* initialize our structure */
-//   routing_floyd_t routing = xbt_new0(s_routing_floyd_t,1);
-//   routing->generic_routing.name = "Floyd";
-//   routing->generic_routing.host_count = 0;
-//   routing->generic_routing.host_id = xbt_dict_new();
-//   routing->generic_routing.get_route = routing_floyd_get_route;
-//   routing->generic_routing.get_onelink_routes = routing_floyd_get_onelink_routes;
-//   routing->generic_routing.is_router = routing_floyd_is_router;
-//   routing->generic_routing.finalize = routing_floyd_finalize;
-//   routing->size_of_link = size_of_link;
-//   routing->loopback = loopback;
-// 
-//   /* Set it in position */
-//   used_routing = (routing_t) routing;
-//   
-//   /* Setup the parsing callbacks we need */
-//   surfxml_add_callback(STag_surfxml_host_cb_list, &routing_full_parse_Shost);
-//   surfxml_add_callback(ETag_surfxml_platform_cb_list, &routing_floyd_parse_end);
-//   surfxml_add_callback(STag_surfxml_route_cb_list, 
-//       &routing_full_parse_Sroute_set_endpoints);
-//   surfxml_add_callback(ETag_surfxml_route_cb_list, &routing_full_parse_Eroute);
-//   surfxml_add_callback(STag_surfxml_cluster_cb_list, &routing_shortest_path_parse_Scluster);
-//   
-// }
-// 
-// /* ************************************************************************** */
-// /* ********** Dijkstra & Dijkstra Cached ROUTING **************************** */
-// typedef struct {
-//   s_routing_t generic_routing;
-//   xbt_graph_t route_graph;
-//   xbt_dict_t graph_node_map;
-//   xbt_dict_t route_cache;
-//   xbt_dynar_t last_route;
-//   int cached;
-//   void *loopback;
-//   size_t size_of_link;
-// } s_routing_dijkstra_t,*routing_dijkstra_t;
-// 
-// 
-// typedef struct graph_node_data {
-//   int id; 
-//   int graph_id; //used for caching internal graph id's
-// } s_graph_node_data_t, * graph_node_data_t;
-// 
-// typedef struct graph_node_map_element {
-//   xbt_node_t node;
-// } s_graph_node_map_element_t, * graph_node_map_element_t;
-// 
-// typedef struct route_cache_element {
-//   int * pred_arr;
-//   int size;
-// } s_route_cache_element_t, * route_cache_element_t; 
-// 
-// /*
-//  * Free functions
-//  */
-// static void route_cache_elem_free(void *e) {
-//   route_cache_element_t elm=(route_cache_element_t)e;
-// 
-//   if (elm) {
-//     free(elm->pred_arr);
-//     free(elm);
-//   }
-// }
-// 
-// static void graph_node_map_elem_free(void *e) {
-//   graph_node_map_element_t elm = (graph_node_map_element_t)e;
-// 
-//   if(elm) {
-//     free(elm);
-//   }
-// }
-// 
-// /*
-//  * Utility functions
-// */
-// static xbt_node_t route_graph_new_node(int id, int graph_id) {
-//   xbt_node_t node = NULL;
-//   graph_node_data_t data = NULL;
-//   graph_node_map_element_t elm = NULL;
-//   routing_dijkstra_t routing = (routing_dijkstra_t) used_routing;
-// 
-//   data = xbt_new0(struct graph_node_data, sizeof(struct graph_node_data));
-//   data->id = id;
-//   data->graph_id = graph_id;
-//   node = xbt_graph_new_node(routing->route_graph, data);
-// 
-//   elm = xbt_new0(struct graph_node_map_element, sizeof(struct graph_node_map_element));
-//   elm->node = node;
-//   xbt_dict_set_ext(routing->graph_node_map, (char*)(&id), sizeof(int), (xbt_set_elm_t)elm, &graph_node_map_elem_free);
-// 
-//   return node;
-// }
-// 
-// static graph_node_map_element_t graph_node_map_search(int id) {
-//   routing_dijkstra_t routing = (routing_dijkstra_t) used_routing;
-// 
-//   graph_node_map_element_t elm = (graph_node_map_element_t)xbt_dict_get_or_null_ext(routing->graph_node_map, (char*)(&id), sizeof(int));
-// 
-//   return elm;
-// }
-// 
-// /*
-//  * Parsing
-//  */
-// static void route_new_dijkstra(int src_id, int dst_id, void* link) {
-//   routing_dijkstra_t routing = (routing_dijkstra_t) used_routing;
-// 
-//   xbt_node_t src = NULL;
-//   xbt_node_t dst = NULL;
-//   graph_node_map_element_t src_elm = (graph_node_map_element_t)xbt_dict_get_or_null_ext(routing->graph_node_map, (char*)(&src_id), sizeof(int));
-//   graph_node_map_element_t dst_elm = (graph_node_map_element_t)xbt_dict_get_or_null_ext(routing->graph_node_map, (char*)(&dst_id), sizeof(int));
-// 
-//   if(src_elm)
-//     src = src_elm->node;
-// 
-//   if(dst_elm)
-//     dst = dst_elm->node;
-// 
-//   //add nodes if they don't exist in the graph
-//   if(src_id == dst_id && src == NULL && dst == NULL) {
-//     src = route_graph_new_node(src_id, -1);
-//     dst = src;
-//   } else {
-//     if(src == NULL) {
-//       src = route_graph_new_node(src_id, -1);
-//     }
-//     
-//     if(dst == NULL) {
-//       dst = route_graph_new_node(dst_id, -1);
-//     }
-//   }
-// 
-//   //add link as edge to graph
-//   xbt_graph_new_edge(routing->route_graph, src, dst, link);
-//   
-// }
-// 
-// static void add_loopback_dijkstra(void) {
-//   routing_dijkstra_t routing = (routing_dijkstra_t) used_routing;
-// 
-//     xbt_dynar_t nodes = xbt_graph_get_nodes(routing->route_graph);
-//     
-//     xbt_node_t node = NULL;
-//     unsigned int cursor2;
-//     xbt_dynar_foreach(nodes, cursor2, node) {
-//             xbt_dynar_t out_edges = xbt_graph_node_get_outedges(node); 
-//             xbt_edge_t edge = NULL;
-//             unsigned int cursor;
-//     
-//             int found = 0;
-//             xbt_dynar_foreach(out_edges, cursor, edge) {
-//                     xbt_node_t other_node = xbt_graph_edge_get_target(edge);
-//                     if(other_node == node) {
-//                             found = 1;
-//                             break;
-//                     }
-//             }
-// 
-//             if(!found)
-//                     xbt_graph_new_edge(routing->route_graph, node, node, &routing->loopback);
-//     }
-// }
-// 
-// static void routing_dijkstra_parse_end(void) {
-//   routing_dijkstra_t routing = (routing_dijkstra_t) used_routing;
-//   int nb_link = 0;
-//   xbt_dict_cursor_t cursor = NULL;
-//   char *key, *data, *end;
-//   const char *sep = "#";
-//   xbt_dynar_t links, keys;
-//   char* link_name = NULL;
-//   void* link = NULL;
-//   xbt_node_t node = NULL;
-//   unsigned int cursor2;
-//   xbt_dynar_t nodes = NULL;
-//   /* Create the topology graph */
-//   routing->route_graph = xbt_graph_new_graph(1, NULL);
-//   routing->graph_node_map = xbt_dict_new();
-//   routing->last_route = xbt_dynar_new(routing->size_of_link, NULL);
-//   if(routing->cached)
-//     routing->route_cache = xbt_dict_new();
-// 
-// 
-//   /* Put the routes in position */
-//   xbt_dict_foreach(route_table, cursor, key, data) {
-//     nb_link = 0;
-//     links = (xbt_dynar_t) data;
-//     keys = xbt_str_split_str(key, sep);
-// 
-//     src_id = strtol(xbt_dynar_get_as(keys, 0, char *), &end, 16);
-//     dst_id = strtol(xbt_dynar_get_as(keys, 1, char *), &end, 16);
-//     xbt_dynar_free(&keys);
-// 
-//     DEBUG4("Handle %d %d (from %d hosts): %ld links",
-//         src_id,dst_id,routing->generic_routing.host_count,xbt_dynar_length(links));
-// 
-//     xbt_assert3(xbt_dynar_length(links) == 1, "%ld links in route between host %d and %d, should be 1", xbt_dynar_length(links), src_id, dst_id);
-// 
-//     link_name = xbt_dynar_getfirst_as(links, char*);
-//     link = xbt_dict_get_or_null(surf_network_model->resource_set, link_name);
-//     if (link)
-//       route_new_dijkstra(src_id,dst_id,link);
-//     else
-//       THROW1(mismatch_error,0,"Link %s not found", link_name);
-//     
-//   }
-// 
-//   /* Add the loopback if needed */
-//   add_loopback_dijkstra();
-// 
-//   /* initialize graph indexes in nodes after graph has been built */
-//   nodes = xbt_graph_get_nodes(routing->route_graph);
-// 
-//   xbt_dynar_foreach(nodes, cursor2, node) {
-//     graph_node_data_t data = xbt_graph_node_get_data(node);
-//     data->graph_id = cursor2;
-//   }
-// 
-// }
-// 
-// /*
-//  * Business methods
-//  */
-// static xbt_dynar_t routing_dijkstra_get_route(int src_id,int dst_id) {
-// 
-//   routing_dijkstra_t routing = (routing_dijkstra_t) used_routing;
-//   int * pred_arr = NULL;
-//   int src_node_id = 0;
-//   int dst_node_id = 0;
-//   int * nodeid = NULL;
-//   int v;
-//   int size = 0;
-//   void * link = NULL;
-//   route_cache_element_t elm = NULL;
-//   xbt_dynar_t nodes = xbt_graph_get_nodes(routing->route_graph);
-// 
-//   /*Use the graph_node id mapping set to quickly find the nodes */
-//   graph_node_map_element_t src_elm = graph_node_map_search(src_id);
-//   graph_node_map_element_t dst_elm = graph_node_map_search(dst_id);
-//   xbt_assert2(src_elm != NULL && dst_elm != NULL, "src %d or dst %d does not exist", src_id, dst_id);
-//   src_node_id = ((graph_node_data_t)xbt_graph_node_get_data(src_elm->node))->graph_id;
-//   dst_node_id = ((graph_node_data_t)xbt_graph_node_get_data(dst_elm->node))->graph_id;
-// 
-//   if(routing->cached) {
-//     /*check if there is a cached predecessor list avail */
-//     elm = (route_cache_element_t)xbt_dict_get_or_null_ext(routing->route_cache, (char*)(&src_id), sizeof(int));
-//   }
-// 
-//   if(elm) { //cached mode and cache hit
-//     pred_arr = elm->pred_arr;
-//   } else { //not cached mode or cache miss
-//     double * cost_arr = NULL;
-//     xbt_heap_t pqueue = NULL;
-//     int i = 0;
-// 
-//     int nr_nodes = xbt_dynar_length(nodes);
-//     cost_arr = xbt_new0(double, nr_nodes); //link cost from src to other hosts
-//     pred_arr = xbt_new0(int, nr_nodes); //predecessors in path from src
-//     pqueue = xbt_heap_new(nr_nodes, free);
-// 
-//     //initialize
-//     cost_arr[src_node_id] = 0.0;
-// 
-//     for(i = 0; i < nr_nodes; i++) {
-//       if(i != src_node_id) {
-//         cost_arr[i] = DBL_MAX;
-//       }
-// 
-//       pred_arr[i] = 0;
-// 
-//       //initialize priority queue
-//       nodeid = xbt_new0(int, 1);
-//       *nodeid = i;
-//       xbt_heap_push(pqueue, nodeid, cost_arr[i]);
-// 
-//     }
-// 
-//     // apply dijkstra using the indexes from the graph's node array
-//     while(xbt_heap_size(pqueue) > 0) {
-//       int * v_id = xbt_heap_pop(pqueue);
-//       xbt_node_t v_node = xbt_dynar_get_as(nodes, *v_id, xbt_node_t);
-//       xbt_dynar_t out_edges = xbt_graph_node_get_outedges(v_node); 
-//       xbt_edge_t edge = NULL;
-//       unsigned int cursor;
-// 
-//       xbt_dynar_foreach(out_edges, cursor, edge) {
-//         xbt_node_t u_node = xbt_graph_edge_get_target(edge);
-//         graph_node_data_t data = xbt_graph_node_get_data(u_node);
-//         int u_id = data->graph_id;
-//         int cost_v_u = 1; //fixed link cost for now
-// 
-//         if(cost_v_u + cost_arr[*v_id] < cost_arr[u_id]) {
-//           pred_arr[u_id] = *v_id;
-//           cost_arr[u_id] = cost_v_u + cost_arr[*v_id];
-//           nodeid = xbt_new0(int, 1);
-//           *nodeid = u_id;
-//           xbt_heap_push(pqueue, nodeid, cost_arr[u_id]);
-//         }
-//       }
-// 
-//       //free item popped from pqueue
-//       free(v_id);
-//     }
-// 
-//     free(cost_arr);
-//     xbt_heap_free(pqueue);
-// 
-//   }
-// 
-//   //compose route path with links
-//   xbt_dynar_reset(routing->last_route);
-// 
-//   for(v = dst_node_id; v != src_node_id; v = pred_arr[v]) {
-//     xbt_node_t node_pred_v = xbt_dynar_get_as(nodes, pred_arr[v], xbt_node_t);
-//     xbt_node_t node_v = xbt_dynar_get_as(nodes, v, xbt_node_t);
-//     xbt_edge_t edge = xbt_graph_get_edge(routing->route_graph, node_pred_v, node_v);
-// 
-//     xbt_assert2(edge != NULL, "no route between host %d and %d", src_id, dst_id);
-// 
-//     link = xbt_graph_edge_get_data(edge);
-//     xbt_dynar_unshift(routing->last_route, &link);
-//     size++;
-//   }
-// 
-// 
-//   if(routing->cached && elm == NULL) {
-//     //add to predecessor list of the current src-host to cache
-//     elm = xbt_new0(struct route_cache_element, sizeof(struct route_cache_element));
-//     elm->pred_arr = pred_arr;
-//     elm->size = size;
-//     xbt_dict_set_ext(routing->route_cache, (char*)(&src_id), sizeof(int), (xbt_set_elm_t)elm, &route_cache_elem_free);
-//   }
-// 
-//   if(!routing->cached)
-//     free(pred_arr);
-// 
-//   return routing->last_route;
-// }
-// 
-// 
-// static void routing_dijkstra_finalize(void) {
-//   routing_dijkstra_t routing = (routing_dijkstra_t)used_routing;
-// 
-//   if (routing) {
-//     xbt_graph_free_graph(routing->route_graph, &free, NULL, &free);
-//     xbt_dict_free(&routing->graph_node_map);
-//     if(routing->cached)
-//       xbt_dict_free(&routing->route_cache);
-//     xbt_dynar_free(&routing->last_route);
-//     xbt_dict_free(&used_routing->host_id);
-//     free(routing);
-//     routing=NULL;
-//   }
-// }
-// 
-// static xbt_dict_t routing_dijkstraboth_get_onelink_routes(void){
-//   xbt_assert0(0,"The get_onelink_routes feature is not supported in routing model dijkstraboth");
-// }
-// 
-// static int routing_dijkstraboth_is_router(int id){
-//   xbt_assert0(0,"The get_is_router feature is not supported in routing model dijkstraboth");
-// }
-// 
-// /*
-//  *
-//  */
-// static void routing_model_dijkstraboth_create(size_t size_of_link,void *loopback, int cached) {
-//   /* initialize our structure */
-//   routing_dijkstra_t routing = xbt_new0(s_routing_dijkstra_t,1);
-//   routing->generic_routing.name = "Dijkstra";
-//   routing->generic_routing.host_count = 0;
-//   routing->generic_routing.get_route = routing_dijkstra_get_route;
-//   routing->generic_routing.get_onelink_routes = routing_dijkstraboth_get_onelink_routes;
-//   routing->generic_routing.is_router = routing_dijkstraboth_is_router;
-//   routing->generic_routing.finalize = routing_dijkstra_finalize;
-//   routing->size_of_link = size_of_link;
-//   routing->loopback = loopback;
-//   routing->cached = cached;
-// 
-//   /* Set it in position */
-//   used_routing = (routing_t) routing;
-// 
-//   /* Setup the parsing callbacks we need */
-//   routing->generic_routing.host_id = xbt_dict_new();
-//   surfxml_add_callback(STag_surfxml_host_cb_list, &routing_full_parse_Shost);
-//   surfxml_add_callback(ETag_surfxml_platform_cb_list, &routing_dijkstra_parse_end);
-//   surfxml_add_callback(STag_surfxml_route_cb_list,
-//       &routing_full_parse_Sroute_set_endpoints);
-//   surfxml_add_callback(ETag_surfxml_route_cb_list, &routing_full_parse_Eroute);
-//   surfxml_add_callback(STag_surfxml_cluster_cb_list, &routing_shortest_path_parse_Scluster);
-// }
-// 
-// static void routing_model_dijkstra_create(size_t size_of_link,void *loopback) {
-//   routing_model_dijkstraboth_create(size_of_link, loopback, 0);
-// }
-// 
-// static void routing_model_dijkstracache_create(size_t size_of_link,void *loopback) {
-//   routing_model_dijkstraboth_create(size_of_link, loopback, 1);
-// }
-
-/* ************************************************** */
-/* ********** NO ROUTING **************************** */
-
-
-// static void routing_none_finalize(void) {
-//   if (used_routing) {
-//     xbt_dict_free(&used_routing->host_id);
-//     free(used_routing);
-//     used_routing=NULL;
-//   }
-// }
-// 
-// static void routing_model_none_create(size_t size_of_link,void *loopback) {
-//   routing_t routing = xbt_new0(s_routing_t,1);
-//   INFO0("Null routing");
-//   routing->name = "none";
-//   routing->host_count = 0;
-//   routing->host_id = xbt_dict_new();
-//   routing->get_onelink_routes = NULL;
-//   routing->is_router = NULL;
-//   routing->get_route = NULL;
-// 
-//   routing->finalize = routing_none_finalize;
-// 
-//   /* Set it in position */
-//   used_routing = (routing_t) routing;
-// }