Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Move src/surf/surf_routing.h in include/surf/surf_routing.h
[simgrid.git] / src / surf / surf_routing.c
index 8e68cf3..f18024e 100644 (file)
@@ -4,68 +4,50 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-
-
-#include <float.h>
-#include "gras_config.h"
-
 #ifdef HAVE_PCRE_LIB
 #include <pcre.h>               /* regular expression library */
 #endif
-#include "surf_private.h"
-#include "xbt/dynar.h"
-#include "xbt/str.h"
-#include "xbt/config.h"
-#include "xbt/graph.h"
-#include "xbt/set.h"
-#include "surf/surfxml_parse.h"
-
-xbt_dict_t patterns = NULL;
-xbt_dict_t random_value = NULL;
-
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route, surf, "Routing part of surf");
+#include "surf_routing_private.h"
+#include "surf/surf_routing.h"
+
+xbt_lib_t host_lib;
+int ROUTING_HOST_LEVEL; //Routing level
+int    SURF_CPU_LEVEL;         //Surf cpu level
+int SURF_WKS_LEVEL;            //Surf workstation level
+int SIMIX_HOST_LEVEL;  //Simix level
+int    MSG_HOST_LEVEL;         //Msg level
+int    SD_HOST_LEVEL;          //Simdag level
+int    COORD_HOST_LEVEL;       //Coordinates level
+int NS3_HOST_LEVEL;            //host node for ns3
+
+xbt_lib_t link_lib;
+int SD_LINK_LEVEL;             //Simdag level
+int SURF_LINK_LEVEL;   //Surf level
+int NS3_LINK_LEVEL;            //link for ns3
+
+xbt_lib_t as_router_lib;
+int ROUTING_ASR_LEVEL; //Routing level
+int COORD_ASR_LEVEL;   //Coordinates level
+int NS3_ASR_LEVEL;             //host node for ns3
+
+static xbt_dict_t patterns = NULL;
+static xbt_dict_t random_value = NULL;
 
 /* Global vars */
 routing_global_t global_routing = NULL;
 routing_component_t current_routing = NULL;
 model_type_t current_routing_model = NULL;
+
+/* global parse functions */
+xbt_dynar_t link_list = NULL;    /* temporary store of current list link of a route */
+static const char *src = NULL;        /* temporary store the source name of a route */
+static const 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 */
+static char *gw_dst = NULL;     /* temporary store the gateway destination name of a route */
 static double_f_cpvoid_t get_link_latency = NULL;
 
-/* Prototypes of each model */
-static void *model_full_create(void);   /* create structures for full routing model */
-static void model_full_load(void);      /* load parse functions for full routing model */
-static void model_full_unload(void);    /* unload parse functions for full routing model */
-static void model_full_end(void);       /* finalize the creation of full routing model */
-static void model_full_set_route(      /* Set the route and ASroute between src and dst */
-               routing_component_t rc, const char *src, const char *dst, name_route_extended_t route);
-
-static void *model_floyd_create(void);  /* create structures for floyd routing model */
-static void model_floyd_load(void);     /* load parse functions for floyd routing model */
-static void model_floyd_unload(void);   /* unload parse functions for floyd routing model */
-static void model_floyd_end(void);      /* finalize the creation of floyd routing model */
-static void model_floyd_set_route(routing_component_t rc, const char *src,
-        const char *dst, name_route_extended_t route);
-
-static void *model_dijkstra_both_create(int cached);    /* create by calling dijkstra or dijkstracache */
-static void *model_dijkstra_create(void);       /* create structures for dijkstra routing model */
-static void *model_dijkstracache_create(void);  /* create structures for dijkstracache routing model */
-static void model_dijkstra_both_load(void);     /* load parse functions for dijkstra routing model */
-static void model_dijkstra_both_unload(void);   /* unload parse functions for dijkstra routing model */
-static void model_dijkstra_both_end(void);      /* finalize the creation of dijkstra routing model */
-static void model_dijkstra_both_set_route (routing_component_t rc, const char *src,
-                     const char *dst, name_route_extended_t route);
-
-static void *model_rulebased_create(void);      /* create structures for rulebased routing model */
-static void model_rulebased_load(void);         /* load parse functions for rulebased routing model */
-static void model_rulebased_unload(void);       /* unload parse functions for rulebased routing model */
-static void model_rulebased_end(void);          /* finalize the creation of rulebased routing model */
-
-static void *model_none_create(void);           /* none routing model */
-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 */
-
-static void routing_parse_Scluster(void);       /* cluster bypass */
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route, surf, "Routing part of surf");
+
 static void routing_parse_Speer(void);          /* peer bypass */
 static void routing_parse_Srandom(void);        /* random bypass */
 static void routing_parse_Erandom(void);        /* random bypass */
@@ -88,8 +70,6 @@ typedef enum {
 #endif
 } e_routing_types;
 
-
-/* must finish with NULL and be careful if the order is changed */
 struct s_model_type routing_models[] = { {"Full",
                                           "Full routing data (fast, large memory requirements, fully expressive)",
                                           model_full_create,
@@ -119,58 +99,6 @@ struct s_model_type routing_models[] = { {"Full",
 {NULL, NULL, NULL, NULL, NULL, NULL}
 };
 
-/* ************************************************************************** */
-/* ***************** GENERIC PARSE FUNCTIONS (declarations) ***************** */
-
-static void generic_set_processing_unit(routing_component_t rc,
-                                        const char *name);
-static void generic_set_autonomous_system(routing_component_t rc,
-                                          const char *name);
-static void generic_set_bypassroute(routing_component_t rc,
-                                    const char *src, const char *dst,
-                                    route_extended_t e_route);
-
-static int surf_link_resource_cmp(const void *a, const void *b);
-static int surf_pointer_resource_cmp(const void *a, const void *b);
-
-/* ************************************************************************** */
-/* *************** GENERIC BUSINESS METHODS (declarations) ****************** */
-
-static double generic_get_link_latency(routing_component_t rc, const char *src, const char *dst);
-static xbt_dynar_t generic_get_onelink_routes(routing_component_t rc);
-static route_extended_t generic_get_bypassroute(routing_component_t rc,
-                                                const char *src,
-                                                const char *dst);
-
-/* ************************************************************************** */
-/* ****************** GENERIC AUX FUNCTIONS (declarations) ****************** */
-
-static route_extended_t
-generic_new_extended_route(e_surf_routing_hierarchy_t hierarchy,
-                           void *data, int order);
-static route_t
-generic_new_route(e_surf_routing_hierarchy_t hierarchy,
-                           void *data, int order);
-static void generic_free_route(route_t route);
-static void generic_free_extended_route(route_extended_t e_route);
-static routing_component_t
-generic_autonomous_system_exist(routing_component_t rc, char *element);
-static routing_component_t
-generic_processing_units_exist(routing_component_t rc, char *element);
-static void generic_src_dst_check(routing_component_t rc, const char *src,
-                                  const char *dst);
-
-/* ************************************************************************** */
-/* **************************** GLOBAL FUNCTIONS **************************** */
-
-/* global parse functions */
-static const char *src = NULL;        /* temporary store the source name of a route */
-static const 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 */
-static char *gw_dst = NULL;     /* temporary store the gateway destination name of a route */
-static xbt_dynar_t link_list = NULL;    /* temporary store of current list link of a route */
-
-
 static double euclidean_dist_comp(int index, xbt_dynar_t src, xbt_dynar_t dst)
 {
        double src_coord, dst_coord;
@@ -182,7 +110,7 @@ static double euclidean_dist_comp(int index, xbt_dynar_t src, xbt_dynar_t dst)
 
 }
 
-static double vivaldi_get_link_latency (routing_component_t rc,const char *src, const char *dst)
+static double base_vivaldi_get_latency (const char *src, const char *dst)
 {
   double euclidean_dist;
   xbt_dynar_t src_ctn, dst_ctn;
@@ -195,13 +123,27 @@ static double vivaldi_get_link_latency (routing_component_t rc,const char *src,
   xbt_die("Coord src '%s' :%p   dst '%s' :%p",src,src_ctn,dst,dst_ctn);
 
   euclidean_dist = sqrt (euclidean_dist_comp(0,src_ctn,dst_ctn)+euclidean_dist_comp(1,src_ctn,dst_ctn))
-                                                               +fabs(atof(xbt_dynar_get_as(src_ctn, 2, char *)))+fabs(atof(xbt_dynar_get_as(dst_ctn, 2, char *)));
+                                fabs(atof(xbt_dynar_get_as(src_ctn, 2, char *)))+fabs(atof(xbt_dynar_get_as(dst_ctn, 2, char *)));
 
   xbt_assert(euclidean_dist>=0, "Euclidean Dist is less than 0\"%s\" and \"%.2f\"", src, euclidean_dist);
 
   return euclidean_dist;
 }
 
+static double vivaldi_get_link_latency (routing_component_t rc,const char *src, const char *dst, route_extended_t e_route)
+{
+  if(get_network_element_type(src) == SURF_NETWORK_ELEMENT_AS) {
+         int need_to_clean = e_route?0:1;
+         double latency;
+         e_route = e_route?e_route:(*(rc->get_route)) (rc, src, dst);
+         latency = base_vivaldi_get_latency(e_route->src_gateway,e_route->dst_gateway);
+         if(need_to_clean) generic_free_extended_route(e_route);
+         return latency;
+  } else {
+         return base_vivaldi_get_latency(src,dst);
+  }
+}
+
 /**
  * \brief Add a "host" to the network element list
  */
@@ -754,16 +696,15 @@ static route_extended_t _get_route(const char *src, const char *dst)
 
   if (src_father == dst_father) {       /* SURF_ROUTING_BASE */
 
-    if (strcmp(src, dst)) {
-      e_route_cnt =
-          (*(common_father->get_route)) (common_father, src, dst);
-      xbt_assert(e_route_cnt, "no route between \"%s\" and \"%s\"", src,
-                  dst);
-      xbt_dynar_foreach(e_route_cnt->generic_route.link_list, cpt, link) {
-        xbt_dynar_push(e_route->generic_route.link_list, &link);
-      }
-      generic_free_extended_route(e_route_cnt);
-    }
+       e_route_cnt =
+         (*(common_father->get_route)) (common_father, src, dst);
+       xbt_assert(e_route_cnt, "no route between \"%s\" and \"%s\"", src,
+                         dst);
+         // FIXME (optim): faire une copie et pas une série de push
+       xbt_dynar_foreach(e_route_cnt->generic_route.link_list, cpt, link) {
+       xbt_dynar_push(e_route->generic_route.link_list, &link);
+       }
+       generic_free_extended_route(e_route_cnt);
 
   } else {                      /* SURF_ROUTING_RECURSIVE */
 
@@ -843,12 +784,11 @@ static double _get_latency(const char *src, const char *dst)
 
   if (src_father == dst_father) {       /* SURF_ROUTING_BASE */
 
-    if (strcmp(src, dst)) {
       latency =
-          (*(common_father->get_latency)) (common_father, src, dst);
+          (*(common_father->get_latency)) (common_father, src, dst, NULL);
       xbt_assert(latency>=0, "no route between \"%s\" and \"%s\"", src,
                   dst);
-     } else latency = 0;
+
   } else {                      /* SURF_ROUTING_RECURSIVE */
      route_extended_t e_route_bypass = NULL;
     if (common_father->get_bypass_route)
@@ -867,16 +807,14 @@ static double _get_latency(const char *src, const char *dst)
     xbt_assert((e_route_cnt->src_gateway == NULL) ==
                 (e_route_cnt->dst_gateway == NULL),
                 "bad gateway for route between \"%s\" and \"%s\"", src,
-                dst);            
-    latency =
-          (*(common_father->get_latency)) (common_father, elements_As_name(src),
-                         elements_As_name(dst));
+                dst);
+
+    latency = (*(common_father->get_latency)) (common_father, src_father->name, dst_father->name, e_route_cnt);
 
     xbt_assert(latency>=0, "no route between \"%s\" and \"%s\"",
                 src_father->name, dst_father->name);
-    
 
-    if (src != e_route_cnt->src_gateway) {
+    if (strcmp(src,e_route_cnt->src_gateway)) {
 
       latency_src = _get_latency(src, e_route_cnt->src_gateway);
       xbt_assert(latency_src>=0, "no route between \"%s\" and \"%s\"", src,
@@ -884,7 +822,7 @@ static double _get_latency(const char *src, const char *dst)
       latency += latency_src;
     }
 
-    if (e_route_cnt->dst_gateway != dst) {
+    if (strcmp(e_route_cnt->dst_gateway,dst)) {
     
       latency_dst = _get_latency(e_route_cnt->dst_gateway, dst);
       xbt_assert(latency_dst>=0, "no route between \"%s\" and \"%s\"",
@@ -913,20 +851,8 @@ static xbt_dynar_t get_route(const char *src, const char *dst)
 {
 
   route_extended_t e_route;
-  xbt_dynar_t elem_father_list = NULL;
-  routing_component_t common_father = NULL;
-
-  if (strcmp(src, dst))
-    e_route = _get_route(src, dst);
-  else {
-    elem_father_list = elements_father(src, dst);
-    common_father =
-        xbt_dynar_get_as(elem_father_list, 0, routing_component_t);
-
-    e_route = (*(common_father->get_route)) (common_father, src, dst);
-    xbt_dynar_free(&elem_father_list);
-  }
 
+  e_route = _get_route(src, dst);
   xbt_assert(e_route, "no route between \"%s\" and \"%s\"", src, dst);
 
   if (global_routing->last_route)
@@ -940,12 +866,7 @@ static xbt_dynar_t get_route(const char *src, const char *dst)
 
   xbt_free(e_route);
 
-/*
-  if (xbt_dynar_length(global_routing->last_route) == 0)
-    return NULL;
-  else
-*/
-    return global_routing->last_route;
+  return global_routing->last_route;
 }
 
 /**
@@ -970,18 +891,8 @@ static double get_latency(const char *src, const char *dst)
 {
 
   double latency = -1.0;
-  xbt_dynar_t elem_father_list = elements_father(src, dst);
-  routing_component_t common_father =
-      xbt_dynar_get_as(elem_father_list, 0, routing_component_t);
-
-  if (strcmp(src, dst))
-    latency = _get_latency(src, dst);
-  else
-    latency = (*(common_father->get_latency)) (common_father, src, dst);
-
+  latency = _get_latency(src, dst);
   xbt_assert(latency>=0.0, "no route between \"%s\" and \"%s\"", src, dst);
-  xbt_dynar_free(&elem_father_list);
-
   return latency;
 }
 
@@ -1154,1861 +1065,174 @@ void surf_parse_models_setup()
        free(platform_filename);
 }
 
-/* ************************************************************************** */
-/* *************************** FULL ROUTING ********************************* */
-
-#define TO_ROUTE_FULL(i,j) routing->routing_table[(i)+(j)*table_size]
-
-/* Routing model structure */
-
-typedef struct {
-  s_routing_component_t generic_routing;
-  route_extended_t *routing_table;
-} s_routing_component_full_t, *routing_component_full_t;
-
-/* Business methods */
-static xbt_dynar_t full_get_onelink_routes(routing_component_t rc)
-{
-  xbt_dynar_t ret = xbt_dynar_new(sizeof(onelink_t), xbt_free);
-
-  routing_component_full_t routing = (routing_component_full_t) rc;
-  size_t table_size = xbt_dict_length(routing->generic_routing.to_index);
-  xbt_dict_cursor_t c1 = NULL, c2 = NULL;
-  char *k1, *d1, *k2, *d2;
-  xbt_dict_foreach(routing->generic_routing.to_index, c1, k1, d1) {
-    xbt_dict_foreach(routing->generic_routing.to_index, c2, k2, d2) {
-      int *src_id = xbt_dict_get_or_null(routing->generic_routing.to_index, k1);
-      int *dst_id = xbt_dict_get_or_null(routing->generic_routing.to_index, k2);
-      xbt_assert(src_id
-                  && dst_id,
-                  "Ask for route \"from\"(%s)  or \"to\"(%s) no found in the local table",
-                  src, dst);
-      route_extended_t route = TO_ROUTE_FULL(*src_id, *dst_id);
-      if (route) {
-        if (xbt_dynar_length(route->generic_route.link_list) == 1) {
-          void *link =
-              *(void **) xbt_dynar_get_ptr(route->generic_route.link_list,
-                                           0);
-          onelink_t onelink = xbt_new0(s_onelink_t, 1);
-          onelink->link_ptr = link;
-          if (routing->generic_routing.hierarchy == SURF_ROUTING_BASE) {
-            onelink->src = xbt_strdup(k1);
-            onelink->dst = xbt_strdup(k2);
-          } else if (routing->generic_routing.hierarchy ==
-                     SURF_ROUTING_RECURSIVE) {
-            onelink->src = xbt_strdup(route->src_gateway);
-            onelink->dst = xbt_strdup(route->dst_gateway);
-          }
-          xbt_dynar_push(ret, &onelink);
-        }
-      }
-    }
-  }
-  return ret;
-}
-
-static route_extended_t full_get_route(routing_component_t rc,
-                                       const char *src, const char *dst)
-{
-  xbt_assert(rc && src
-              && dst,
-              "Invalid params for \"get_route\" function at AS \"%s\"",
-              rc->name);
-
-  /* set utils vars */
-  routing_component_full_t routing = (routing_component_full_t) rc;
-  size_t table_size = xbt_dict_length(routing->generic_routing.to_index);
-
-  generic_src_dst_check(rc, src, dst);
-  int *src_id = xbt_dict_get_or_null(routing->generic_routing.to_index, src);
-  int *dst_id = xbt_dict_get_or_null(routing->generic_routing.to_index, dst);
-  xbt_assert(src_id
-              && dst_id,
-              "Ask for route \"from\"(%s)  or \"to\"(%s) no found in the local table",
-              src, dst);
+/* ************************************************** */
+/* ********** PATERN FOR NEW ROUTING **************** */
 
-  route_extended_t e_route = NULL;
-  route_extended_t new_e_route = NULL;
-  void *link;
-  unsigned int cpt = 0;
+/* The minimal configuration of a new routing model need the next functions,
+ * also you need to set at the start of the file, the new model in the model
+ * list. Remember keep the null ending of the list.
+ */
+/*** Routing model structure ***/
+// typedef struct {
+//   s_routing_component_t generic_routing;
+//   /* things that your routing model need */
+// } s_routing_component_NEW_t,*routing_component_NEW_t;
 
-  e_route = TO_ROUTE_FULL(*src_id, *dst_id);
+/*** Parse routing model functions ***/
+// static void model_NEW_set_processing_unit(routing_component_t rc, const char* name) {}
+// static void model_NEW_set_autonomous_system(routing_component_t rc, const char* name) {}
+// static void model_NEW_set_route(routing_component_t rc, const char* src, const char* dst, route_t route) {}
+// static void model_NEW_set_ASroute(routing_component_t rc, const char* src, const char* dst, route_extended_t route) {}
+// static void model_NEW_set_bypassroute(routing_component_t rc, const char* src, const char* dst, route_extended_t e_route) {}
 
-  if (e_route) {
-    new_e_route = xbt_new0(s_route_extended_t, 1);
-    new_e_route->src_gateway = xbt_strdup(e_route->src_gateway);
-    new_e_route->dst_gateway = xbt_strdup(e_route->dst_gateway);
-    new_e_route->generic_route.link_list =
-        xbt_dynar_new(global_routing->size_of_link, NULL);
-    xbt_dynar_foreach(e_route->generic_route.link_list, cpt, link) {
-      xbt_dynar_push(new_e_route->generic_route.link_list, &link);
-    }
-  }
-  return new_e_route;
-}
+/*** Business methods ***/
+// static route_extended_t NEW_get_route(routing_component_t rc, const char* src,const char* dst) {return NULL;}
+// 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) { xbt_free(rc);}
 
-static void full_finalize(routing_component_t rc)
-{
-  routing_component_full_t routing = (routing_component_full_t) rc;
-  size_t table_size = xbt_dict_length(routing->generic_routing.to_index);
-  int i, j;
-  if (routing) {
-    /* Delete routing table */
-    for (i = 0; i < table_size; i++)
-      for (j = 0; j < table_size; j++)
-        generic_free_extended_route(TO_ROUTE_FULL(i, j));
-    xbt_free(routing->routing_table);
-    /* Delete bypass dict */
-    xbt_dict_free(&rc->bypassRoutes);
-    /* Delete index dict */
-    xbt_dict_free(&rc->to_index);
-    /* Delete structure */
-    xbt_free(rc);
-  }
-}
+/*** Creation routing model functions ***/
+// static void* model_NEW_create(void) {
+//   routing_component_NEW_t new_component =  xbt_new0(s_routing_component_NEW_t,1);
+//   new_component->generic_routing.set_processing_unit = model_NEW_set_processing_unit;
+//   new_component->generic_routing.set_autonomous_system = model_NEW_set_autonomous_system;
+//   new_component->generic_routing.set_route = model_NEW_set_route;
+//   new_component->generic_routing.set_ASroute = model_NEW_set_ASroute;
+//   new_component->generic_routing.set_bypassroute = model_NEW_set_bypassroute;
+//   new_component->generic_routing.get_route = NEW_get_route;
+//   new_component->generic_routing.get_bypass_route = NEW_get_bypass_route;
+//   new_component->generic_routing.finalize = NEW_finalize;
+//   /* initialization of internal structures */
+//   return new_component;
+// } /* mandatory */
+// static void  model_NEW_load(void) {}   /* mandatory */
+// static void  model_NEW_unload(void) {} /* mandatory */
+// static void  model_NEW_end(void) {}    /* mandatory */
 
-/* Creation routing model functions */
+/* ************************************************************************** */
+/* ************************* GENERIC PARSE FUNCTIONS ************************ */
 
-static void *model_full_create(void)
+void generic_set_processing_unit(routing_component_t rc,
+                                        const char *name)
 {
-  routing_component_full_t new_component =
-      xbt_new0(s_routing_component_full_t, 1);
-  new_component->generic_routing.set_processing_unit =
-      generic_set_processing_unit;
-  new_component->generic_routing.set_autonomous_system =
-      generic_set_autonomous_system;
-  new_component->generic_routing.set_route = model_full_set_route;
-  new_component->generic_routing.set_ASroute = model_full_set_route;
-  new_component->generic_routing.set_bypassroute = generic_set_bypassroute;
-  new_component->generic_routing.get_route = full_get_route;
-  new_component->generic_routing.get_latency = generic_get_link_latency;
-  new_component->generic_routing.get_onelink_routes =
-      full_get_onelink_routes;
-  new_component->generic_routing.get_bypass_route =
-      generic_get_bypassroute;
-  new_component->generic_routing.finalize = full_finalize;
-  new_component->generic_routing.to_index = xbt_dict_new();
-  new_component->generic_routing.bypassRoutes = xbt_dict_new();
-  new_component->generic_routing.get_network_element_type = get_network_element_type;
-  return new_component;
+  XBT_DEBUG("Load process unit \"%s\"", name);
+  int *id = xbt_new0(int, 1);
+  xbt_dict_t _to_index;
+  _to_index = current_routing->to_index;
+  *id = xbt_dict_length(_to_index);
+  xbt_dict_set(_to_index, name, id, xbt_free);
 }
 
-static void model_full_load(void)
+void generic_set_autonomous_system(routing_component_t rc,
+                                          const char *name)
 {
-  /* use "surfxml_add_callback" to add a parse function call */
+  XBT_DEBUG("Load Autonomous system \"%s\"", name);
+  int *id = xbt_new0(int, 1);
+  xbt_dict_t _to_index;
+  _to_index = current_routing->to_index;
+  *id = xbt_dict_length(_to_index);
+  xbt_dict_set(_to_index, name, id, xbt_free);
 }
 
-static void model_full_unload(void)
+int surf_pointer_resource_cmp(const void *a, const void *b)
 {
-  /* use "surfxml_del_callback" to remove a parse function call */
+  return a != b;
 }
 
-static void model_full_end(void)
+int surf_link_resource_cmp(const void *a, const void *b)
 {
-  unsigned int i;
-  route_extended_t e_route;
-
-  /* set utils vars */
-  routing_component_full_t routing =
-      ((routing_component_full_t) current_routing);
-  size_t table_size = xbt_dict_length(routing->generic_routing.to_index);
-
-  /* Create table if necessary */
-  if(!routing->routing_table)
-         routing->routing_table = xbt_new0(route_extended_t, table_size * table_size);
-
-  /* Add the loopback if needed */
-  if (current_routing->hierarchy == SURF_ROUTING_BASE) {
-    for (i = 0; i < table_size; i++) {
-      e_route = TO_ROUTE_FULL(i, i);
-      if (!e_route) {
-        e_route = xbt_new0(s_route_extended_t, 1);
-        e_route->src_gateway = NULL;
-        e_route->dst_gateway = NULL;
-        e_route->generic_route.link_list =
-            xbt_dynar_new(global_routing->size_of_link, NULL);
-        xbt_dynar_push(e_route->generic_route.link_list,
-                       &global_routing->loopback);
-        TO_ROUTE_FULL(i, i) = e_route;
-      }
-    }
-  }
+  return !!memcmp(a,b,global_routing->size_of_link);
 }
 
-static void model_full_set_route(routing_component_t rc, const char *src,
-               const char *dst, name_route_extended_t route)
+void generic_set_bypassroute(routing_component_t rc,
+                                    const char *src, const char *dst,
+                                    route_extended_t e_route)
 {
-       int *src_id, *dst_id;
-       src_id = xbt_dict_get_or_null(rc->to_index, src);
-       dst_id = xbt_dict_get_or_null(rc->to_index, dst);
-       routing_component_full_t routing = ((routing_component_full_t) rc);
-       size_t table_size = xbt_dict_length(routing->generic_routing.to_index);
-
-       xbt_assert(src_id
-                         && dst_id, "Network elements %s or %s not found", src, dst);
-
-       xbt_assert(xbt_dynar_length(route->generic_route.link_list) > 0,
-                         "Invalid count of links, must be greater than zero (%s,%s)",
-                         src, dst);
-
-       if(!routing->routing_table)
-               routing->routing_table = xbt_new0(route_extended_t, table_size * table_size);
+  XBT_DEBUG("Load bypassRoute from \"%s\" to \"%s\"", src, dst);
+  xbt_dict_t dict_bypassRoutes = rc->bypassRoutes;
+  char *route_name;
 
-       if(TO_ROUTE_FULL(*src_id, *dst_id))
-       {
-               char * link_name;
-               unsigned int i;
-               xbt_dynar_t link_route_to_test = xbt_dynar_new(global_routing->size_of_link, NULL);
-               xbt_dynar_foreach(route->generic_route.link_list,i,link_name)
-               {
-                       void *link = xbt_lib_get_or_null(link_lib, link_name, SURF_LINK_LEVEL);
-                       xbt_assert(link,"Link : '%s' doesn't exists.",link_name);
-                       xbt_dynar_push(link_route_to_test,&link);
-               }
-               xbt_assert(!xbt_dynar_compare(
-                         (void*)TO_ROUTE_FULL(*src_id, *dst_id)->generic_route.link_list,
-                         (void*)link_route_to_test,
-                         (int_f_cpvoid_cpvoid_t) surf_pointer_resource_cmp),
-                         "The route between \"%s\" and \"%s\" already exists. If you are trying to define a reverse route, you must set the symmetrical=no attribute to your routes tags.", src,dst);
-       }
-       else
-       {
-                 if(!route->dst_gateway && !route->src_gateway)
-                         XBT_DEBUG("Load Route from \"%s\" to \"%s\"", src, dst);
-                 else{
-                         XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src,
-                                route->src_gateway, dst, route->dst_gateway);
-                         if(global_routing->get_network_element_type((const char*)route->dst_gateway) == SURF_NETWORK_ELEMENT_NULL)
-                                 xbt_die("The dst_gateway '%s' does not exist!",route->dst_gateway);
-                         if(global_routing->get_network_element_type((const char*)route->src_gateway) == SURF_NETWORK_ELEMENT_NULL)
-                                 xbt_die("The src_gateway '%s' does not exist!",route->src_gateway);
-                 }
-             TO_ROUTE_FULL(*src_id, *dst_id) = generic_new_extended_route(rc->hierarchy,route,1);
-             xbt_dynar_shrink(TO_ROUTE_FULL(*src_id, *dst_id)->generic_route.link_list, 0);
-       }
+  route_name = bprintf("%s#%s", src, dst);
+  xbt_assert(xbt_dynar_length(e_route->generic_route.link_list) > 0,
+              "Invalid count of links, must be greater than zero (%s,%s)",
+              src, dst);
+  xbt_assert(!xbt_dict_get_or_null(dict_bypassRoutes, route_name),
+              "The bypass route between \"%s\"(\"%s\") and \"%s\"(\"%s\") already exists",
+              src, e_route->src_gateway, dst, e_route->dst_gateway);
 
-       if( A_surfxml_route_symmetrical == A_surfxml_route_symmetrical_YES
-               || A_surfxml_ASroute_symmetrical == A_surfxml_ASroute_symmetrical_YES )
-       {
-               if(route->dst_gateway && route->src_gateway)
-               {
-                  char *gw_tmp ;
-                  gw_tmp = route->src_gateway;
-                  route->src_gateway = route->dst_gateway;
-                  route->dst_gateway = gw_tmp;
-               }
-               if(TO_ROUTE_FULL(*dst_id, *src_id))
-               {
-                       char * link_name;
-                       unsigned int i;
-                       xbt_dynar_t link_route_to_test = xbt_dynar_new(global_routing->size_of_link, NULL);
-                       for(i=xbt_dynar_length(route->generic_route.link_list) ;i>0 ;i--)
-                       {
-                               link_name = xbt_dynar_get_as(route->generic_route.link_list,i-1,void *);
-                               void *link = xbt_lib_get_or_null(link_lib, link_name, SURF_LINK_LEVEL);
-                               xbt_assert(link,"Link : '%s' doesn't exists.",link_name);
-                               xbt_dynar_push(link_route_to_test,&link);
-                       }
-                       xbt_assert(!xbt_dynar_compare(
-                                 (void*)TO_ROUTE_FULL(*dst_id, *src_id)->generic_route.link_list,
-                             (void*)link_route_to_test,
-                                 (int_f_cpvoid_cpvoid_t) surf_pointer_resource_cmp),
-                                 "The route between \"%s\" and \"%s\" already exists", src,dst);
-               }
-               else
-               {
-                         if(!route->dst_gateway && !route->src_gateway)
-                                 XBT_DEBUG("Load Route from \"%s\" to \"%s\"", dst, src);
-                         else
-                                 XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", dst,
-                                        route->src_gateway, src, route->dst_gateway);
-                     TO_ROUTE_FULL(*dst_id, *src_id) = generic_new_extended_route(rc->hierarchy,route,0);
-                     xbt_dynar_shrink(TO_ROUTE_FULL(*dst_id, *src_id)->generic_route.link_list, 0);
-               }
-       }
+  route_extended_t new_e_route =
+      generic_new_extended_route(SURF_ROUTING_RECURSIVE, e_route, 0);
+  xbt_dynar_free(&(e_route->generic_route.link_list));
+  xbt_free(e_route);
 
-       if (rc->hierarchy == SURF_ROUTING_BASE) generic_free_route((route_t)route) ;
-       else generic_free_extended_route((route_extended_t)route);
+  xbt_dict_set(dict_bypassRoutes, route_name, new_e_route,
+               (void (*)(void *)) generic_free_extended_route);
+  xbt_free(route_name);
 }
 
 /* ************************************************************************** */
-/* *************************** FLOYD ROUTING ******************************** */
-
-#define TO_FLOYD_COST(i,j) (routing->cost_table)[(i)+(j)*table_size]
-#define TO_FLOYD_PRED(i,j) (routing->predecessor_table)[(i)+(j)*table_size]
-#define TO_FLOYD_LINK(i,j) (routing->link_table)[(i)+(j)*table_size]
+/* *********************** GENERIC BUSINESS METHODS ************************* */
 
-/* Routing model structure */
+double generic_get_link_latency(routing_component_t rc,
+                                       const char *src, const char *dst,
+                                       route_extended_t route)
+{
+       int need_to_clean = route?0:1;
+       void * link;
+       unsigned int i;
+       double latency = 0.0;
 
-typedef struct {
-  s_routing_component_t generic_routing;
-  /* vars for calculate the floyd algorith. */
-  int *predecessor_table;
-  double *cost_table;
-  route_extended_t *link_table; /* char* -> int* */
-} s_routing_component_floyd_t, *routing_component_floyd_t;
+       route = route?route:rc->get_route(rc,src,dst);
 
-static route_extended_t floyd_get_route(routing_component_t rc,
-                                        const char *src, const char *dst);
+       xbt_dynar_foreach(route->generic_route.link_list,i,link) {
+               latency += get_link_latency(link);
+       }
+       if(need_to_clean) generic_free_extended_route(route);
+  return latency;
+}
 
-/* Business methods */
-static xbt_dynar_t floyd_get_onelink_routes(routing_component_t rc)
+xbt_dynar_t generic_get_onelink_routes(routing_component_t rc)
 {
-  xbt_dynar_t ret = xbt_dynar_new(sizeof(onelink_t), xbt_free);
-
-  routing_component_floyd_t routing = (routing_component_floyd_t) rc;
-  //size_t table_size = xbt_dict_length(routing->generic_routing.to_index);
-  xbt_dict_cursor_t c1 = NULL, c2 = NULL;
-  char *k1, *d1, *k2, *d2;
-  xbt_dict_foreach(routing->generic_routing.to_index, c1, k1, d1) {
-    xbt_dict_foreach(routing->generic_routing.to_index, c2, k2, d2) {
-      route_extended_t route = floyd_get_route(rc, k1, k2);
-      if (route) {
-        if (xbt_dynar_length(route->generic_route.link_list) == 1) {
-          void *link =
-              *(void **) xbt_dynar_get_ptr(route->generic_route.link_list,
-                                           0);
-          onelink_t onelink = xbt_new0(s_onelink_t, 1);
-          onelink->link_ptr = link;
-          if (routing->generic_routing.hierarchy == SURF_ROUTING_BASE) {
-            onelink->src = xbt_strdup(k1);
-            onelink->dst = xbt_strdup(k2);
-          } else if (routing->generic_routing.hierarchy ==
-                     SURF_ROUTING_RECURSIVE) {
-            onelink->src = xbt_strdup(route->src_gateway);
-            onelink->dst = xbt_strdup(route->dst_gateway);
-          }
-          xbt_dynar_push(ret, &onelink);
-        }
-      }
-    }
-  }
-  return ret;
+  xbt_die("\"generic_get_onelink_routes\" not implemented yet");
 }
 
-static route_extended_t floyd_get_route(routing_component_t rc,
-                                        const char *src, const char *dst)
+route_extended_t generic_get_bypassroute(routing_component_t rc,
+                                                const char *src,
+                                                const char *dst)
 {
-  xbt_assert(rc && src
-              && dst,
-              "Invalid params for \"get_route\" function at AS \"%s\"",
-              rc->name);
-
-  /* set utils vars */
-  routing_component_floyd_t routing = (routing_component_floyd_t) rc;
-  size_t table_size = xbt_dict_length(routing->generic_routing.to_index);
-
-  generic_src_dst_check(rc, src, dst);
-  int *src_id = xbt_dict_get_or_null(routing->generic_routing.to_index, src);
-  int *dst_id = xbt_dict_get_or_null(routing->generic_routing.to_index, dst);
-  xbt_assert(src_id
-              && dst_id,
-              "Ask for route \"from\"(%s)  or \"to\"(%s) no found in the local table",
-              src, dst);
-
-  /* create a result route */
-  route_extended_t new_e_route = xbt_new0(s_route_extended_t, 1);
-  new_e_route->generic_route.link_list =
-      xbt_dynar_new(global_routing->size_of_link, NULL);
-  new_e_route->src_gateway = NULL;
-  new_e_route->dst_gateway = NULL;
-
-  int first = 1;
-  int pred = *dst_id;
-  int prev_pred = 0;
-  char *gw_src = NULL, *gw_dst =
-      NULL, *prev_gw_src, *prev_gw_dst, *first_gw = NULL;
-  unsigned int cpt;
-  void *link;
-  xbt_dynar_t links;
-
-  do {
-    prev_pred = pred;
-    pred = TO_FLOYD_PRED(*src_id, pred);
-    if (pred == -1)             /* if no pred in route -> no route to host */
-      break;
-    xbt_assert(TO_FLOYD_LINK(pred, prev_pred),
-                "Invalid link for the route between \"%s\" or \"%s\"", src,
-                dst);
+  xbt_dict_t dict_bypassRoutes = rc->bypassRoutes;
+  routing_component_t src_as, dst_as;
+  int index_src, index_dst;
+  xbt_dynar_t path_src = NULL;
+  xbt_dynar_t path_dst = NULL;
+  routing_component_t current = NULL;
+  routing_component_t *current_src = NULL;
+  routing_component_t *current_dst = NULL;
 
-    prev_gw_src = gw_src;
-    prev_gw_dst = gw_dst;
-
-    route_extended_t e_route = TO_FLOYD_LINK(pred, prev_pred);
-    gw_src = e_route->src_gateway;
-    gw_dst = e_route->dst_gateway;
-
-    if (first)
-      first_gw = gw_dst;
-
-    if (rc->hierarchy == SURF_ROUTING_RECURSIVE && !first
-        && strcmp(gw_dst, prev_gw_src)) {
-      xbt_dynar_t e_route_as_to_as =
-          (*(global_routing->get_route)) (gw_dst, prev_gw_src);
-      xbt_assert(e_route_as_to_as, "no route between \"%s\" and \"%s\"",
-                  gw_dst, prev_gw_src);
-      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++;
-      }
-    }
+  /* (1) find the as where the src and dst are located */
+  void * src_data = xbt_lib_get_or_null(host_lib,src, ROUTING_HOST_LEVEL);
+  void * dst_data = xbt_lib_get_or_null(host_lib,dst, ROUTING_HOST_LEVEL);
+  if(!src_data) src_data = xbt_lib_get_or_null(as_router_lib,src, ROUTING_ASR_LEVEL);
+  if(!dst_data) dst_data = xbt_lib_get_or_null(as_router_lib,dst, ROUTING_ASR_LEVEL);
 
-    links = e_route->generic_route.link_list;
-    xbt_dynar_foreach(links, cpt, link) {
-      xbt_dynar_unshift(new_e_route->generic_route.link_list, &link);
-    }
-    first = 0;
+  if(src_data == NULL || dst_data == NULL)
+         xbt_die("Ask for route \"from\"(%s) or \"to\"(%s) no found at AS \"%s\"",
+                    src, dst, rc->name);
 
-  } while (pred != *src_id);
-  xbt_assert(pred != -1, "no route from host %d to %d (\"%s\" to \"%s\")",
-              *src_id, *dst_id, src, dst);
+  src_as = ((network_element_info_t)src_data)->rc_component;
+  dst_as = ((network_element_info_t)dst_data)->rc_component;
 
-  if (rc->hierarchy == SURF_ROUTING_RECURSIVE) {
-    new_e_route->src_gateway = xbt_strdup(gw_src);
-    new_e_route->dst_gateway = xbt_strdup(first_gw);
-  }
-
-  return new_e_route;
-}
-
-static void floyd_finalize(routing_component_t rc)
-{
-  routing_component_floyd_t routing = (routing_component_floyd_t) rc;
-  int i, j;
-  size_t table_size;
-  if (routing) {
-    table_size = xbt_dict_length(routing->generic_routing.to_index);
-    /* Delete link_table */
-    for (i = 0; i < table_size; i++)
-      for (j = 0; j < table_size; j++)
-        generic_free_extended_route(TO_FLOYD_LINK(i, j));
-    xbt_free(routing->link_table);
-    /* Delete bypass dict */
-    xbt_dict_free(&routing->generic_routing.bypassRoutes);
-    /* Delete index dict */
-    xbt_dict_free(&(routing->generic_routing.to_index));
-    /* Delete dictionary index dict, predecessor and links table */
-    xbt_free(routing->predecessor_table);
-    /* Delete structure */
-    xbt_free(rc);
-  }
-}
-
-static void *model_floyd_create(void)
-{
-  routing_component_floyd_t new_component =
-      xbt_new0(s_routing_component_floyd_t, 1);
-  new_component->generic_routing.set_processing_unit =
-      generic_set_processing_unit;
-  new_component->generic_routing.set_autonomous_system =
-      generic_set_autonomous_system;
-  new_component->generic_routing.set_route = model_floyd_set_route;
-  new_component->generic_routing.set_ASroute = model_floyd_set_route;
-  new_component->generic_routing.set_bypassroute = generic_set_bypassroute;
-  new_component->generic_routing.get_route = floyd_get_route;
-  new_component->generic_routing.get_latency = generic_get_link_latency;
-  new_component->generic_routing.get_onelink_routes =
-      floyd_get_onelink_routes;
-  new_component->generic_routing.get_bypass_route =
-      generic_get_bypassroute;
-  new_component->generic_routing.finalize = floyd_finalize;
-  new_component->generic_routing.to_index = xbt_dict_new();
-  new_component->generic_routing.bypassRoutes = xbt_dict_new();
-  new_component->generic_routing.get_network_element_type = get_network_element_type;
-  return new_component;
-}
-
-static void model_floyd_load(void)
-{
-  /* use "surfxml_add_callback" to add a parse function call */
-}
-
-static void model_floyd_unload(void)
-{
-  /* use "surfxml_del_callback" to remove a parse function call */
-}
-
-static void model_floyd_end(void)
-{
-
-       routing_component_floyd_t routing =
-         ((routing_component_floyd_t) current_routing);
-
-       unsigned int i, j, a, b, c;
-
-       /* set the size of table routing */
-       size_t table_size = xbt_dict_length(routing->generic_routing.to_index);
-
-       if(!routing->link_table)
-       {
-               /* Create Cost, Predecessor and Link tables */
-               routing->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, missing in the previous version */
-               }
-       }
-
-       /* Add the loopback if needed */
-       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) {
-                       e_route = xbt_new0(s_route_extended_t, 1);
-                       e_route->src_gateway = NULL;
-                       e_route->dst_gateway = NULL;
-                       e_route->generic_route.link_list =
-                               xbt_dynar_new(global_routing->size_of_link, NULL);
-                       xbt_dynar_push(e_route->generic_route.link_list,
-                                                  &global_routing->loopback);
-                       TO_FLOYD_LINK(i, i) = e_route;
-                       TO_FLOYD_PRED(i, i) = i;
-                       TO_FLOYD_COST(i, i) = 1;
-                 }
-               }
-       }
-       /* Calculate path costs */
-       for (c = 0; c < table_size; c++) {
-               for (a = 0; a < table_size; a++) {
-                 for (b = 0; b < table_size; b++) {
-                       if (TO_FLOYD_COST(a, c) < DBL_MAX && TO_FLOYD_COST(c, b) < DBL_MAX) {
-                         if (TO_FLOYD_COST(a, b) == DBL_MAX ||
-                                 (TO_FLOYD_COST(a, c) + TO_FLOYD_COST(c, b) <
-                                  TO_FLOYD_COST(a, b))) {
-                               TO_FLOYD_COST(a, b) =
-                                       TO_FLOYD_COST(a, c) + TO_FLOYD_COST(c, b);
-                               TO_FLOYD_PRED(a, b) = TO_FLOYD_PRED(c, b);
-                         }
-                       }
-                 }
-               }
-       }
-}
-
-static void model_floyd_set_route(routing_component_t rc, const char *src,
-        const char *dst, name_route_extended_t route)
-{
-       routing_component_floyd_t routing = (routing_component_floyd_t) rc;
-
-       /* set the size of table routing */
-       size_t table_size = xbt_dict_length(rc->to_index);
-       int *src_id, *dst_id;
-       int i,j;
-
-       src_id = xbt_dict_get_or_null(rc->to_index, src);
-       dst_id = xbt_dict_get_or_null(rc->to_index, dst);
-
-       if(!routing->link_table)
-       {
-               /* Create Cost, Predecessor and Link tables */
-               routing->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, missing in the previous version */
-               }
-       }
-
-       if(TO_FLOYD_LINK(*src_id, *dst_id))
-       {
-               if(!route->dst_gateway && !route->src_gateway)
-                       XBT_DEBUG("See Route from \"%s\" to \"%s\"", src, dst);
-               else
-                       XBT_DEBUG("See ASroute from \"%s(%s)\" to \"%s(%s)\"", src,
-                                route->src_gateway, dst, route->dst_gateway);
-               char * link_name;
-               unsigned int cpt;
-               xbt_dynar_t link_route_to_test = xbt_dynar_new(global_routing->size_of_link, NULL);
-               xbt_dynar_foreach(route->generic_route.link_list,cpt,link_name)
-               {
-                       void *link = xbt_lib_get_or_null(link_lib, link_name, SURF_LINK_LEVEL);
-                       xbt_assert(link,"Link : '%s' doesn't exists.",link_name);
-                       xbt_dynar_push(link_route_to_test,&link);
-               }
-               xbt_assert(!xbt_dynar_compare(
-                         (void*)TO_FLOYD_LINK(*src_id, *dst_id)->generic_route.link_list,
-                         (void*)link_route_to_test,
-                         (int_f_cpvoid_cpvoid_t) surf_pointer_resource_cmp),
-                         "The route between \"%s\" and \"%s\" already exists", src,dst);
-       }
-       else
-       {
-               if(!route->dst_gateway && !route->src_gateway)
-                 XBT_DEBUG("Load Route from \"%s\" to \"%s\"", src, dst);
-               else{
-                       XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src,
-                                route->src_gateway, dst, route->dst_gateway);
-                       if(global_routing->get_network_element_type((const char*)route->dst_gateway) == SURF_NETWORK_ELEMENT_NULL)
-                               xbt_die("The dst_gateway '%s' does not exist!",route->dst_gateway);
-                       if(global_routing->get_network_element_type((const char*)route->src_gateway) == SURF_NETWORK_ELEMENT_NULL)
-                               xbt_die("The src_gateway '%s' does not exist!",route->src_gateway);
-               }
-           TO_FLOYD_LINK(*src_id, *dst_id) =
-                       generic_new_extended_route(rc->hierarchy, route, 1);
-           TO_FLOYD_PRED(*src_id, *dst_id) = *src_id;
-           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 */
-       }
-
-       if( A_surfxml_route_symmetrical == A_surfxml_route_symmetrical_YES
-               || A_surfxml_ASroute_symmetrical == A_surfxml_ASroute_symmetrical_YES )
-       {
-               if(TO_FLOYD_LINK(*dst_id, *src_id))
-               {
-                       if(!route->dst_gateway && !route->src_gateway)
-                         XBT_DEBUG("See Route from \"%s\" to \"%s\"", dst, src);
-                       else
-                         XBT_DEBUG("See ASroute from \"%s(%s)\" to \"%s(%s)\"", dst,
-                                        route->src_gateway, src, route->dst_gateway);
-                       char * link_name;
-                       unsigned int i;
-                       xbt_dynar_t link_route_to_test = xbt_dynar_new(global_routing->size_of_link, NULL);
-                       for(i=xbt_dynar_length(route->generic_route.link_list) ;i>0 ;i--)
-                       {
-                               link_name = xbt_dynar_get_as(route->generic_route.link_list,i-1,void *);
-                               void *link = xbt_lib_get_or_null(link_lib, link_name, SURF_LINK_LEVEL);
-                               xbt_assert(link,"Link : '%s' doesn't exists.",link_name);
-                               xbt_dynar_push(link_route_to_test,&link);
-                       }
-                       xbt_assert(!xbt_dynar_compare(
-                                 (void*)TO_FLOYD_LINK(*dst_id, *src_id)->generic_route.link_list,
-                             (void*)link_route_to_test,
-                                 (int_f_cpvoid_cpvoid_t) surf_pointer_resource_cmp),
-                                 "The route between \"%s\" and \"%s\" already exists", src,dst);
-               }
-               else
-               {
-                       if(route->dst_gateway && route->src_gateway)
-                       {
-                          char *gw_src = xbt_strdup(route->src_gateway);
-                          char *gw_dst = xbt_strdup(route->dst_gateway);
-                          route->src_gateway = gw_dst;
-                          route->dst_gateway = gw_src;
-                       }
-
-                       if(!route->dst_gateway && !route->src_gateway)
-                         XBT_DEBUG("Load Route from \"%s\" to \"%s\"", dst, src);
-                       else
-                         XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", dst,
-                                        route->src_gateway, src, route->dst_gateway);
-
-                   TO_FLOYD_LINK(*dst_id, *src_id) =
-                               generic_new_extended_route(rc->hierarchy, route, 0);
-                   TO_FLOYD_PRED(*dst_id, *src_id) = *dst_id;
-                   TO_FLOYD_COST(*dst_id, *src_id) =
-                               ((TO_FLOYD_LINK(*dst_id, *src_id))->generic_route.link_list)->used;   /* count of links, old model assume 1 */
-               }
-       }
-}
-
-/* ************************************************************************** */
-/* ********** Dijkstra & Dijkstra Cached ROUTING **************************** */
-
-typedef struct {
-  s_routing_component_t generic_routing;
-  xbt_graph_t route_graph;      /* xbt_graph */
-  xbt_dict_t graph_node_map;    /* map */
-  xbt_dict_t route_cache;       /* use in cache mode */
-  int cached;
-} s_routing_component_dijkstra_t, *routing_component_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) {
-    xbt_free(elm->pred_arr);
-    xbt_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) {
-    xbt_free(elm);
-  }
-}
-
-static void graph_edge_data_free(void *e)
-{
-  route_extended_t e_route = (route_extended_t) e;
-  if (e_route) {
-    xbt_dynar_free(&(e_route->generic_route.link_list));
-    if (e_route->src_gateway)
-      xbt_free(e_route->src_gateway);
-    if (e_route->dst_gateway)
-      xbt_free(e_route->dst_gateway);
-    xbt_free(e_route);
-  }
-}
-
-/* Utility functions */
-
-static xbt_node_t route_graph_new_node(routing_component_dijkstra_t rc,
-                                       int id, int graph_id)
-{
-  routing_component_dijkstra_t routing = (routing_component_dijkstra_t) rc;
-  xbt_node_t node = NULL;
-  graph_node_data_t data = NULL;
-  graph_node_map_element_t elm = NULL;
-
-  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);
-  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(routing_component_dijkstra_t rc, int id)
-{
-  routing_component_dijkstra_t routing = (routing_component_dijkstra_t) rc;
-  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(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_DEBUG("Load Route from \"%d\" to \"%d\"", src_id, dst_id);
-  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(rc, src_id, -1);
-    dst = src;
-  } else {
-    if (src == NULL) {
-      src = route_graph_new_node(rc, src_id, -1);
-    }
-    if (dst == NULL) {
-      dst = route_graph_new_node(rc, dst_id, -1);
-    }
-  }
-
-  /* add link as edge to graph */
-  xbt_graph_new_edge(routing->route_graph, src, dst, e_route);
-}
-
-static void add_loopback_dijkstra(routing_component_dijkstra_t rc)
-{
-  routing_component_dijkstra_t routing = (routing_component_dijkstra_t) rc;
-
-  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) {
-      route_extended_t e_route = xbt_new0(s_route_extended_t, 1);
-      e_route->src_gateway = NULL;
-      e_route->dst_gateway = NULL;
-      e_route->generic_route.link_list =
-          xbt_dynar_new(global_routing->size_of_link, NULL);
-      xbt_dynar_push(e_route->generic_route.link_list,
-                     &global_routing->loopback);
-      xbt_graph_new_edge(routing->route_graph, node, node, e_route);
-    }
-  }
-}
-
-/* Business methods */
-static xbt_dynar_t dijkstra_get_onelink_routes(routing_component_t rc)
-{
-  xbt_die("\"dijkstra_get_onelink_routes\" function not implemented yet");
-}
-
-static route_extended_t dijkstra_get_route(routing_component_t rc,
-                                           const char *src,
-                                           const char *dst)
-{
-  xbt_assert(rc && src
-              && dst,
-              "Invalid params for \"get_route\" function at AS \"%s\"",
-              rc->name);
-
-  /* set utils vars */
-  routing_component_dijkstra_t routing = (routing_component_dijkstra_t) rc;
-
-  generic_src_dst_check(rc, src, dst);
-  int *src_id = xbt_dict_get_or_null(routing->generic_routing.to_index, src);
-  int *dst_id = xbt_dict_get_or_null(routing->generic_routing.to_index, dst);
-  xbt_assert(src_id
-              && dst_id,
-              "Ask for route \"from\"(%s)  or \"to\"(%s) no found in the local table",
-              src, dst);
-
-  /* create a result route */
-  route_extended_t new_e_route = xbt_new0(s_route_extended_t, 1);
-  new_e_route->generic_route.link_list =
-      xbt_dynar_new(global_routing->size_of_link, NULL);
-  new_e_route->src_gateway = NULL;
-  new_e_route->dst_gateway = NULL;
-
-  int *pred_arr = NULL;
-  int src_node_id = 0;
-  int dst_node_id = 0;
-  int *nodeid = NULL;
-  int v;
-  route_extended_t e_route;
-  int size = 0;
-  unsigned int cpt;
-  void *link;
-  xbt_dynar_t links = 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(routing, *src_id);
-  graph_node_map_element_t dst_elm =
-      graph_node_map_search(routing, *dst_id);
-  xbt_assert(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 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);
-    xbt_node_t node_e_v = xbt_dynar_get_as(nodes, dst_node_id, xbt_node_t);
-    xbt_edge_t edge =
-        xbt_graph_get_edge(routing->route_graph, node_s_v, node_e_v);
-
-    xbt_assert(edge != NULL, "no route between host %d and %d", *src_id,
-                *dst_id);
-
-    e_route = (route_extended_t) xbt_graph_edge_get_data(edge);
-
-    links = e_route->generic_route.link_list;
-    xbt_dynar_foreach(links, cpt, link) {
-      xbt_dynar_unshift(new_e_route->generic_route.link_list, &link);
-    }
-
-    return new_e_route;
-  }
-
-  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, xbt_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;
-        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;
-          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 */
-      xbt_free(v_id);
-    }
-
-    xbt_free(cost_arr);
-    xbt_heap_free(pqueue);
-  }
-
-  /* compose route path with links */
-  char *gw_src = NULL, *gw_dst =
-      NULL, *prev_gw_src, *prev_gw_dst, *first_gw = NULL;
-
-  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_assert(edge != NULL, "no route between host %d and %d", *src_id,
-                *dst_id);
-
-    prev_gw_src = gw_src;
-    prev_gw_dst = gw_dst;
-
-    e_route = (route_extended_t) xbt_graph_edge_get_data(edge);
-    gw_src = e_route->src_gateway;
-    gw_dst = e_route->dst_gateway;
-
-    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)) {
-      xbt_dynar_t e_route_as_to_as =
-          (*(global_routing->get_route)) (gw_dst, prev_gw_src);
-      xbt_assert(e_route_as_to_as, "no route between \"%s\" and \"%s\"",
-                  gw_dst, prev_gw_src);
-      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++;
-      }
-    }
-
-    links = e_route->generic_route.link_list;
-    xbt_dynar_foreach(links, cpt, link) {
-      xbt_dynar_unshift(new_e_route->generic_route.link_list, &link);
-    }
-    size++;
-  }
-
-  if (rc->hierarchy == SURF_ROUTING_RECURSIVE) {
-    new_e_route->src_gateway = xbt_strdup(gw_src);
-    new_e_route->dst_gateway = xbt_strdup(first_gw);
-  }
-
-  if (routing->cached && elm == NULL) {
-    /* 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);
-  }
-
-  if (!routing->cached)
-    xbt_free(pred_arr);
-
-  return new_e_route;
-}
-
-static void dijkstra_finalize(routing_component_t rc)
-{
-  routing_component_dijkstra_t routing = (routing_component_dijkstra_t) rc;
-
-  if (routing) {
-    xbt_graph_free_graph(routing->route_graph, &xbt_free,
-                         &graph_edge_data_free, &xbt_free);
-    xbt_dict_free(&routing->graph_node_map);
-    if (routing->cached)
-      xbt_dict_free(&routing->route_cache);
-    /* Delete bypass dict */
-    xbt_dict_free(&routing->generic_routing.bypassRoutes);
-    /* Delete index dict */
-    xbt_dict_free(&(routing->generic_routing.to_index));
-    /* Delete structure */
-    xbt_free(routing);
-  }
-}
-
-/* Creation routing model functions */
-
-static void *model_dijkstra_both_create(int cached)
-{
-  routing_component_dijkstra_t new_component =
-      xbt_new0(s_routing_component_dijkstra_t, 1);
-  new_component->generic_routing.set_processing_unit =
-      generic_set_processing_unit;
-  new_component->generic_routing.set_autonomous_system =
-      generic_set_autonomous_system;
-  new_component->generic_routing.set_route = model_dijkstra_both_set_route;
-  new_component->generic_routing.set_ASroute = model_dijkstra_both_set_route;
-  new_component->generic_routing.set_bypassroute = generic_set_bypassroute;
-  new_component->generic_routing.get_route = dijkstra_get_route;
-  new_component->generic_routing.get_latency = generic_get_link_latency;
-  new_component->generic_routing.get_onelink_routes =
-      dijkstra_get_onelink_routes;
-  new_component->generic_routing.get_bypass_route =
-      generic_get_bypassroute;
-  new_component->generic_routing.finalize = dijkstra_finalize;
-  new_component->cached = cached;
-  new_component->generic_routing.to_index = xbt_dict_new();
-  new_component->generic_routing.bypassRoutes = xbt_dict_new();
-  new_component->generic_routing.get_network_element_type = get_network_element_type;
-  return new_component;
-}
-
-static void *model_dijkstra_create(void)
-{
-  return model_dijkstra_both_create(0);
-}
-
-static void *model_dijkstracache_create(void)
-{
-  return model_dijkstra_both_create(1);
-}
-
-static void model_dijkstra_both_load(void)
-{
-  /* use "surfxml_add_callback" to add a parse function call */
-}
-
-static void model_dijkstra_both_unload(void)
-{
-  /* use "surfxml_del_callback" to remove a parse function call */
-}
-
-static void model_dijkstra_both_end(void)
-{
-  routing_component_dijkstra_t routing =
-      (routing_component_dijkstra_t) current_routing;
-
-  xbt_node_t node = NULL;
-  unsigned int cursor2;
-  xbt_dynar_t nodes = NULL;
-
-  /* Create the topology graph */
-  if(!routing->route_graph)
-  routing->route_graph = xbt_graph_new_graph(1, NULL);
-  if(!routing->graph_node_map)
-  routing->graph_node_map = xbt_dict_new();
-
-  if (routing->cached && !routing->route_cache)
-  routing->route_cache = xbt_dict_new();
-
-  /* Add the loopback if needed */
-  if (current_routing->hierarchy == SURF_ROUTING_BASE)
-    add_loopback_dijkstra(routing);
-
-  /* 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;
-  }
-
-}
-static void model_dijkstra_both_set_route (routing_component_t rc, const char *src,
-                     const char *dst, name_route_extended_t route)
-{
-       routing_component_dijkstra_t routing = (routing_component_dijkstra_t) rc;
-       int *src_id, *dst_id;
-       src_id = xbt_dict_get_or_null(rc->to_index, src);
-       dst_id = xbt_dict_get_or_null(rc->to_index, dst);
-
-    /* Create the topology graph */
-       if(!routing->route_graph)
-       routing->route_graph = xbt_graph_new_graph(1, NULL);
-       if(!routing->graph_node_map)
-       routing->graph_node_map = xbt_dict_new();
-
-       if (routing->cached && !routing->route_cache)
-       routing->route_cache = xbt_dict_new();
-
-       if( A_surfxml_route_symmetrical == A_surfxml_route_symmetrical_YES
-               || A_surfxml_ASroute_symmetrical == A_surfxml_ASroute_symmetrical_YES )
-               xbt_die("Route symmetrical not supported on model dijkstra");
-
-       if(!route->dst_gateway && !route->src_gateway)
-         XBT_DEBUG("Load Route from \"%s\" to \"%s\"", src, dst);
-       else{
-         XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src,
-                        route->src_gateway, dst, route->dst_gateway);
-         if(global_routing->get_network_element_type((const char*)route->dst_gateway) == SURF_NETWORK_ELEMENT_NULL)
-                 xbt_die("The dst_gateway '%s' does not exist!",route->dst_gateway);
-         if(global_routing->get_network_element_type((const char*)route->src_gateway) == SURF_NETWORK_ELEMENT_NULL)
-                 xbt_die("The src_gateway '%s' does not exist!",route->src_gateway);
-       }
-
-       route_extended_t e_route =
-               generic_new_extended_route(current_routing->hierarchy, route, 1);
-       route_new_dijkstra(routing, *src_id, *dst_id, e_route);
-}
-
-#ifdef HAVE_PCRE_LIB
-/* ************************************************** */
-/* ************** RULE-BASED ROUTING **************** */
-
-/* Routing model structure */
-
-typedef struct {
-  s_routing_component_t generic_routing;
-  xbt_dict_t dict_processing_units;
-  xbt_dict_t dict_autonomous_systems;
-  xbt_dynar_t list_route;
-  xbt_dynar_t list_ASroute;
-} s_routing_component_rulebased_t, *routing_component_rulebased_t;
-
-typedef struct s_rule_route s_rule_route_t, *rule_route_t;
-typedef struct s_rule_route_extended s_rule_route_extended_t,
-    *rule_route_extended_t;
-
-struct s_rule_route {
-  xbt_dynar_t re_str_link;      // dynar of char*
-  pcre *re_src;
-  pcre *re_dst;
-};
-
-struct s_rule_route_extended {
-  s_rule_route_t generic_rule_route;
-  char *re_src_gateway;
-  char *re_dst_gateway;
-};
-
-static void rule_route_free(void *e)
-{
-  rule_route_t *elem = (rule_route_t *) (e);
-  if (*elem) {
-    xbt_dynar_free(&(*elem)->re_str_link);
-    pcre_free((*elem)->re_src);
-    pcre_free((*elem)->re_dst);
-    xbt_free(*elem);
-  }
-  *elem = NULL;
-}
-
-static void rule_route_extended_free(void *e)
-{
-  rule_route_extended_t *elem = (rule_route_extended_t *) e;
-  if (*elem) {
-    xbt_dynar_free(&(*elem)->generic_rule_route.re_str_link);
-    pcre_free((*elem)->generic_rule_route.re_src);
-    pcre_free((*elem)->generic_rule_route.re_dst);
-    xbt_free((*elem)->re_src_gateway);
-    xbt_free((*elem)->re_dst_gateway);
-    xbt_free(*elem);
-  }
-}
-
-/* Parse routing model functions */
-
-static void model_rulebased_set_processing_unit(routing_component_t rc,
-                                                const char *name)
-{
-  routing_component_rulebased_t routing =
-      (routing_component_rulebased_t) rc;
-  xbt_dict_set(routing->dict_processing_units, name, (void *) (-1), NULL);
-}
-
-static void model_rulebased_set_autonomous_system(routing_component_t rc,
-                                                  const char *name)
-{
-  routing_component_rulebased_t routing =
-      (routing_component_rulebased_t) rc;
-  xbt_dict_set(routing->dict_autonomous_systems, name, (void *) (-1),
-               NULL);
-}
-
-static void model_rulebased_set_route(routing_component_t rc,
-                                      const char *src, const char *dst,
-                                      name_route_extended_t route)
-{
-  routing_component_rulebased_t routing =
-      (routing_component_rulebased_t) rc;
-  rule_route_t ruleroute = xbt_new0(s_rule_route_t, 1);
-  const char *error;
-  int erroffset;
-
-  if(!strcmp(rc->routing->name,"Vivaldi")){
-         if(xbt_dynar_length(route->generic_route.link_list) != 0)
-                 xbt_die("You can't have link_ctn with Model Vivaldi.");
-  }
-
-  ruleroute->re_src = pcre_compile(src, 0, &error, &erroffset, NULL);
-  xbt_assert(ruleroute->re_src,
-              "PCRE compilation failed at offset %d (\"%s\"): %s\n",
-              erroffset, src, error);
-  ruleroute->re_dst = pcre_compile(dst, 0, &error, &erroffset, NULL);
-  xbt_assert(ruleroute->re_src,
-              "PCRE compilation failed at offset %d (\"%s\"): %s\n",
-              erroffset, dst, error);
-  ruleroute->re_str_link = route->generic_route.link_list;
-  xbt_dynar_push(routing->list_route, &ruleroute);
-  xbt_free(route);
-}
-
-static void model_rulebased_set_ASroute(routing_component_t rc,
-                                        const char *src, const char *dst,
-                                        name_route_extended_t route)
-{
-  routing_component_rulebased_t routing =
-      (routing_component_rulebased_t) rc;
-  rule_route_extended_t ruleroute_e = xbt_new0(s_rule_route_extended_t, 1);
-  const char *error;
-  int erroffset;
-
-  if(!strcmp(rc->routing->name,"Vivaldi")){
-         if(xbt_dynar_length(route->generic_route.link_list) != 0)
-                 xbt_die("You can't have link_ctn with Model Vivaldi.");
-  }
-
-  ruleroute_e->generic_rule_route.re_src =
-      pcre_compile(src, 0, &error, &erroffset, NULL);
-  xbt_assert(ruleroute_e->generic_rule_route.re_src,
-              "PCRE compilation failed at offset %d (\"%s\"): %s\n",
-              erroffset, src, error);
-  ruleroute_e->generic_rule_route.re_dst =
-      pcre_compile(dst, 0, &error, &erroffset, NULL);
-  xbt_assert(ruleroute_e->generic_rule_route.re_src,
-              "PCRE compilation failed at offset %d (\"%s\"): %s\n",
-              erroffset, dst, error);
-  ruleroute_e->generic_rule_route.re_str_link =
-      route->generic_route.link_list;
-  ruleroute_e->re_src_gateway = route->src_gateway;
-  ruleroute_e->re_dst_gateway = route->dst_gateway;
-  xbt_dynar_push(routing->list_ASroute, &ruleroute_e);
-//  xbt_free(route->src_gateway);
-//  xbt_free(route->dst_gateway);
-  xbt_free(route);
-}
-
-static void model_rulebased_set_bypassroute(routing_component_t rc,
-                                            const char *src,
-                                            const char *dst,
-                                            route_extended_t e_route)
-{
-  xbt_die("bypass routing not supported for Route-Based model");
-}
-
-#define BUFFER_SIZE 4096        /* result buffer size */
-#define OVECCOUNT 30            /* should be a multiple of 3 */
-
-static char *remplace(char *value, const char **src_list, int src_size,
-                      const char **dst_list, int dst_size)
-{
-
-  char result_result[BUFFER_SIZE];
-  int i_result_buffer;
-  int value_length = (int) strlen(value);
-  int number = 0;
-
-  int i = 0;
-  i_result_buffer = 0;
-  do {
-    if (value[i] == '$') {
-      i++;                      // skip $
-
-      // find the number      
-      int number_length = 0;
-      while ('0' <= value[i + number_length]
-             && value[i + number_length] <= '9') {
-        number_length++;
-      }
-      xbt_assert(number_length != 0,
-                  "bad string parameter, no number indication, at offset: %d (\"%s\")",
-                  i, value);
-
-      // solve number
-      number = atoi(value + i);
-      i = i + number_length;
-      xbt_assert(i + 2 < value_length,
-                  "bad string parameter, too few chars, at offset: %d (\"%s\")",
-                  i, value);
-
-      // solve the indication
-      const char **param_list;
-      int param_size;
-      if (value[i] == 's' && value[i + 1] == 'r' && value[i + 2] == 'c') {
-        param_list = src_list;
-        param_size = src_size;
-      } else if (value[i] == 'd' && value[i + 1] == 's'
-                 && value[i + 2] == 't') {
-        param_list = dst_list;
-        param_size = dst_size;
-      } else {
-        xbt_die("bad string parameter, support only \"src\" and \"dst\", "
-                "at offset: %d (\"%s\")", i, value);
-      }
-      i = i + 3;
-
-      xbt_assert(param_size >= number,
-                  "bad string parameter, not enough length param_size, at offset: %d (\"%s\") %d %d",
-                  i, value, param_size, number);
-
-      const char *param = param_list[number];
-      int size = strlen(param);
-      int cp;
-      for (cp = 0; cp < size; cp++) {
-        result_result[i_result_buffer] = param[cp];
-        i_result_buffer++;
-        if (i_result_buffer >= BUFFER_SIZE)
-          break;
-      }
-    } else {
-      result_result[i_result_buffer] = value[i];
-      i_result_buffer++;
-      i++;                      // next char
-    }
-
-  } while (i < value_length && i_result_buffer < BUFFER_SIZE);
-
-  xbt_assert(i_result_buffer < BUFFER_SIZE,
-              "solving string \"%s\", small buffer size (%d)", value,
-              BUFFER_SIZE);
-  result_result[i_result_buffer] = 0;
-  return xbt_strdup(result_result);
-}
-
-static route_extended_t rulebased_get_route(routing_component_t rc,
-                                            const char *src,
-                                            const char *dst);
-static xbt_dynar_t rulebased_get_onelink_routes(routing_component_t rc)
-{
-  xbt_dynar_t ret = xbt_dynar_new (sizeof(onelink_t), xbt_free);
-  routing_component_rulebased_t routing = (routing_component_rulebased_t)rc;
-
-  xbt_dict_cursor_t c1 = NULL;
-  char *k1, *d1;
-
-  //find router
-  char *router = NULL;
-  xbt_dict_foreach(routing->dict_processing_units, c1, k1, d1) {
-    if (strstr (k1, "router")){
-      router = k1;
-    }
-  }
-  if (!router){
-    xbt_die ("rulebased_get_onelink_routes works only if the AS is a cluster, sorry.");
-  }
-
-  xbt_dict_foreach(routing->dict_processing_units, c1, k1, d1) {
-    route_extended_t route = rulebased_get_route (rc, router, k1);
-
-    int number_of_links = xbt_dynar_length(route->generic_route.link_list);
-    if (number_of_links != 3) {
-      xbt_die ("rulebased_get_onelink_routes works only if the AS is a cluster, sorry.");
-    }
-
-    void *link_ptr;
-    xbt_dynar_get_cpy (route->generic_route.link_list, 2, &link_ptr);
-    onelink_t onelink = xbt_new0 (s_onelink_t, 1);
-    onelink->src = xbt_strdup (k1);
-    onelink->dst = xbt_strdup (router);
-    onelink->link_ptr = link_ptr;
-    xbt_dynar_push (ret, &onelink);
-  }
-  return ret;
-}
-
-/* Business methods */
-static route_extended_t rulebased_get_route(routing_component_t rc,
-                                            const char *src,
-                                            const char *dst)
-{
-  xbt_assert(rc && src
-              && dst,
-              "Invalid params for \"get_route\" function at AS \"%s\"",
-              rc->name);
-
-  /* set utils vars */
-  routing_component_rulebased_t routing =
-      (routing_component_rulebased_t) rc;
-
-  int are_processing_units=0;
-  xbt_dynar_t rule_list;
-  if (xbt_dict_get_or_null(routing->dict_processing_units, src)
-      && xbt_dict_get_or_null(routing->dict_processing_units, dst)) {
-    are_processing_units = 1;
-    rule_list = routing->list_route;
-  } else if (xbt_dict_get_or_null(routing->dict_autonomous_systems, src)
-             && xbt_dict_get_or_null(routing->dict_autonomous_systems,
-                                     dst)) {
-    are_processing_units = 0;
-    rule_list = routing->list_ASroute;
-  } else
-    xbt_die("Ask for route \"from\"(%s)  or \"to\"(%s) no found in "
-            "the local table", src, dst);
-
-  int rc_src = -1;
-  int rc_dst = -1;
-  int src_length = (int) strlen(src);
-  int dst_length = (int) strlen(dst);
-
-  xbt_dynar_t links_list =
-      xbt_dynar_new(global_routing->size_of_link, NULL);
-
-  rule_route_t ruleroute;
-  unsigned int cpt;
-  int ovector_src[OVECCOUNT];
-  int ovector_dst[OVECCOUNT];
-  const char **list_src = NULL;
-  const char **list_dst = NULL;
-  int res;
-  xbt_dynar_foreach(rule_list, cpt, ruleroute) {
-    rc_src =
-        pcre_exec(ruleroute->re_src, NULL, src, src_length, 0, 0,
-                  ovector_src, OVECCOUNT);
-    if (rc_src >= 0) {
-      rc_dst =
-          pcre_exec(ruleroute->re_dst, NULL, dst, dst_length, 0, 0,
-                    ovector_dst, OVECCOUNT);
-      if (rc_dst >= 0) {
-        res = pcre_get_substring_list(src, ovector_src, rc_src, &list_src);
-        xbt_assert(!res, "error solving substring list for src \"%s\"", src);
-        res = pcre_get_substring_list(dst, ovector_dst, rc_dst, &list_dst);
-        xbt_assert(!res, "error solving substring list for src \"%s\"", dst);
-        char *link_name;
-        xbt_dynar_foreach(ruleroute->re_str_link, cpt, link_name) {
-          char *new_link_name =
-              remplace(link_name, list_src, rc_src, list_dst, rc_dst);
-          void *link =
-                         xbt_lib_get_or_null(link_lib, new_link_name, SURF_LINK_LEVEL);
-          if (link)
-            xbt_dynar_push(links_list, &link);
-          else
-            THROWF(mismatch_error, 0, "Link %s not found", new_link_name);
-          xbt_free(new_link_name);
-        }
-      }
-    }
-    if (rc_src >= 0 && rc_dst >= 0)
-      break;
-  }
-
-  route_extended_t new_e_route = NULL;
-  if (rc_src >= 0 && rc_dst >= 0) {
-    new_e_route = xbt_new0(s_route_extended_t, 1);
-    new_e_route->generic_route.link_list = links_list;
-  } else if (!strcmp(src, dst) && are_processing_units) {
-    new_e_route = xbt_new0(s_route_extended_t, 1);
-    xbt_dynar_push(links_list, &(global_routing->loopback));
-    new_e_route->generic_route.link_list = links_list;
-  } else {
-    xbt_dynar_free(&link_list);
-  }
-
-  if (!are_processing_units && new_e_route) {
-    rule_route_extended_t ruleroute_extended =
-        (rule_route_extended_t) ruleroute;
-    new_e_route->src_gateway =
-        remplace(ruleroute_extended->re_src_gateway, list_src, rc_src,
-                 list_dst, rc_dst);
-    new_e_route->dst_gateway =
-        remplace(ruleroute_extended->re_dst_gateway, list_src, rc_src,
-                 list_dst, rc_dst);
-  }
-
-  if (list_src)
-    pcre_free_substring_list(list_src);
-  if (list_dst)
-    pcre_free_substring_list(list_dst);
-
-  return new_e_route;
-}
-
-static route_extended_t rulebased_get_bypass_route(routing_component_t rc,
-                                                   const char *src,
-                                                   const char *dst)
-{
-  return NULL;
-}
-
-static void rulebased_finalize(routing_component_t rc)
-{
-  routing_component_rulebased_t routing =
-      (routing_component_rulebased_t) rc;
-  if (routing) {
-    xbt_dict_free(&routing->dict_processing_units);
-    xbt_dict_free(&routing->dict_autonomous_systems);
-    xbt_dynar_free(&routing->list_route);
-    xbt_dynar_free(&routing->list_ASroute);
-    /* Delete structure */
-    xbt_free(routing);
-  }
-}
-
-/* Creation routing model functions */
-static void *model_rulebased_create(void)
-{
-  routing_component_rulebased_t new_component =
-      xbt_new0(s_routing_component_rulebased_t, 1);
-  new_component->generic_routing.set_processing_unit =
-      model_rulebased_set_processing_unit;
-  new_component->generic_routing.set_autonomous_system =
-      model_rulebased_set_autonomous_system;
-  new_component->generic_routing.set_route = model_rulebased_set_route;
-  new_component->generic_routing.set_ASroute = model_rulebased_set_ASroute;
-  new_component->generic_routing.set_bypassroute = model_rulebased_set_bypassroute;
-  new_component->generic_routing.get_onelink_routes = rulebased_get_onelink_routes;
-  new_component->generic_routing.get_route = rulebased_get_route;
-  new_component->generic_routing.get_latency = generic_get_link_latency;
-  new_component->generic_routing.get_bypass_route = rulebased_get_bypass_route;
-  new_component->generic_routing.finalize = rulebased_finalize;
-  new_component->generic_routing.get_network_element_type = get_network_element_type;
-  /* initialization of internal structures */
-  new_component->dict_processing_units = xbt_dict_new();
-  new_component->dict_autonomous_systems = xbt_dict_new();
-  new_component->list_route = xbt_dynar_new(sizeof(rule_route_t), &rule_route_free);
-  new_component->list_ASroute =
-      xbt_dynar_new(sizeof(rule_route_extended_t),
-                    &rule_route_extended_free);
-  return new_component;
-}
-
-static void model_rulebased_load(void)
-{
-  /* use "surfxml_add_callback" to add a parse function call */
-}
-
-static void model_rulebased_unload(void)
-{
-  /* use "surfxml_del_callback" to remove a parse function call */
-}
-
-static void model_rulebased_end(void)
-{
-}
-
-#endif                          /* HAVE_PCRE_LIB */
-
-/* ************************************************************************** */
-/* ******************************* NO ROUTING ******************************* */
-
-/* Routing model structure */
-typedef struct {
-  s_routing_component_t generic_routing;
-} s_routing_component_none_t, *routing_component_none_t;
-
-/* Business methods */
-static xbt_dynar_t none_get_onelink_routes(routing_component_t rc)
-{
-  return NULL;
-}
-
-static route_extended_t none_get_route(routing_component_t rc,
-                                       const char *src, const char *dst)
-{
-  return NULL;
-}
-
-static route_extended_t none_get_bypass_route(routing_component_t rc,
-                                              const char *src,
-                                              const char *dst)
-{
-  return NULL;
-}
-
-static void none_finalize(routing_component_t rc)
-{
-  xbt_free(rc);
-}
-
-static void none_set_processing_unit(routing_component_t rc,
-                                     const char *name)
-{
-}
-
-static void none_set_autonomous_system(routing_component_t rc,
-                                       const char *name)
-{
-}
-
-/* Creation routing model functions */
-static void *model_none_create(void)
-{
-  routing_component_none_t new_component =
-      xbt_new0(s_routing_component_none_t, 1);
-  new_component->generic_routing.set_processing_unit =
-      none_set_processing_unit;
-  new_component->generic_routing.set_autonomous_system =
-      none_set_autonomous_system;
-  new_component->generic_routing.set_route = NULL;
-  new_component->generic_routing.set_ASroute = NULL;
-  new_component->generic_routing.set_bypassroute = NULL;
-  new_component->generic_routing.get_route = none_get_route;
-  new_component->generic_routing.get_onelink_routes =
-      none_get_onelink_routes;
-  new_component->generic_routing.get_bypass_route = none_get_bypass_route;
-  new_component->generic_routing.finalize = none_finalize;
-  return new_component;
-}
-
-static void model_none_load(void)
-{
-}
-
-static void model_none_unload(void)
-{
-}
-
-static void model_none_end(void)
-{
-}
-
-/* ************************************************** */
-/* ********** PATERN FOR NEW ROUTING **************** */
-
-/* The minimal configuration of a new routing model need the next functions,
- * also you need to set at the start of the file, the new model in the model
- * list. Remember keep the null ending of the list.
- */
-/*** Routing model structure ***/
-// typedef struct {
-//   s_routing_component_t generic_routing;
-//   /* things that your routing model need */
-// } s_routing_component_NEW_t,*routing_component_NEW_t;
-
-/*** Parse routing model functions ***/
-// static void model_NEW_set_processing_unit(routing_component_t rc, const char* name) {}
-// static void model_NEW_set_autonomous_system(routing_component_t rc, const char* name) {}
-// static void model_NEW_set_route(routing_component_t rc, const char* src, const char* dst, route_t route) {}
-// static void model_NEW_set_ASroute(routing_component_t rc, const char* src, const char* dst, route_extended_t route) {}
-// static void model_NEW_set_bypassroute(routing_component_t rc, const char* src, const char* dst, route_extended_t e_route) {}
-
-/*** Business methods ***/
-// static route_extended_t NEW_get_route(routing_component_t rc, const char* src,const char* dst) {return NULL;}
-// 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) { xbt_free(rc);}
-
-/*** Creation routing model functions ***/
-// static void* model_NEW_create(void) {
-//   routing_component_NEW_t new_component =  xbt_new0(s_routing_component_NEW_t,1);
-//   new_component->generic_routing.set_processing_unit = model_NEW_set_processing_unit;
-//   new_component->generic_routing.set_autonomous_system = model_NEW_set_autonomous_system;
-//   new_component->generic_routing.set_route = model_NEW_set_route;
-//   new_component->generic_routing.set_ASroute = model_NEW_set_ASroute;
-//   new_component->generic_routing.set_bypassroute = model_NEW_set_bypassroute;
-//   new_component->generic_routing.get_route = NEW_get_route;
-//   new_component->generic_routing.get_bypass_route = NEW_get_bypass_route;
-//   new_component->generic_routing.finalize = NEW_finalize;
-//   /* initialization of internal structures */
-//   return new_component;
-// } /* mandatory */
-// static void  model_NEW_load(void) {}   /* mandatory */
-// static void  model_NEW_unload(void) {} /* mandatory */
-// static void  model_NEW_end(void) {}    /* mandatory */
-
-/* ************************************************************************** */
-/* ************************* GENERIC PARSE FUNCTIONS ************************ */
-
-static void generic_set_processing_unit(routing_component_t rc,
-                                        const char *name)
-{
-  XBT_DEBUG("Load process unit \"%s\"", name);
-  int *id = xbt_new0(int, 1);
-  xbt_dict_t _to_index;
-  _to_index = current_routing->to_index;
-  *id = xbt_dict_length(_to_index);
-  xbt_dict_set(_to_index, name, id, xbt_free);
-}
-
-static void generic_set_autonomous_system(routing_component_t rc,
-                                          const char *name)
-{
-  XBT_DEBUG("Load Autonomous system \"%s\"", name);
-  int *id = xbt_new0(int, 1);
-  xbt_dict_t _to_index;
-  _to_index = current_routing->to_index;
-  *id = xbt_dict_length(_to_index);
-  xbt_dict_set(_to_index, name, id, xbt_free);
-}
-
-static int surf_pointer_resource_cmp(const void *a, const void *b)
-{
-  return a != b;
-}
-
-static int surf_link_resource_cmp(const void *a, const void *b)
-{
-  return !!memcmp(a,b,global_routing->size_of_link);
-}
-
-static void generic_set_bypassroute(routing_component_t rc,
-                                    const char *src, const char *dst,
-                                    route_extended_t e_route)
-{
-  XBT_DEBUG("Load bypassRoute from \"%s\" to \"%s\"", src, dst);
-  xbt_dict_t dict_bypassRoutes = rc->bypassRoutes;
-  char *route_name;
-
-  route_name = bprintf("%s#%s", src, dst);
-  xbt_assert(xbt_dynar_length(e_route->generic_route.link_list) > 0,
-              "Invalid count of links, must be greater than zero (%s,%s)",
-              src, dst);
-  xbt_assert(!xbt_dict_get_or_null(dict_bypassRoutes, route_name),
-              "The bypass route between \"%s\"(\"%s\") and \"%s\"(\"%s\") already exists",
-              src, e_route->src_gateway, dst, e_route->dst_gateway);
-
-  route_extended_t new_e_route =
-      generic_new_extended_route(SURF_ROUTING_RECURSIVE, e_route, 0);
-  xbt_dynar_free(&(e_route->generic_route.link_list));
-  xbt_free(e_route);
-
-  xbt_dict_set(dict_bypassRoutes, route_name, new_e_route,
-               (void (*)(void *)) generic_free_extended_route);
-  xbt_free(route_name);
-}
-
-/* ************************************************************************** */
-/* *********************** GENERIC BUSINESS METHODS ************************* */
-
-static double generic_get_link_latency(routing_component_t rc,
-                                       const char *src, const char *dst)
-{
-       route_extended_t route = rc->get_route(rc,src,dst);
-       void * link;
-       unsigned int i;
-       double latency = 0.0;
-
-       xbt_dynar_foreach(route->generic_route.link_list,i,link) {
-               latency += get_link_latency(link);
-       }
-       generic_free_extended_route(route);
-  return latency;
-}
-
-static xbt_dynar_t generic_get_onelink_routes(routing_component_t rc)
-{
-  xbt_die("\"generic_get_onelink_routes\" not implemented yet");
-}
-
-static route_extended_t generic_get_bypassroute(routing_component_t rc,
-                                                const char *src,
-                                                const char *dst)
-{
-  xbt_dict_t dict_bypassRoutes = rc->bypassRoutes;
-  routing_component_t src_as, dst_as;
-  int index_src, index_dst;
-  xbt_dynar_t path_src = NULL;
-  xbt_dynar_t path_dst = NULL;
-  routing_component_t current = NULL;
-  routing_component_t *current_src = NULL;
-  routing_component_t *current_dst = NULL;
-
-  /* (1) find the as where the src and dst are located */
-  void * src_data = xbt_lib_get_or_null(host_lib,src, ROUTING_HOST_LEVEL);
-  void * dst_data = xbt_lib_get_or_null(host_lib,dst, ROUTING_HOST_LEVEL);
-  if(!src_data) src_data = xbt_lib_get_or_null(as_router_lib,src, ROUTING_ASR_LEVEL);
-  if(!dst_data) dst_data = xbt_lib_get_or_null(as_router_lib,dst, ROUTING_ASR_LEVEL);
-
-  if(src_data == NULL || dst_data == NULL)
-         xbt_die("Ask for route \"from\"(%s) or \"to\"(%s) no found at AS \"%s\"",
-                    src, dst, rc->name);
-
-  src_as = ((network_element_info_t)src_data)->rc_component;
-  dst_as = ((network_element_info_t)dst_data)->rc_component;
-
-  /* (2) find the path to the root routing component */
-  path_src = xbt_dynar_new(sizeof(routing_component_t), NULL);
-  current = src_as;
-  while (current != NULL) {
-    xbt_dynar_push(path_src, &current);
-    current = current->routing_father;
-  }
-  path_dst = xbt_dynar_new(sizeof(routing_component_t), NULL);
-  current = dst_as;
-  while (current != NULL) {
-    xbt_dynar_push(path_dst, &current);
-    current = current->routing_father;
+  /* (2) find the path to the root routing component */
+  path_src = xbt_dynar_new(sizeof(routing_component_t), NULL);
+  current = src_as;
+  while (current != NULL) {
+    xbt_dynar_push(path_src, &current);
+    current = current->routing_father;
+  }
+  path_dst = xbt_dynar_new(sizeof(routing_component_t), NULL);
+  current = dst_as;
+  while (current != NULL) {
+    xbt_dynar_push(path_dst, &current);
+    current = current->routing_father;
   }
 
   /* (3) find the common father */
@@ -3108,7 +1332,7 @@ static route_extended_t generic_get_bypassroute(routing_component_t rc,
 /* ************************************************************************** */
 /* ************************* GENERIC AUX FUNCTIONS ************************** */
 
-static route_t
+route_t
 generic_new_route(e_surf_routing_hierarchy_t hierarchy,
                            void *data, int order)
 {
@@ -3146,7 +1370,7 @@ generic_new_route(e_surf_routing_hierarchy_t hierarchy,
   return new_route;
 }
 
-static route_extended_t
+route_extended_t
 generic_new_extended_route(e_surf_routing_hierarchy_t hierarchy,
                            void *data, int order)
 {
@@ -3202,7 +1426,7 @@ generic_new_extended_route(e_surf_routing_hierarchy_t hierarchy,
   return new_e_route;
 }
 
-static void generic_free_route(route_t route)
+void generic_free_route(route_t route)
 {
   if (route) {
     xbt_dynar_free(&(route->link_list));
@@ -3210,7 +1434,7 @@ static void generic_free_route(route_t route)
   }
 }
 
-static void generic_free_extended_route(route_extended_t e_route)
+void generic_free_extended_route(route_extended_t e_route)
 {
   if (e_route) {
     xbt_dynar_free(&(e_route->generic_route.link_list));
@@ -3241,7 +1465,7 @@ static routing_component_t generic_as_exist(routing_component_t find_from,
   return NULL;
 }
 
-static routing_component_t
+routing_component_t
 generic_autonomous_system_exist(routing_component_t rc, char *element)
 {
   //return rc; // FIXME: BYPASSERROR OF FOREACH WITH BREAK
@@ -3267,7 +1491,7 @@ generic_autonomous_system_exist(routing_component_t rc, char *element)
   return NULL;
 }
 
-static routing_component_t
+routing_component_t
 generic_processing_units_exist(routing_component_t rc, char *element)
 {
   routing_component_t element_as;
@@ -3279,7 +1503,7 @@ generic_processing_units_exist(routing_component_t rc, char *element)
   return generic_as_exist(rc, element_as);
 }
 
-static void generic_src_dst_check(routing_component_t rc, const char *src,
+void generic_src_dst_check(routing_component_t rc, const char *src,
                                   const char *dst)
 {
 
@@ -3325,7 +1549,7 @@ static void routing_parse_Econfig(void)
   XBT_DEBUG("End configuration name = %s",A_surfxml_config_id);
 }
 
-static void routing_parse_Scluster(void)
+void routing_parse_Scluster(void)
 {
   static int AX_ptr = 0;
 
@@ -3345,7 +1569,7 @@ static void routing_parse_Scluster(void)
   char *cluster_availability_file = A_surfxml_cluster_availability_file;
   char *cluster_state_file = A_surfxml_cluster_state_file;
   char *host_id, *groups, *link_id = NULL;
-  char *router_id, *link_router, *link_backbone;
+  char *router_id, *link_backbone;
   char *availability_file = xbt_strdup(cluster_availability_file);
   char *state_file = xbt_strdup(cluster_state_file);
 
@@ -3527,7 +1751,7 @@ static void routing_parse_Scluster(void)
   router_id =
       bprintf("%s%s_router%s", cluster_prefix, cluster_id,
               cluster_suffix);
-  link_router = bprintf("%s_link_%s_router", cluster_id, cluster_id);
+  //link_router = bprintf("%s_link_%s_router", cluster_id, cluster_id);
   link_backbone = bprintf("%s_backbone", cluster_id);
 
   XBT_DEBUG("<router id=\"%s\"/>", router_id);
@@ -3537,29 +1761,29 @@ static void routing_parse_Scluster(void)
   SURFXML_END_TAG(router);
 
   //TODO
-  xbt_dict_set(patterns, "radical", xbt_strdup("_router"), xbt_free);
-  temp_cluster_bw = xbt_strdup(cluster_bw);
-  temp_cluster_bw = replace_random_parameter(temp_cluster_bw);
-  temp_cluster_lat = xbt_strdup(cluster_lat);
-  temp_cluster_lat = replace_random_parameter(temp_cluster_lat);
-  XBT_DEBUG("<link\tid=\"%s\" bw=\"%s\" lat=\"%s\"/>", link_router,temp_cluster_bw, temp_cluster_lat);
-  A_surfxml_link_state = A_surfxml_link_state_ON;
-  A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
-  if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
-  {A_surfxml_link_sharing_policy =  A_surfxml_link_sharing_policy_FULLDUPLEX;}
-  if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FATPIPE)
-  {A_surfxml_link_sharing_policy =  A_surfxml_link_sharing_policy_FATPIPE;}
-  SURFXML_BUFFER_SET(link_id, link_router);
-  SURFXML_BUFFER_SET(link_bandwidth, temp_cluster_bw);
-  SURFXML_BUFFER_SET(link_latency, temp_cluster_lat);
-  SURFXML_BUFFER_SET(link_bandwidth_file, "");
-  SURFXML_BUFFER_SET(link_latency_file, "");
-  SURFXML_BUFFER_SET(link_state_file, "");
-  SURFXML_START_TAG(link);
-  SURFXML_END_TAG(link);
-
-  xbt_free(temp_cluster_bw);
-  xbt_free(temp_cluster_lat);
+//  xbt_dict_set(patterns, "radical", xbt_strdup("_router"), xbt_free);
+//  temp_cluster_bw = xbt_strdup(cluster_bw);
+//  temp_cluster_bw = replace_random_parameter(temp_cluster_bw);
+//  temp_cluster_lat = xbt_strdup(cluster_lat);
+//  temp_cluster_lat = replace_random_parameter(temp_cluster_lat);
+//  XBT_DEBUG("<link\tid=\"%s\" bw=\"%s\" lat=\"%s\"/>", link_router,temp_cluster_bw, temp_cluster_lat);
+//  A_surfxml_link_state = A_surfxml_link_state_ON;
+//  A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
+//  if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
+//  {A_surfxml_link_sharing_policy =  A_surfxml_link_sharing_policy_FULLDUPLEX;}
+//  if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FATPIPE)
+//  {A_surfxml_link_sharing_policy =  A_surfxml_link_sharing_policy_FATPIPE;}
+//  SURFXML_BUFFER_SET(link_id, link_router);
+//  SURFXML_BUFFER_SET(link_bandwidth, temp_cluster_bw);
+//  SURFXML_BUFFER_SET(link_latency, temp_cluster_lat);
+//  SURFXML_BUFFER_SET(link_bandwidth_file, "");
+//  SURFXML_BUFFER_SET(link_latency_file, "");
+//  SURFXML_BUFFER_SET(link_state_file, "");
+//  SURFXML_START_TAG(link);
+//  SURFXML_END_TAG(link);
+
+//  xbt_free(temp_cluster_bw);
+//  xbt_free(temp_cluster_lat);
 
   XBT_DEBUG("<link\tid=\"%s\" bw=\"%s\" lat=\"%s\"/>", link_backbone,cluster_bb_bw, cluster_bb_lat);
   A_surfxml_link_state = A_surfxml_link_state_ON;
@@ -3596,6 +1820,74 @@ static void routing_parse_Scluster(void)
   char *pcre_link_backbone = bprintf("%s_backbone", cluster_id);
   char *pcre_link_dst = bprintf("%s_link_$1dst", cluster_id);
 
+  //from router to router
+  XBT_DEBUG("<route\tsrc=\"%s\"\tdst=\"%s\"", router_id, router_id);
+  XBT_DEBUG("symmetrical=\"NO\">");
+  SURFXML_BUFFER_SET(route_src, router_id);
+  SURFXML_BUFFER_SET(route_dst, router_id);
+  A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_NO;
+  SURFXML_START_TAG(route);
+
+  XBT_DEBUG("<link_ctn\tid=\"%s\"/>", pcre_link_backbone);
+  SURFXML_BUFFER_SET(link_ctn_id, pcre_link_backbone);
+  A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
+  SURFXML_START_TAG(link_ctn);
+  SURFXML_END_TAG(link_ctn);
+
+  XBT_DEBUG("</route>");
+  SURFXML_END_TAG(route);
+
+  //from host to router
+  XBT_DEBUG("<route\tsrc=\"%s\"\tdst=\"%s\"", route_src_dst, router_id);
+  XBT_DEBUG("symmetrical=\"NO\">");
+  SURFXML_BUFFER_SET(route_src, route_src_dst);
+  SURFXML_BUFFER_SET(route_dst, router_id);
+  A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_NO;
+  SURFXML_START_TAG(route);
+
+  XBT_DEBUG("<link_ctn\tid=\"%s\"/>", pcre_link_src);
+  SURFXML_BUFFER_SET(link_ctn_id, pcre_link_src);
+  A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
+  if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
+  {A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_UP;}
+  SURFXML_START_TAG(link_ctn);
+  SURFXML_END_TAG(link_ctn);
+
+  XBT_DEBUG("<link_ctn\tid=\"%s\"/>", pcre_link_backbone);
+  SURFXML_BUFFER_SET(link_ctn_id, pcre_link_backbone);
+  A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
+  SURFXML_START_TAG(link_ctn);
+  SURFXML_END_TAG(link_ctn);
+
+  XBT_DEBUG("</route>");
+  SURFXML_END_TAG(route);
+
+  //from router to host
+  XBT_DEBUG("<route\tsrc=\"%s\"\tdst=\"%s\"", router_id, route_src_dst);
+  XBT_DEBUG("symmetrical=\"NO\">");
+  SURFXML_BUFFER_SET(route_src, router_id);
+  SURFXML_BUFFER_SET(route_dst, route_src_dst);
+  A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_NO;
+  SURFXML_START_TAG(route);
+
+  XBT_DEBUG("<link_ctn\tid=\"%s\"/>", pcre_link_backbone);
+  SURFXML_BUFFER_SET(link_ctn_id, pcre_link_backbone);
+  A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
+  SURFXML_START_TAG(link_ctn);
+  SURFXML_END_TAG(link_ctn);
+
+  XBT_DEBUG("<link_ctn\tid=\"%s\"/>", pcre_link_dst);
+  SURFXML_BUFFER_SET(link_ctn_id, pcre_link_dst);
+  A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
+  if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
+  {A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_UP;}
+  SURFXML_START_TAG(link_ctn);
+  SURFXML_END_TAG(link_ctn);
+
+  XBT_DEBUG("</route>");
+  SURFXML_END_TAG(route);
+
+  //from host to host
   XBT_DEBUG("<route\tsrc=\"%s\"\tdst=\"%s\"", route_src_dst, route_src_dst);
   XBT_DEBUG("symmetrical=\"NO\">");
   SURFXML_BUFFER_SET(route_src, route_src_dst);
@@ -3660,43 +1952,39 @@ static void routing_parse_Scluster(void)
       A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_NO;
       SURFXML_START_TAG(route);
 
-      if (i == xbt_dynar_length(tab_elements_num)) {
-        route_src = link_router;
-      } else {
-        route_src =
-            bprintf("%s_link_%d", cluster_id,
-                    xbt_dynar_get_as(tab_elements_num, i, int));
-      }
-
-      if (j == xbt_dynar_length(tab_elements_num)) {
-        route_dst = link_router;
-      } else {
-        route_dst =
-            bprintf("%s_link_%d", cluster_id,
-                    xbt_dynar_get_as(tab_elements_num, j, int));
+      if (i != xbt_dynar_length(tab_elements_num)){
+          route_src =
+                bprintf("%s_link_%d", cluster_id,
+                        xbt_dynar_get_as(tab_elements_num, i, int));
+                 XBT_DEBUG("<link_ctn\tid=\"%s\"/>", route_src);
+                 SURFXML_BUFFER_SET(link_ctn_id, route_src);
+                 A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
+                 if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
+                 {A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_UP;}
+                 SURFXML_START_TAG(link_ctn);
+                 SURFXML_END_TAG(link_ctn);
+                 free(route_src);
       }
 
-      XBT_DEBUG("<link_ctn\tid=\"%s\"/>", route_src);
-      SURFXML_BUFFER_SET(link_ctn_id, route_src);
-      A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
-      if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
-      {A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_UP;}
-      SURFXML_START_TAG(link_ctn);
-      SURFXML_END_TAG(link_ctn);
-
       XBT_DEBUG("<link_ctn\tid=\"%s_backbone\"/>", cluster_id);
       SURFXML_BUFFER_SET(link_ctn_id, bprintf("%s_backbone", cluster_id));
       A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
       SURFXML_START_TAG(link_ctn);
       SURFXML_END_TAG(link_ctn);
 
-      XBT_DEBUG("<link_ctn\tid=\"%s\"/>", route_dst);
-      SURFXML_BUFFER_SET(link_ctn_id, route_dst);
-      A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
-      if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
-      {A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_DOWN;}
-      SURFXML_START_TAG(link_ctn);
-      SURFXML_END_TAG(link_ctn);
+      if (j != xbt_dynar_length(tab_elements_num)) {
+          route_dst =
+                bprintf("%s_link_%d", cluster_id,
+                        xbt_dynar_get_as(tab_elements_num, j, int));
+                 XBT_DEBUG("<link_ctn\tid=\"%s\"/>", route_dst);
+                 SURFXML_BUFFER_SET(link_ctn_id, route_dst);
+                 A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
+                 if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
+                 {A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_DOWN;}
+                 SURFXML_START_TAG(link_ctn);
+                 SURFXML_END_TAG(link_ctn);
+                 free(route_dst);
+      }
 
       XBT_DEBUG("</route>");
       SURFXML_END_TAG(route);
@@ -3708,7 +1996,7 @@ static void routing_parse_Scluster(void)
 
   free(router_id);
   free(link_backbone);
-  free(link_router);
+  //free(link_router);
   xbt_dict_free(&patterns);
   free(availability_file);
   free(state_file);