Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Do the free into the right file.
[simgrid.git] / src / surf / surf_routing.c
index 51ac317..78866cf 100644 (file)
-/* Copyright (c) 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2009, 2010. The SimGrid Team. 
  * All rights reserved.                                                     */
 
 /* 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 <pcre.h> /* regular expresion library */
-#include "surf_private.h"
-#include "xbt/dynar.h"
-#include "xbt/str.h"
-#include "xbt/config.h"
-#include "xbt/graph.h"
-#include "xbt/set.h"
-
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route,surf,"Routing part of surf");
+#include <pcre.h>               /* regular expression library */
+#include "surf_routing_private.h"
+#include "surf/surf_routing.h"
+#include "surf/surfxml_parse_values.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;
 
-/* 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_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_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_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_full_parse_Scluster(void);/*cluster bypass*/
-
-/* this lines are olny for replace use like index in the model table */
-#define SURF_MODEL_FULL           0
-#define SURF_MODEL_FLOYD          1
-#define SURF_MODEL_DIJKSTRA       2
-#define SURF_MODEL_DIJKSTRACACHE  3
-#define SURF_MODEL_RULEBASED      4
-#define SURF_MODEL_NONE           5
-
-/* must be finish with null and carefull if change de order */
-struct s_model_type routing_models[] =
-{ {"Full", "Full routing data (fast, large memory requirements, fully expressive)",
-  model_full_create, model_full_load, model_full_unload, model_full_end },  
-  {"Floyd", "Floyd routing data (slow initialization, fast lookup, lesser memory requirements, shortest path routing only)",
-  model_floyd_create, model_floyd_load, model_floyd_unload, model_floyd_end },
-  {"Dijkstra", "Dijkstra routing data (fast initialization, slow lookup, small memory requirements, shortest path routing only)",
-  model_dijkstra_create ,model_dijkstra_both_load, model_dijkstra_both_unload, model_dijkstra_both_end },
-  {"DijkstraCache", "Dijkstra routing data (fast initialization, fast lookup, small memory requirements, shortest path routing only)",
-  model_dijkstracache_create, model_dijkstra_both_load, model_dijkstra_both_unload, model_dijkstra_both_end },
-  {"RuleBased", "Rule-Based routing data (...)",
-  model_rulebased_create, model_rulebased_load, model_rulebased_unload, model_rulebased_end },
-  {"none", "No routing (usable with Constant network only)",
-  model_none_create, model_none_load, model_none_unload, model_none_end },
-  {NULL,NULL,NULL,NULL,NULL,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;
+xbt_dict_t cluster_host_link = NULL; /* for tag cluster */
+
+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 */
+
+static void routing_parse_Sconfig(void);        /* config Tag */
+static void routing_parse_Econfig(void);        /* config Tag */
+
+static char* replace_random_parameter(char * chaine);
+static void clean_routing_after_parse(void);
+
+/* this lines are only for replace use like index in the model table */
+typedef enum {
+  SURF_MODEL_FULL = 0,
+  SURF_MODEL_FLOYD,
+  SURF_MODEL_DIJKSTRA,
+  SURF_MODEL_DIJKSTRACACHE,
+  SURF_MODEL_NONE,
+  SURF_MODEL_RULEBASED,
+  SURF_MODEL_VIVALDI,
+  SURF_MODEL_CLUSTER
+} e_routing_types;
+
+struct s_model_type routing_models[] = { {"Full",
+                                          "Full routing data (fast, large memory requirements, fully expressive)",
+                                          model_full_create,
+                                          model_full_load,
+                                          model_full_unload,
+                                          model_full_end},
+{"Floyd",
+ "Floyd routing data (slow initialization, fast lookup, lesser memory requirements, shortest path routing only)",
+ model_floyd_create, model_floyd_load, model_floyd_unload,
+ model_floyd_end},
+{"Dijkstra",
+ "Dijkstra routing data (fast initialization, slow lookup, small memory requirements, shortest path routing only)",
+ model_dijkstra_create, model_dijkstra_both_load,
+ model_dijkstra_both_unload, model_dijkstra_both_end},
+{"DijkstraCache",
+ "Dijkstra routing data (fast initialization, fast lookup, small memory requirements, shortest path routing only)",
+ model_dijkstracache_create, model_dijkstra_both_load,
+ model_dijkstra_both_unload, model_dijkstra_both_end},
+{"none", "No routing (usable with Constant network only)",
+ model_none_create, model_none_load, model_none_unload, model_none_end},
+{"RuleBased", "Rule-Based routing data (...)", model_rulebased_create,
+ model_rulebased_load, model_rulebased_unload, model_rulebased_end},
+{"Vivaldi", "Vivaldi routing", model_rulebased_create,
+  model_rulebased_load, model_rulebased_unload, model_rulebased_end},
+{"Cluster", "Cluster routing", model_cluster_create,
+  model_rulebased_load, model_rulebased_unload, model_rulebased_end},
+{NULL, NULL, NULL, NULL, NULL, NULL}
+};
 
-/* ************************************************************************** */
-/* ***************** GENERIC PARSE FUNCTIONS (declarations) ***************** */
+static double euclidean_dist_comp(int index, xbt_dynar_t src, xbt_dynar_t dst)
+{
+       double src_coord, dst_coord;
 
-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_route(routing_component_t rc, const char* src, const char* dst, route_t route);
-static void generic_set_ASroute(routing_component_t rc, const char* src, const char* dst, route_extended_t e_route);
-static void generic_set_bypassroute(routing_component_t rc, const char* src, const char* dst, route_extended_t e_route);
+       src_coord = atof(xbt_dynar_get_as(src, index, char *));
+       dst_coord = atof(xbt_dynar_get_as(dst, index, char *));
 
-/* ************************************************************************** */
-/* *************** GENERIC BUSINESS METHODS (declarations) ****************** */
+       return (src_coord-dst_coord)*(src_coord-dst_coord);
 
-static route_extended_t generic_get_bypassroute(routing_component_t rc, const char* src, const char* dst);
+}
 
-/* ************************************************************************** */
-/* ****************** GENERIC AUX FUNCTIONS (declarations) ****************** */
+static double base_vivaldi_get_latency (const char *src, const char *dst)
+{
+  double euclidean_dist;
+  xbt_dynar_t src_ctn, dst_ctn;
+  src_ctn = xbt_lib_get_or_null(host_lib, src, COORD_HOST_LEVEL);
+  if(!src_ctn) src_ctn = xbt_lib_get_or_null(as_router_lib, src, COORD_ASR_LEVEL);
+  dst_ctn = xbt_lib_get_or_null(host_lib, dst, COORD_HOST_LEVEL);
+  if(!dst_ctn) dst_ctn = xbt_lib_get_or_null(as_router_lib, dst, COORD_ASR_LEVEL);
 
-static route_extended_t generic_new_extended_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);
+  if(dst_ctn == NULL || src_ctn == NULL)
+  xbt_die("Coord src '%s' :%p   dst '%s' :%p",src,src_ctn,dst,dst_ctn);
 
-/* ************************************************************************** */
-/* **************************** GLOBAL FUNCTIONS **************************** */
-  
-/* global parse functions */
-static char* src = NULL;    /* temporary store the source name of a route */
-static char* dst = NULL;    /* temporary store the destination name of a route */
-static char* gw_src = NULL; /* temporary store the gateway source name of a route */
-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 */ 
+  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 *)));
+
+  xbt_assert(euclidean_dist>=0, "Euclidean Dist is less than 0\"%s\" and \"%.2f\"", src, euclidean_dist);
+
+  //From .ms to .s
+  return euclidean_dist / 1000;
+}
+
+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
  */
-static void  parse_S_host(void) {
-  if( current_routing->hierarchy == SURF_ROUTING_NULL ) current_routing->hierarchy = SURF_ROUTING_BASE;
-  xbt_assert1(!xbt_dict_get_or_null(global_routing->where_network_elements,A_surfxml_host_id),
-      "Reading a host, processing unit \"%s\" already exist",A_surfxml_host_id);
-  xbt_assert1(current_routing->set_processing_unit,
-      "no defined method \"set_processing_unit\" in \"%s\"",current_routing->name);
-  (*(current_routing->set_processing_unit))(current_routing,A_surfxml_host_id);
-  xbt_dict_set(global_routing->where_network_elements,A_surfxml_host_id,(void*)current_routing,NULL); 
+static void parse_S_host(const char *host_id, const char* coord)
+{
+  network_element_info_t info = NULL;
+  if (current_routing->hierarchy == SURF_ROUTING_NULL)
+    current_routing->hierarchy = SURF_ROUTING_BASE;
+  xbt_assert(!xbt_lib_get_or_null(host_lib, host_id,ROUTING_HOST_LEVEL),
+              "Reading a host, processing unit \"%s\" already exists",
+              host_id);
+  xbt_assert(current_routing->set_processing_unit,
+              "no defined method \"set_processing_unit\" in \"%s\"",
+              current_routing->name);
+  (*(current_routing->set_processing_unit)) (current_routing, host_id);
+  info = xbt_new0(s_network_element_info_t, 1);
+  info->rc_component = current_routing;
+  info->rc_type = SURF_NETWORK_ELEMENT_HOST;
+  xbt_lib_set(host_lib,host_id,ROUTING_HOST_LEVEL,(void *) info);
+  if (strcmp(coord,"")) {
+       if(!COORD_HOST_LEVEL) xbt_die("To use coordinates, you must set configuration 'coordinates' to 'yes'");
+    xbt_dynar_t ctn = xbt_str_split_str(coord, " ");
+    xbt_dynar_shrink(ctn, 0);
+    xbt_lib_set(host_lib,host_id,COORD_HOST_LEVEL,(void *) ctn);
+  }
+}
+
+static void parse_E_host(void)
+{
+        xbt_dict_cursor_t cursor = NULL;
+         char *key;
+         char *elem;
+
+         xbt_dict_foreach(current_property_set, cursor, key, elem) {
+                 XBT_DEBUG("property : %s = %s",key,elem);
+               }
+}
+
+/*
+ * \brief Add a host to the network element list from XML
+ */
+static void parse_S_host_XML(void)
+{
+//     XBT_INFO("parse_S_host_XML");
+//     XBT_INFO("'%s'  '%s'",struct_host->V_host_id, struct_host->V_host_coord);
+       parse_S_host(struct_host->V_host_id, struct_host->V_host_coord);
+}
+static void parse_E_host_XML(void)
+{
+       parse_E_host();
+}
+
+/*
+ * \brief Add a host to the network element list from lua script
+ */
+static void parse_S_host_lua(const char *host_id, const char *coord)
+{
+  parse_S_host(host_id, coord);
 }
 
+
 /**
  * \brief Add a "router" to the network element list
  */
-static void parse_S_router(void) {
-  if( current_routing->hierarchy == SURF_ROUTING_NULL ) current_routing->hierarchy = SURF_ROUTING_BASE;
-  xbt_assert1(!xbt_dict_get_or_null(global_routing->where_network_elements,A_surfxml_router_id),
-      "Reading a router, processing unit \"%s\" already exist",A_surfxml_router_id);
-  xbt_assert1(current_routing->set_processing_unit,
-      "no defined method \"set_processing_unit\" in \"%s\"",current_routing->name);
-  (*(current_routing->set_processing_unit))(current_routing,A_surfxml_router_id);
-  xbt_dict_set(global_routing->where_network_elements,A_surfxml_router_id,(void*)current_routing,NULL); 
+static void parse_S_router(void)
+{
+  network_element_info_t info = NULL;
+  if (current_routing->hierarchy == SURF_ROUTING_NULL)
+    current_routing->hierarchy = SURF_ROUTING_BASE;
+  xbt_assert(!xbt_lib_get_or_null(as_router_lib,struct_router->V_router_id, ROUTING_ASR_LEVEL),
+              "Reading a router, processing unit \"%s\" already exists",
+              struct_router->V_router_id);
+  xbt_assert(current_routing->set_processing_unit,
+              "no defined method \"set_processing_unit\" in \"%s\"",
+              current_routing->name);
+  (*(current_routing->set_processing_unit)) (current_routing,
+                 struct_router->V_router_id);
+  info = xbt_new0(s_network_element_info_t, 1);
+  info->rc_component = current_routing;
+  info->rc_type = SURF_NETWORK_ELEMENT_ROUTER;
+
+  xbt_lib_set(as_router_lib,struct_router->V_router_id,ROUTING_ASR_LEVEL,(void *) info);
+  if (strcmp(A_surfxml_router_coordinates,"")) {
+       if(!COORD_ASR_LEVEL) xbt_die("To use coordinates, you must set configuration 'coordinates' to 'yes'");
+    xbt_dynar_t ctn = xbt_str_split_str(A_surfxml_router_coordinates, " ");
+    xbt_dynar_shrink(ctn, 0);
+    xbt_lib_set(as_router_lib,struct_router->V_router_id,COORD_ASR_LEVEL,(void *) ctn);
+  }
+}
+
+/**
+ * brief Add a "router" to the network element list from XML description
+ */
+static void parse_S_router_XML(void)
+{
+       return parse_S_router();
+}
+
+/**
+ * brief Add a "router" to the network element list from XML description
+ */
+static void parse_S_router_lua(const char* router_id)
+{
+       struct_router->V_router_id = xbt_strdup(router_id);
+       struct_router->V_router_coord = xbt_strdup("");
+       return parse_S_router();
 }
 
 /**
  * \brief Set the endponints for a route
  */
-static void parse_S_route_new_and_endpoints(void) {
-  if( src != NULL && dst != NULL && link_list != NULL )
-    THROW2(arg_error,0,"Route between %s to %s can not be defined",A_surfxml_route_src,A_surfxml_route_dst);
-  src = A_surfxml_route_src;
-  dst = A_surfxml_route_dst;
-  xbt_assert2(strlen(src)>0||strlen(dst)>0,
-      "Some limits are null in the route between \"%s\" and \"%s\"",src,dst);
-  link_list = xbt_dynar_new(sizeof(char*), &xbt_free_ref);
+static void parse_S_route_new_and_endpoints(const char *src_id, const char *dst_id)
+{
+  if (src != NULL && dst != NULL && link_list != NULL)
+    THROWF(arg_error, 0, "Route between %s to %s can not be defined",
+           src_id, dst_id);
+  src = src_id;
+  dst = dst_id;
+  xbt_assert(strlen(src) > 0 || strlen(dst) > 0,
+              "Some limits are null in the route between \"%s\" and \"%s\"",
+              src, dst);
+  link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
+}
+
+/**
+ * \brief Set the endpoints for a route from XML
+ */
+static void parse_S_route_new_and_endpoints_XML(void)
+{
+  parse_S_route_new_and_endpoints(A_surfxml_route_src,
+                                  A_surfxml_route_dst);
+}
+
+/**
+ * \brief Set the endpoints for a route from lua
+ */
+static void parse_S_route_new_and_endpoints_lua(const char *id_src, const char *id_dst)
+{
+  parse_S_route_new_and_endpoints(id_src, id_dst);
 }
 
 /**
  * \brief Set the endponints and gateways for a ASroute
  */
-static void parse_S_ASroute_new_and_endpoints(void) {
-  if( src != NULL && dst != NULL && link_list != NULL )
-    THROW2(arg_error,0,"Route between %s to %s can not be defined",A_surfxml_ASroute_src,A_surfxml_ASroute_dst);
+static void parse_S_ASroute_new_and_endpoints(void)
+{
+  if (src != NULL && dst != NULL && link_list != NULL)
+    THROWF(arg_error, 0, "Route between %s to %s can not be defined",
+           A_surfxml_ASroute_src, A_surfxml_ASroute_dst);
   src = A_surfxml_ASroute_src;
   dst = A_surfxml_ASroute_dst;
   gw_src = A_surfxml_ASroute_gw_src;
   gw_dst = A_surfxml_ASroute_gw_dst;
-  xbt_assert2(strlen(src)>0||strlen(dst)>0||strlen(gw_src)>0||strlen(gw_dst)>0,
-      "Some limits are null in the route between \"%s\" and \"%s\"",src,dst);
-  link_list = xbt_dynar_new(sizeof(char*), &xbt_free_ref);
+  xbt_assert(strlen(src) > 0 || strlen(dst) > 0 || strlen(gw_src) > 0
+              || strlen(gw_dst) > 0,
+              "Some limits are null in the route between \"%s\" and \"%s\"",
+              src, dst);
+  link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
 }
 
 /**
  * \brief Set the endponints for a bypassRoute
  */
-static void parse_S_bypassRoute_new_and_endpoints(void) {
-  if( src != NULL && dst != NULL && link_list != NULL )
-    THROW2(arg_error,0,"Bypass Route between %s to %s can not be defined",A_surfxml_bypassRoute_src,A_surfxml_bypassRoute_dst);
+static void parse_S_bypassRoute_new_and_endpoints(void)
+{
+  if (src != NULL && dst != NULL && link_list != NULL)
+    THROWF(arg_error, 0,
+           "Bypass Route between %s to %s can not be defined",
+           A_surfxml_bypassRoute_src, A_surfxml_bypassRoute_dst);
   src = A_surfxml_bypassRoute_src;
   dst = A_surfxml_bypassRoute_dst;
   gw_src = A_surfxml_bypassRoute_gw_src;
   gw_dst = A_surfxml_bypassRoute_gw_dst;
-  xbt_assert2(strlen(src)>0||strlen(dst)>0||strlen(gw_src)>0||strlen(gw_dst)>0,
-      "Some limits are null in the route between \"%s\" and \"%s\"",src,dst);
-  link_list = xbt_dynar_new(sizeof(char*), &xbt_free_ref);
+  xbt_assert(strlen(src) > 0 || strlen(dst) > 0 || strlen(gw_src) > 0
+              || strlen(gw_dst) > 0,
+              "Some limits are null in the route between \"%s\" and \"%s\"",
+              src, dst);
+  link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
 }
 
 /**
  * \brief Set a new link on the actual list of link for a route or ASroute
  */
-static void parse_E_link_c_ctn_new_elem(void) {
+static void parse_E_link_ctn_new_elem(const char *link_id)
+{
   char *val;
-  val = xbt_strdup(A_surfxml_link_c_ctn_id);
+  val = xbt_strdup(link_id);
   xbt_dynar_push(link_list, &val);
 }
 
+/**
+ * \brief Set a new link on the actual list of link for a route or ASroute from XML
+ */
+
+static void parse_E_link_ctn_new_elem_XML(void)
+{
+  if (A_surfxml_link_ctn_direction == A_surfxml_link_ctn_direction_NONE)
+    parse_E_link_ctn_new_elem(A_surfxml_link_ctn_id);
+  if (A_surfxml_link_ctn_direction == A_surfxml_link_ctn_direction_UP) {
+    char *link_id = bprintf("%s_UP", A_surfxml_link_ctn_id);
+    parse_E_link_ctn_new_elem(link_id);
+    free(link_id);
+  }
+  if (A_surfxml_link_ctn_direction == A_surfxml_link_ctn_direction_DOWN) {
+    char *link_id = bprintf("%s_DOWN", A_surfxml_link_ctn_id);
+    parse_E_link_ctn_new_elem(link_id);
+    free(link_id);
+  }
+}
+
+/**
+ * \brief Set a new link on the actual list of link for a route or ASroute from lua
+ */
+static void parse_E_link_c_ctn_new_elem_lua(const char *link_id)
+{
+  parse_E_link_ctn_new_elem(link_id);
+}
+
 /**
  * \brief Store the route by calling the set_route function of the current routing component
  */
-static void parse_E_route_store_route(void) {
-  route_t route = xbt_new0(s_route_t,1);
-  route->link_list = link_list;
-//   xbt_assert1(generic_processing_units_exist(current_routing,src),"the \"%s\" processing units gateway does not exist",src);
-//   xbt_assert1(generic_processing_units_exist(current_routing,dst),"the \"%s\" processing units gateway does not exist",dst);
-    xbt_assert1(current_routing->set_route,"no defined method \"set_route\" in \"%s\"",current_routing->name);
-  (*(current_routing->set_route))(current_routing,src,dst,route);
+static void parse_E_route_store_route(void)
+{
+  name_route_extended_t route = xbt_new0(s_name_route_extended_t, 1);
+  route->generic_route.link_list = link_list;
+  xbt_assert(current_routing->set_route,
+              "no defined method \"set_route\" in \"%s\"",
+              current_routing->name);
+  (*(current_routing->set_route)) (current_routing, src, dst, route);
   link_list = NULL;
   src = NULL;
   dst = NULL;
@@ -204,17 +382,16 @@ static void parse_E_route_store_route(void) {
 /**
  * \brief Store the ASroute by calling the set_ASroute function of the current routing component
  */
-static void parse_E_ASroute_store_route(void) {
-  route_extended_t e_route = xbt_new0(s_route_extended_t,1);
+static void parse_E_ASroute_store_route(void)
+{
+  name_route_extended_t e_route = xbt_new0(s_name_route_extended_t, 1);
   e_route->generic_route.link_list = link_list;
   e_route->src_gateway = xbt_strdup(gw_src);
-  e_route->dst_gateway = xbt_strdup(gw_dst);  
-//   xbt_assert1(generic_autonomous_system_exist(current_routing,src),"the \"%s\" autonomous system does not exist",src);
-//   xbt_assert1(generic_autonomous_system_exist(current_routing,dst),"the \"%s\" autonomous system does not exist",dst);
-//   xbt_assert1(generic_processing_units_exist(current_routing,gw_src),"the \"%s\" processing units gateway does not exist",gw_src);
-//   xbt_assert1(generic_processing_units_exist(current_routing,gw_dst),"the \"%s\" processing units gateway does not exist",gw_dst);
-  xbt_assert1(current_routing->set_ASroute,"no defined method \"set_ASroute\" in \"%s\"",current_routing->name);
-  (*(current_routing->set_ASroute))(current_routing,src,dst,e_route);
+  e_route->dst_gateway = xbt_strdup(gw_dst);
+  xbt_assert(current_routing->set_ASroute,
+              "no defined method \"set_ASroute\" in \"%s\"",
+              current_routing->name);
+  (*(current_routing->set_ASroute)) (current_routing, src, dst, e_route);
   link_list = NULL;
   src = NULL;
   dst = NULL;
@@ -225,17 +402,17 @@ static void parse_E_ASroute_store_route(void) {
 /**
  * \brief Store the bypass route by calling the set_bypassroute function of the current routing component
  */
-static void parse_E_bypassRoute_store_route(void) {
-  route_extended_t e_route = xbt_new0(s_route_extended_t,1);
+static void parse_E_bypassRoute_store_route(void)
+{
+  route_extended_t e_route = xbt_new0(s_route_extended_t, 1);
   e_route->generic_route.link_list = link_list;
   e_route->src_gateway = xbt_strdup(gw_src);
   e_route->dst_gateway = xbt_strdup(gw_dst);
-//   xbt_assert1(generic_autonomous_system_exist(current_routing,src),"the \"%s\" autonomous system does not exist",src);
-//   xbt_assert1(generic_autonomous_system_exist(current_routing,dst),"the \"%s\" autonomous system does not exist",dst);
-//   xbt_assert1(generic_processing_units_exist(current_routing,gw_src),"the \"%s\" processing units gateway does not exist",gw_src);
-//   xbt_assert1(generic_processing_units_exist(current_routing,gw_dst),"the \"%s\" processing units gateway does not exist",gw_dst);
-  xbt_assert1(current_routing->set_bypassroute,"no defined method \"set_bypassroute\" in \"%s\"",current_routing->name);
-  (*(current_routing->set_bypassroute))(current_routing,src,dst,e_route);
+  xbt_assert(current_routing->set_bypassroute,
+              "no defined method \"set_bypassroute\" in \"%s\"",
+              current_routing->name);
+  (*(current_routing->set_bypassroute)) (current_routing, src, dst,
+                                         e_route);
   link_list = NULL;
   src = NULL;
   dst = NULL;
@@ -246,89 +423,136 @@ static void parse_E_bypassRoute_store_route(void) {
 /**
  * \brief Make a new routing component
  *
- * Detect the routing model type of the routing component, make the new structure and
+ * make the new structure and
  * set the parsing functions to allows parsing the part of the routing tree
  */
-static void parse_S_AS(void) { 
+void routing_AS_init(const char *AS_id, const char *wanted_routing_type)
+{
   routing_component_t new_routing;
   model_type_t model = NULL;
-  char* wanted = A_surfxml_AS_routing;
   int cpt;
-  /* seach the routing model */
-  for (cpt=0;routing_models[cpt].name;cpt++)
-    if (!strcmp(wanted,routing_models[cpt].name))
-          model = &routing_models[cpt];
+  /* search the routing model */
+  for (cpt = 0; routing_models[cpt].name; cpt++)
+    if (!strcmp(wanted_routing_type, routing_models[cpt].name))
+      model = &routing_models[cpt];
   /* if its not exist, error */
-  if( model == NULL ) {
-    fprintf(stderr,"Routing model %s not found. Existing models:\n",wanted);
-    for (cpt=0;routing_models[cpt].name;cpt++)
-      if (!strcmp(wanted,routing_models[cpt].name))
-        fprintf(stderr,"   %s: %s\n",routing_models[cpt].name,routing_models[cpt].desc);
+  if (model == NULL) {
+    fprintf(stderr, "Routing model %s not found. Existing models:\n",
+            wanted_routing_type);
+    for (cpt = 0; routing_models[cpt].name; cpt++)
+        fprintf(stderr, "   %s: %s\n", routing_models[cpt].name,
+                routing_models[cpt].desc);
     xbt_die(NULL);
   }
 
   /* make a new routing component */
-  new_routing = (routing_component_t)(*(model->create))();
+  new_routing = (routing_component_t) (*(model->create)) ();
   new_routing->routing = model;
   new_routing->hierarchy = SURF_ROUTING_NULL;
-  new_routing->name = xbt_strdup(A_surfxml_AS_id);
+  new_routing->name = xbt_strdup(AS_id);
   new_routing->routing_sons = xbt_dict_new();
-  //INFO2("Routing %s for AS %s",A_surfxml_AS_routing,A_surfxml_AS_id);
-  
-  if( current_routing == NULL && global_routing->root == NULL ){
-    
+
+  /* Hack for Vivaldi */
+  if(!strcmp(model->name,"Vivaldi"))
+       new_routing->get_latency = vivaldi_get_link_latency;
+
+  if (current_routing == NULL && global_routing->root == NULL) {
+
     /* it is the first one */
     new_routing->routing_father = NULL;
     global_routing->root = new_routing;
-    
-  } else if( current_routing != NULL && global_routing->root != NULL ) { 
-    
-    xbt_assert1(!xbt_dict_get_or_null(current_routing->routing_sons,A_surfxml_AS_id),
-           "The AS \"%s\" already exist",A_surfxml_AS_id);
-     /* it is a part of the tree */
+
+  } else if (current_routing != NULL && global_routing->root != NULL) {
+
+    xbt_assert(!xbt_dict_get_or_null
+                (current_routing->routing_sons, AS_id),
+                "The AS \"%s\" already exists", AS_id);
+    /* it is a part of the tree */
     new_routing->routing_father = current_routing;
     /* set the father behavior */
-    if( current_routing->hierarchy == SURF_ROUTING_NULL ) current_routing->hierarchy = SURF_ROUTING_RECURSIVE;
+    if (current_routing->hierarchy == SURF_ROUTING_NULL)
+      current_routing->hierarchy = SURF_ROUTING_RECURSIVE;
     /* add to the sons dictionary */
-    xbt_dict_set(current_routing->routing_sons,A_surfxml_AS_id,(void*)new_routing,NULL);
+    xbt_dict_set(current_routing->routing_sons, AS_id,
+                 (void *) new_routing, NULL);
     /* add to the father element list */
-    (*(current_routing->set_autonomous_system))(current_routing,A_surfxml_AS_id);
+    (*(current_routing->set_autonomous_system)) (current_routing, AS_id);
     /* unload the prev parse rules */
-    (*(current_routing->routing->unload))();
-    
+    (*(current_routing->routing->unload)) ();
+
   } else {
-    THROW0(arg_error,0,"All defined components must be belong to a AS");
+    THROWF(arg_error, 0, "All defined components must be belong to a AS");
   }
   /* set the new parse rules */
-  (*(new_routing->routing->load))();
+  (*(new_routing->routing->load)) ();
   /* set the new current component of the tree */
   current_routing = new_routing;
 }
 
+/*
+ * Detect the routing model type of the routing component from XML platforms
+ */
+static void parse_S_AS(void)
+{
+  routing_AS_init(A_surfxml_AS_id, A_surfxml_AS_routing);
+}
+
+
 /**
  * \brief Finish the creation of a new routing component
  *
  * When you finish to read the routing component, other structures must be created. 
  * the "end" method allow to do that for any routing model type
  */
-static void parse_E_AS(void) {
+void routing_AS_end(const char *AS_id)
+{
 
-  if( current_routing == NULL ) {
-    THROW1(arg_error,0,"Close AS(%s), that never open",A_surfxml_AS_id);
+  if (current_routing == NULL) {
+    THROWF(arg_error, 0, "Close AS(%s), that were never opened", AS_id);
   } else {
-      xbt_assert1(!xbt_dict_get_or_null(global_routing->where_network_elements,current_routing->name),
-          "The AS \"%s\" already exist",current_routing->name);
-      xbt_dict_set(global_routing->where_network_elements,current_routing->name,current_routing->routing_father,NULL);
-      (*(current_routing->routing->unload))();
-      (*(current_routing->routing->end))();
-      current_routing = current_routing->routing_father;
-      if( current_routing != NULL )
-        (*(current_routing->routing->load))();
+    network_element_info_t info = NULL;
+    xbt_assert(!xbt_lib_get_or_null(as_router_lib,current_routing->name, ROUTING_ASR_LEVEL),
+               "The AS \"%s\" already exists",current_routing->name);
+    info = xbt_new0(s_network_element_info_t, 1);
+    info->rc_component = current_routing->routing_father;
+    info->rc_type = SURF_NETWORK_ELEMENT_AS;
+    xbt_lib_set(as_router_lib,current_routing->name,ROUTING_ASR_LEVEL,(void *) info);
+
+    (*(current_routing->routing->unload)) ();
+    (*(current_routing->routing->end)) ();
+    current_routing = current_routing->routing_father;
+    if (current_routing != NULL)
+      (*(current_routing->routing->load)) ();
   }
 }
 
+/*
+ * \brief Finish the creation of a new routing component from XML
+ */
+static void parse_E_AS(void)
+{
+  routing_AS_end(A_surfxml_AS_id);
+}
+
 /* Aux Business methods */
 
+/**
+ * \brief Get the AS name of the element
+ *
+ * \param name the host name
+ *
+ */
+static char* elements_As_name(const char *name)
+{
+  routing_component_t as_comp;
+
+  /* (1) find the as where the host is located */
+  as_comp = ((network_element_info_t)
+            xbt_lib_get_or_null(host_lib,name, ROUTING_HOST_LEVEL))->rc_component;
+  return as_comp->name;
+}
+
+
 /**
  * \brief Get the AS father and the first elements of the chain
  *
@@ -338,168 +562,219 @@ static void parse_E_AS(void) {
  * Get the common father of the to processing units, and the first different 
  * father in the chain
  */
-static xbt_dynar_t elements_father(const char* src,const char* dst) {
-  
-  xbt_assert0(src&&dst,"bad parameters for \"elements_father\" method");
-  
-  xbt_dynar_t result = xbt_dynar_new(sizeof(char*), NULL);
-  
+static void elements_father(const char *src, const char *dst,
+                            routing_component_t *res_father,
+                            routing_component_t *res_src,
+                            routing_component_t *res_dst)
+{
+  xbt_assert(src && dst, "bad parameters for \"elements_father\" method");
+#define ELEMENTS_FATHER_MAXDEPTH 16 /* increase if it is not enough */
   routing_component_t src_as, dst_as;
-  int index_src, index_dst, index_father_src, index_father_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;
-  routing_component_t* father = NULL;
-  
+  routing_component_t path_src[ELEMENTS_FATHER_MAXDEPTH];
+  routing_component_t path_dst[ELEMENTS_FATHER_MAXDEPTH];
+  int index_src = 0;
+  int index_dst = 0;
+  routing_component_t current;
+  routing_component_t current_src;
+  routing_component_t current_dst;
+  routing_component_t father;
+
   /* (1) find the as where the src and dst are located */
-  src_as = xbt_dict_get_or_null(global_routing->where_network_elements,src);
-  dst_as = xbt_dict_get_or_null(global_routing->where_network_elements,dst); 
-  xbt_assert2(src_as&&dst_as, "Ask for route \"from\"(%s) or \"to\"(%s) no found",src,dst);
-  
+  network_element_info_t src_data = xbt_lib_get_or_null(host_lib, src,
+                                                        ROUTING_HOST_LEVEL);
+  network_element_info_t 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);
+  src_as = src_data->rc_component;
+  dst_as = dst_data->rc_component;
+
+  xbt_assert(src_as && dst_as,
+             "Ask for route \"from\"(%s) or \"to\"(%s) no found", src, dst);
+
   /* (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;
+  for (current = src_as ; current != NULL ; current = current->routing_father) {
+    if (index_src >= ELEMENTS_FATHER_MAXDEPTH)
+      xbt_die("ELEMENTS_FATHER_MAXDEPTH should be increased for path_src");
+    path_src[index_src++] = current;
   }
-  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;
+  for (current = dst_as ; current != NULL ; current = current->routing_father) {
+    if (index_dst >= ELEMENTS_FATHER_MAXDEPTH)
+      xbt_die("ELEMENTS_FATHER_MAXDEPTH should be increased for path_dst");
+    path_dst[index_dst++] = current;
   }
-  
+
   /* (3) find the common father */
-  index_src  = (path_src->used)-1;
-  index_dst  = (path_dst->used)-1;
-  current_src = xbt_dynar_get_ptr(path_src,index_src);
-  current_dst = xbt_dynar_get_ptr(path_dst,index_dst);
-  while( index_src >= 0 && index_dst >= 0 && *current_src == *current_dst ) {
-    current_src = xbt_dynar_get_ptr(path_src,index_src);
-    current_dst = xbt_dynar_get_ptr(path_dst,index_dst);
-    index_src--;
-    index_dst--;
-  }
-  index_src++;
-  index_dst++;
-  current_src = xbt_dynar_get_ptr(path_src,index_src);
-  current_dst = xbt_dynar_get_ptr(path_dst,index_dst);
+  do {
+    current_src = path_src[--index_src];
+    current_dst = path_dst[--index_dst];
+  } while (index_src > 0 && index_dst > 0 && current_src == current_dst);
 
   /* (4) they are not in the same routing component, make the path */
-  index_father_src = index_src+1;
-  index_father_dst = index_dst+1;
-   
-  if(*current_src==*current_dst)
+  if (current_src == current_dst)
     father = current_src;
   else
-    father = xbt_dynar_get_ptr(path_src,index_father_src);
-  
+    father = path_src[index_src + 1];
+
   /* (5) result generation */
-  xbt_dynar_push(result,father); /* first same the father of src and dst */
-  xbt_dynar_push(result,current_src); /* second the first different father of src */
-  xbt_dynar_push(result,current_dst); /* three  the first different father of dst */
-  
-  xbt_dynar_free(&path_src);
-  xbt_dynar_free(&path_dst);
-  
-  return result;
+  *res_father = father;         /* first the common father of src and dst */
+  *res_src = current_src;       /* second the first different father of src */
+  *res_dst = current_dst;       /* three  the first different father of dst */
+
+#undef ELEMENTS_FATHER_MAXDEPTH
 }
 
 /* Global Business methods */
 
 /**
- * \brief Recursive function for get_route
+ * \brief Recursive function for get_route_latency
  *
  * \param src the source host name 
  * \param dst the destination host name
+ * \param *e_route the route where the links are stored
+ * \param *latency the latency, if needed
  * 
- * This fuction is call by "get_route". It allow to walk through the 
- * routing components tree.
+ * This function is called by "get_route" and "get_latency". It allows to walk
+ * recursively through the routing components tree.
  */
-static route_extended_t _get_route(const char* src,const char* dst) {
-  
-  void* link;
-  unsigned int cpt=0;
-  
-  DEBUG2("Solve route  \"%s\" to \"%s\"",src,dst);
-     
-  xbt_assert0(src&&dst,"bad parameters for \"_get_route\" method");
-  
-  route_extended_t e_route, e_route_cnt, e_route_src=NULL, e_route_dst=NULL;
-  
-  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);
-  routing_component_t src_father    = xbt_dynar_get_as(elem_father_list, 1, routing_component_t);
-  routing_component_t dst_father    = xbt_dynar_get_as(elem_father_list, 2, routing_component_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);
-  
-  if(src_father==dst_father) { /* SURF_ROUTING_BASE */
-    
-    if( strcmp(src,dst) ){
-      e_route_cnt = (*(common_father->get_route))(common_father,src,dst);
-      xbt_assert2(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);
+static void _get_route_latency(const char *src, const char *dst,
+                               xbt_dynar_t *route, double *latency)
+{
+  XBT_DEBUG("Solve route/latency  \"%s\" to \"%s\"", src, dst);
+  xbt_assert(src && dst, "bad parameters for \"_get_route_latency\" method");
+
+  routing_component_t common_father;
+  routing_component_t src_father;
+  routing_component_t dst_father;
+  elements_father(src, dst, &common_father, &src_father, &dst_father);
+
+  if (src_father == dst_father) { /* SURF_ROUTING_BASE */
+
+    route_extended_t e_route = NULL;
+    if (route) {
+      e_route = common_father->get_route(common_father, src, dst);
+      xbt_assert(e_route, "no route between \"%s\" and \"%s\"", src, dst);
+      *route = e_route->generic_route.link_list;
+    }
+    if (latency) {
+      *latency = common_father->get_latency(common_father, src, dst, e_route);
+      xbt_assert(*latency >= 0.0,
+                 "latency error on route between \"%s\" and \"%s\"", src, dst);
     }
-    
-  } else { /* SURF_ROUTING_RECURSIVE */
+    if (e_route) {
+      xbt_free(e_route->src_gateway);
+      xbt_free(e_route->dst_gateway);
+      xbt_free(e_route);
+    }
+
+  } else {                      /* SURF_ROUTING_RECURSIVE */
 
     route_extended_t e_route_bypass = NULL;
-    
-    if(common_father->get_bypass_route)
-      e_route_bypass = (*(common_father->get_bypass_route))(common_father,src,dst);
-    
-    if(e_route_bypass)
-      e_route_cnt = e_route_bypass;    
-    else
-      e_route_cnt = (*(common_father->get_route))(common_father,src_father->name,dst_father->name);
-    
-    xbt_assert2(e_route_cnt,"no route between \"%s\" and \"%s\"",src_father->name,dst_father->name);
-
-    xbt_assert2( (e_route_cnt->src_gateway==NULL) == (e_route_cnt->dst_gateway==NULL) ,
-      "bad gateway for route between \"%s\" and \"%s\"",src,dst);
-
-    if( src != e_route_cnt->src_gateway ) {
-      e_route_src = _get_route(src,e_route_cnt->src_gateway);
-      xbt_assert2(e_route_src,"no route between \"%s\" and \"%s\"",src,e_route_cnt->src_gateway);
-      xbt_dynar_foreach(e_route_src->generic_route.link_list, cpt, link) {
-        xbt_dynar_push(e_route->generic_route.link_list,&link);
+    if (common_father->get_bypass_route)
+      e_route_bypass = common_father->get_bypass_route(common_father, src, dst);
+
+    xbt_assert(!latency || !e_route_bypass,
+               "Bypass cannot work yet with get_latency");
+
+    route_extended_t e_route_cnt = e_route_bypass
+      ? e_route_bypass
+      : common_father->get_route(common_father,
+                               src_father->name, dst_father->name);
+
+    xbt_assert(e_route_cnt, "no route between \"%s\" and \"%s\"",
+               src_father->name, dst_father->name);
+
+    xbt_assert((e_route_cnt->src_gateway == NULL) ==
+               (e_route_cnt->dst_gateway == NULL),
+               "bad gateway for route between \"%s\" and \"%s\"", src, dst);
+
+    if (route) {
+      *route = xbt_dynar_new(global_routing->size_of_link, NULL);
+    }
+    if (latency) {
+      *latency = common_father->get_latency(common_father,
+                                            src_father->name, dst_father->name,
+                                            e_route_cnt);
+      xbt_assert(*latency >= 0.0,
+                 "latency error on route between \"%s\" and \"%s\"",
+                 src_father->name, dst_father->name);
+    }
+
+    void *link;
+    unsigned int cpt;
+
+    if (strcmp(src, e_route_cnt->src_gateway)) {
+      double latency_src;
+      xbt_dynar_t route_src;
+
+      _get_route_latency(src, e_route_cnt->src_gateway,
+                         (route ? &route_src : NULL),
+                         (latency ? &latency_src : NULL));
+      if (route) {
+        xbt_assert(route_src, "no route between \"%s\" and \"%s\"",
+                   src, e_route_cnt->src_gateway);
+        xbt_dynar_foreach(route_src, cpt, link) {
+          xbt_dynar_push(*route, &link);
+        }
+        xbt_dynar_free(&route_src);
+      }
+      if (latency) {
+        xbt_assert(latency_src >= 0.0,
+                   "latency error on route between \"%s\" and \"%s\"",
+                   src, e_route_cnt->src_gateway);
+        *latency += latency_src;
       }
     }
-    
-    xbt_dynar_foreach(e_route_cnt->generic_route.link_list, cpt, link) {
-      xbt_dynar_push(e_route->generic_route.link_list,&link);
+
+    if (route) {
+      xbt_dynar_foreach(e_route_cnt->generic_route.link_list, cpt, link) {
+        xbt_dynar_push(*route, &link);
+      }
     }
-    
-    if( e_route_cnt->dst_gateway != dst ) {
-      e_route_dst = _get_route(e_route_cnt->dst_gateway,dst);
-      xbt_assert2(e_route_dst,"no route between \"%s\" and \"%s\"",e_route_cnt->dst_gateway,dst);
-      xbt_dynar_foreach(e_route_dst->generic_route.link_list, cpt, link) {
-        xbt_dynar_push(e_route->generic_route.link_list,&link);
+
+    if (strcmp(e_route_cnt->dst_gateway, dst)) {
+      double latency_dst;
+      xbt_dynar_t route_dst;
+
+      _get_route_latency(e_route_cnt->dst_gateway, dst,
+                         (route ? &route_dst : NULL),
+                         (latency ? &latency_dst : NULL));
+      if (route) {
+        xbt_assert(route_dst, "no route between \"%s\" and \"%s\"",
+                   e_route_cnt->dst_gateway, dst);
+        xbt_dynar_foreach(route_dst, cpt, link) {
+          xbt_dynar_push(*route, &link);
+        }
+        xbt_dynar_free(&route_dst);
+      }
+      if (latency) {
+        xbt_assert(latency_dst >= 0.0,
+                   "latency error on route between \"%s\" and \"%s\"",
+                   e_route_cnt->dst_gateway, dst);
+        *latency += latency_dst;
       }
     }
-    
-    e_route->src_gateway = xbt_strdup(e_route_cnt->src_gateway);
-    e_route->dst_gateway = xbt_strdup(e_route_cnt->dst_gateway);
 
-    generic_free_extended_route(e_route_src);
     generic_free_extended_route(e_route_cnt);
-    generic_free_extended_route(e_route_dst);
   }
-  
-  xbt_dynar_free(&elem_father_list);
-  
-  return e_route; 
+}
+
+/**
+ * \brief Generic function for get_route, get_route_no_cleanup, and get_latency
+ */
+static void get_route_latency(const char *src, const char *dst,
+                              xbt_dynar_t *route, double *latency, int cleanup)
+{
+  _get_route_latency(src, dst, route, latency);
+  xbt_assert(!route || *route, "no route between \"%s\" and \"%s\"", src, dst);
+  xbt_assert(!latency || *latency >= 0.0,
+             "latency error on route between \"%s\" and \"%s\"", src, dst);
+  if (route) {
+    xbt_dynar_free(&global_routing->last_route);
+    global_routing->last_route = cleanup ? *route : NULL;
+  }
 }
 
 /**
@@ -509,36 +784,76 @@ static route_extended_t _get_route(const char* src,const char* dst) {
  * \param dst the destination host name
  * 
  * walk through the routing components tree and find a route between hosts
- * by calling the differents "get_route" functions in each routing component
+ * by calling the differents "get_route" functions in each routing component.
+ * No need to free the returned dynar. It will be freed at the next call.
  */
-static xbt_dynar_t get_route(const char* src,const char* dst) {
-  
-  route_extended_t e_route;
-  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))
-    e_route = _get_route(src,dst);
-  else
-    e_route = (*(common_father->get_route))(common_father,src,dst);
-  
-  xbt_assert2(e_route,"no route between \"%s\" and \"%s\"",src,dst);
-  
-  if(global_routing->last_route) xbt_dynar_free( &(global_routing->last_route) );
-  global_routing->last_route = 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);
-  xbt_dynar_free(&elem_father_list);
-  
-  if( xbt_dynar_length(global_routing->last_route)==0 )
+static xbt_dynar_t get_route(const char *src, const char *dst)
+{
+  xbt_dynar_t route = NULL;
+  get_route_latency(src, dst, &route, NULL, 1);
+  return route;
+}
+
+/**
+ * \brief Generic method: find a route between hosts
+ *
+ * \param src the source host name
+ * \param dst the destination host name
+ *
+ * same as get_route, but return NULL if any exception is raised.
+ */
+static xbt_dynar_t get_route_or_null(const char *src, const char *dst)
+{
+  xbt_dynar_t route = NULL;
+  xbt_ex_t exception;
+  TRY {
+    get_route_latency(src, dst, &route, NULL, 1);
+  }CATCH(exception) {
+    xbt_ex_free(exception);
     return NULL;
-  else
-    return global_routing->last_route;
+  }
+  return route;
+}
+
+/**
+ * \brief Generic method: find a route between hosts
+ *
+ * \param src the source host name
+ * \param dst the destination host name
+ *
+ * walk through the routing components tree and find a route between hosts
+ * by calling the differents "get_route" functions in each routing component.
+ * Leaves the caller the responsability to clean the returned dynar.
+ */
+static xbt_dynar_t get_route_no_cleanup(const char *src, const char *dst)
+{
+  xbt_dynar_t route = NULL;
+  get_route_latency(src, dst, &route, NULL, 0);
+  return route;
+}
+
+/*Get Latency*/
+static double get_latency(const char *src, const char *dst)
+{
+  double latency = -1.0;
+  get_route_latency(src, dst, NULL, &latency, 0);
+  return latency;
+}
+
+static int surf_parse_models_setup_already_called=0;
+/* Call the last initialization functions, that must be called after the
+ * <config> tag, if any, and before the first of cluster|peer|AS|trace|trace_connect
+ */
+void surf_parse_models_setup()
+{
+  if (surf_parse_models_setup_already_called)
+    return;
+  surf_parse_models_setup_already_called=1;
+  routing_parse_Erandom();
+  surf_config_models_setup();
 }
 
+
 /**
  * \brief Recursive function for finalize
  *
@@ -547,8 +862,9 @@ static xbt_dynar_t get_route(const char* src,const char* dst) {
  * This fuction is call by "finalize". It allow to finalize the 
  * AS or routing components. It delete all the structures.
  */
-static void _finalize(routing_component_t rc) {
-  if(rc) {
+static void _finalize(routing_component_t rc)
+{
+  if (rc) {
     xbt_dict_cursor_t cursor = NULL;
     char *key;
     routing_component_t elem;
@@ -556,11 +872,12 @@ static void _finalize(routing_component_t rc) {
       _finalize(elem);
     }
     xbt_dict_t tmp_sons = rc->routing_sons;
-    chartmp_name = rc->name;
+    char *tmp_name = rc->name;
     xbt_dict_free(&tmp_sons);
     xbt_free(tmp_name);
-    xbt_assert1(rc->finalize,"no defined method \"finalize\" in \"%s\"",current_routing->name);
-    (*(rc->finalize))(rc);
+    xbt_assert(rc->finalize, "no defined method \"finalize\" in \"%s\"",
+                current_routing->name);
+    (*(rc->finalize)) (rc);
   }
 }
 
@@ -570,25 +887,63 @@ static void _finalize(routing_component_t rc) {
  * walk through the routing components tree and delete the structures
  * by calling the differents "finalize" functions in each routing component
  */
-static void finalize(void) {
-  /* delete recursibly all the tree */  
+static void finalize(void)
+{
+  /* delete recursibly all the tree */
   _finalize(global_routing->root);
-  /* delete "where" dict */
-  xbt_dict_free(&(global_routing->where_network_elements));
   /* delete last_route */
   xbt_dynar_free(&(global_routing->last_route));
   /* delete global routing structure */
   xbt_free(global_routing);
+  /* make sure that we will reinit the models while loading the platf once reinited -- HACK but there is no proper surf_routing_init() */
+  surf_parse_models_setup_already_called = 0;
+}
+
+static xbt_dynar_t recursive_get_onelink_routes(routing_component_t rc)
+{
+  xbt_dynar_t ret = xbt_dynar_new(sizeof(onelink_t), xbt_free);
+
+  //adding my one link routes
+  unsigned int cpt;
+  void *link;
+  xbt_dynar_t onelink_mine = rc->get_onelink_routes(rc);
+  if (onelink_mine) {
+    xbt_dynar_foreach(onelink_mine, cpt, link) {
+      xbt_dynar_push(ret, &link);
+    }
+  }
+  //recursing
+  char *key;
+  xbt_dict_cursor_t cursor = NULL;
+  routing_component_t rc_child;
+  xbt_dict_foreach(rc->routing_sons, cursor, key, rc_child) {
+    xbt_dynar_t onelink_child = recursive_get_onelink_routes(rc_child);
+    if (onelink_child) {
+      xbt_dynar_foreach(onelink_child, cpt, link) {
+        xbt_dynar_push(ret, &link);
+      }
+    }
+  }
+  return ret;
 }
 
-static void get_onelink_routes(void)
+static xbt_dynar_t get_onelink_routes(void)
 {
-       xbt_die("get_onelink_routes function not implemented yet!!!");
+  return recursive_get_onelink_routes(global_routing->root);
 }
 
-static int is_router(const char *name)
+e_surf_network_element_type_t get_network_element_type(const char
+                                                              *name)
 {
-       xbt_die("is_router function not implemented yet!!!");
+  network_element_info_t rc = NULL;
+
+  rc = xbt_lib_get_or_null(host_lib, name, ROUTING_HOST_LEVEL);
+  if(rc) return rc->rc_type;
+
+  rc = xbt_lib_get_or_null(as_router_lib, name, ROUTING_ASR_LEVEL);
+  if(rc) return rc->rc_type;
+
+  return SURF_NETWORK_ELEMENT_NULL;
 }
 
 /**
@@ -596,1201 +951,97 @@ static int is_router(const char *name)
  * 
  * Make a global routing structure and set all the parsing functions.
  */
-void routing_model_create(size_t size_of_links, void* loopback) {
-  
+void routing_model_create(size_t size_of_links, void *loopback, double_f_cpvoid_t get_link_latency_fun)
+{
   /* config the uniq global routing */
-  global_routing = xbt_new0(s_routing_global_t,1);
-  global_routing->where_network_elements = xbt_dict_new();
+  global_routing = xbt_new0(s_routing_global_t, 1);
   global_routing->root = NULL;
   global_routing->get_route = get_route;
+  global_routing->get_route_or_null = get_route_or_null;
+  global_routing->get_latency = get_latency;
+  global_routing->get_route_no_cleanup = get_route_no_cleanup;
+  global_routing->get_onelink_routes = get_onelink_routes;
+  global_routing->get_route_latency = get_route_latency;
+  global_routing->get_network_element_type = get_network_element_type;
   global_routing->finalize = finalize;
   global_routing->loopback = loopback;
   global_routing->size_of_link = size_of_links;
-  global_routing->last_route = xbt_dynar_new(size_of_links, NULL);
-  
+  global_routing->last_route = NULL;
+  get_link_latency = get_link_latency_fun;
   /* no current routing at moment */
   current_routing = NULL;
 
   /* parse generic elements */
-  surfxml_add_callback(STag_surfxml_host_cb_list, &parse_S_host);
-  surfxml_add_callback(STag_surfxml_router_cb_list, &parse_S_router);
-
-  surfxml_add_callback(STag_surfxml_route_cb_list, &parse_S_route_new_and_endpoints);
-  surfxml_add_callback(STag_surfxml_ASroute_cb_list, &parse_S_ASroute_new_and_endpoints);
-  surfxml_add_callback(STag_surfxml_bypassRoute_cb_list, &parse_S_bypassRoute_new_and_endpoints);
-  
-  surfxml_add_callback(ETag_surfxml_link_c_ctn_cb_list, &parse_E_link_c_ctn_new_elem);
-  
-  surfxml_add_callback(ETag_surfxml_route_cb_list, &parse_E_route_store_route);
-  surfxml_add_callback(ETag_surfxml_ASroute_cb_list, &parse_E_ASroute_store_route);
-  surfxml_add_callback(ETag_surfxml_bypassRoute_cb_list, &parse_E_bypassRoute_store_route);
-  
+  surfxml_add_callback(STag_surfxml_host_cb_list, &parse_S_host_XML);
+  surfxml_add_callback(ETag_surfxml_host_cb_list, &parse_E_host_XML);
+  surfxml_add_callback(STag_surfxml_router_cb_list, &parse_S_router_XML);
+
+  surfxml_add_callback(STag_surfxml_route_cb_list,
+                       &parse_S_route_new_and_endpoints_XML);
+  surfxml_add_callback(STag_surfxml_ASroute_cb_list,
+                       &parse_S_ASroute_new_and_endpoints);
+  surfxml_add_callback(STag_surfxml_bypassRoute_cb_list,
+                       &parse_S_bypassRoute_new_and_endpoints);
+
+  surfxml_add_callback(ETag_surfxml_link_ctn_cb_list,
+                       &parse_E_link_ctn_new_elem_XML);
+
+  surfxml_add_callback(ETag_surfxml_route_cb_list,
+                       &parse_E_route_store_route);
+  surfxml_add_callback(ETag_surfxml_ASroute_cb_list,
+                       &parse_E_ASroute_store_route);
+  surfxml_add_callback(ETag_surfxml_bypassRoute_cb_list,
+                       &parse_E_bypassRoute_store_route);
+
   surfxml_add_callback(STag_surfxml_AS_cb_list, &parse_S_AS);
   surfxml_add_callback(ETag_surfxml_AS_cb_list, &parse_E_AS);
 
-  surfxml_add_callback(STag_surfxml_cluster_cb_list, &routing_full_parse_Scluster);
+  surfxml_add_callback(STag_surfxml_cluster_cb_list,
+                       &routing_parse_Scluster);
 
-}
+  surfxml_add_callback(STag_surfxml_peer_cb_list,
+                         &routing_parse_Speer);
 
-/* ************************************************************************** */
-/* *************************** 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;
-  xbt_dict_t parse_routes; /* store data during the parse process */
-  xbt_dict_t to_index; /* char* -> network_element_t */
-  xbt_dict_t bypassRoutes;
-  route_extended_t *routing_table;
-} s_routing_component_full_t,*routing_component_full_t;
-
-/* Business methods */
-
-static route_extended_t full_get_route(routing_component_t rc, const char* src,const char* dst) {
-  xbt_assert1(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;
-  int table_size = xbt_dict_length(routing->to_index);
-  
-  generic_src_dst_check(rc,src,dst);
-  int *src_id = xbt_dict_get_or_null(routing->to_index,src);
-  int *dst_id = xbt_dict_get_or_null(routing->to_index,dst);
-  xbt_assert2(src_id && dst_id, "Ask for route \"from\"(%s)  or \"to\"(%s) no found in the local table",src,dst); 
-
-  route_extended_t e_route = NULL;
-  route_extended_t new_e_route = NULL;
-  void* link;
-  unsigned int cpt=0;
-
-  e_route = TO_ROUTE_FULL(*src_id,*dst_id);
-  
-  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;
-}
+  surfxml_add_callback(ETag_surfxml_platform_cb_list,
+                                                 &clean_routing_after_parse);
 
-static void full_finalize(routing_component_t rc) {
-  routing_component_full_t routing = (routing_component_full_t)rc;
-  int table_size = xbt_dict_length(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(&routing->bypassRoutes);
-    /* Delete index dict */
-    xbt_dict_free(&(routing->to_index));
-    /* Delete structure */
-    xbt_free(rc);
-  }
+#ifdef HAVE_TRACING
+  instr_routing_define_callbacks();
+#endif
 }
 
-/* Creation routing model functions */
-
-static void* model_full_create(void) {
-  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 = generic_set_route;
-  new_component->generic_routing.set_ASroute = generic_set_ASroute;
-  new_component->generic_routing.set_bypassroute = generic_set_bypassroute;
-  new_component->generic_routing.get_route = full_get_route;
-  new_component->generic_routing.get_bypass_route = generic_get_bypassroute;
-  new_component->generic_routing.finalize = full_finalize;
-  new_component->to_index = xbt_dict_new();
-  new_component->bypassRoutes = xbt_dict_new();
-  new_component->parse_routes = xbt_dict_new();
-  return new_component;
+void surf_parse_add_callback_config(void)
+{
+       surfxml_add_callback(STag_surfxml_config_cb_list, &routing_parse_Sconfig);
+       surfxml_add_callback(ETag_surfxml_config_cb_list, &routing_parse_Econfig);
+       surfxml_add_callback(STag_surfxml_prop_cb_list, &parse_properties_XML);
+       surfxml_add_callback(STag_surfxml_random_cb_list, &routing_parse_Srandom);
 }
 
-static void model_full_load(void) {
- /* use "surfxml_add_callback" to add a parse function call */
-}
+/* ************************************************** */
+/* ********** PATERN FOR NEW ROUTING **************** */
 
-static void model_full_unload(void) {
- /* use "surfxml_del_callback" to remove a parse function call */
-}
+/* 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;
 
-static void  model_full_end(void) {
-  
-  char *key, *end;
-  const char* sep = "#";
-  int src_id, dst_id;
-  unsigned int i, j;
-  route_t route;
-  route_extended_t e_route;
-  void* data;
-  
-  xbt_dict_cursor_t cursor = NULL;
-  xbt_dynar_t keys = NULL;
-  
-  /* set utils vars */
-  routing_component_full_t routing = ((routing_component_full_t)current_routing);
-  int table_size = xbt_dict_length(routing->to_index);
-  
-  /* Create the routing table */
-  routing->routing_table = xbt_new0(route_extended_t, table_size * table_size);
-  
-  /* Put the routes in position */
-  xbt_dict_foreach(routing->parse_routes, cursor, key, data) {
-    keys = xbt_str_split_str(key, sep);
-    src_id = strtol(xbt_dynar_get_as(keys, 0, char *), &end, 10);
-    dst_id = strtol(xbt_dynar_get_as(keys, 1, char *), &end, 10);
-    TO_ROUTE_FULL(src_id,dst_id) = generic_new_extended_route(current_routing->hierarchy,data,1);
-     xbt_dynar_free(&keys);
-   }
-
-   /* delete the parse table */
-  xbt_dict_foreach(routing->parse_routes, cursor, key, data) {
-    route = (route_t)data;
-    xbt_dynar_free(&(route->link_list));
-    xbt_free(data);
-  }
-      
-  /* delete parse dict */
-  xbt_dict_free(&(routing->parse_routes));
-
-  /* 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;
-      }
-    }
-  }
+/*** 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) {}
 
-  /* Shrink the dynar routes (save unused slots) */
-  for (i=0;i<table_size;i++)
-    for (j=0;j<table_size;j++)
-      if(TO_ROUTE_FULL(i,j))
-       xbt_dynar_shrink(TO_ROUTE_FULL(i,j)->generic_route.link_list,0);
-}
-
-/* ************************************************************************** */
-/* *************************** FLOYD ROUTING ******************************** */
-
-#define TO_FLOYD_COST(i,j) 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]
-
-/* Routing model structure */
-
-typedef struct {
-  s_routing_component_t generic_routing;
-  /* vars for calculate the floyd algorith. */
-  int *predecessor_table;
-  route_extended_t *link_table; /* char* -> int* */
-  xbt_dict_t to_index;
-  xbt_dict_t bypassRoutes;
-  /* store data during the parse process */  
-  xbt_dict_t parse_routes; 
-} s_routing_component_floyd_t,*routing_component_floyd_t;
-
-/* Business methods */
-
-static route_extended_t floyd_get_route(routing_component_t rc, const char* src,const char* dst) {
-  xbt_assert1(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;
-  int table_size = xbt_dict_length(routing->to_index);
-  
-  generic_src_dst_check(rc,src,dst);
-  int *src_id = xbt_dict_get_or_null(routing->to_index,src);
-  int *dst_id = xbt_dict_get_or_null(routing->to_index,dst);
-  xbt_assert2(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_assert2(TO_FLOYD_LINK(pred,prev_pred),"Invalid link for the route between \"%s\" or \"%s\"", src, dst);
-    
-    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_assert2(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);
-    }
-    first=0;
-    
-  } while(pred != *src_id);
-  xbt_assert4(pred != -1, "no route from host %d to %d (\"%s\" to \"%s\")", *src_id, *dst_id,src,dst);
-  
-  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,table_size;
-  if (routing) {
-    table_size = xbt_dict_length(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->bypassRoutes);
-    /* Delete index dict */
-    xbt_dict_free(&(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 = generic_set_route;
-  new_component->generic_routing.set_ASroute = generic_set_ASroute;
-  new_component->generic_routing.set_bypassroute = generic_set_bypassroute;
-  new_component->generic_routing.get_route = floyd_get_route;
-  new_component->generic_routing.get_bypass_route = generic_get_bypassroute;
-  new_component->generic_routing.finalize = floyd_finalize;
-  new_component->to_index = xbt_dict_new();
-  new_component->bypassRoutes = xbt_dict_new();
-  new_component->parse_routes = xbt_dict_new();
-  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);
-  xbt_dict_cursor_t cursor = NULL;
-  double * cost_table;
-  char *key,*data, *end;
-  const char *sep = "#";
-  xbt_dynar_t keys;
-  int src_id, dst_id;
-  unsigned int i,j,a,b,c;
-
-  /* set the size of inicial table */
-  int table_size = xbt_dict_length(routing->to_index);
-  
-  /* Create Cost, Predecessor and Link tables */
-  cost_table = xbt_new0(double, table_size*table_size); /* link cost from host to host */
-  routing->predecessor_table = xbt_new0(int, table_size*table_size); /* predecessor host numbers */
-  routing->link_table = xbt_new0(route_extended_t, table_size*table_size); /* actual link between src and dst */
-
-  /* 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 */
-    }
-
-   /* Put the routes in position */
-  xbt_dict_foreach(routing->parse_routes, cursor, key, data) {
-    keys = xbt_str_split_str(key, sep);
-    src_id = strtol(xbt_dynar_get_as(keys, 0, char *), &end, 10);
-    dst_id = strtol(xbt_dynar_get_as(keys, 1, char *), &end, 10);
-    TO_FLOYD_LINK(src_id,dst_id) = generic_new_extended_route(current_routing->hierarchy,data,0);
-    TO_FLOYD_PRED(src_id,dst_id) = src_id;
-    /* set link cost */
-    TO_FLOYD_COST(src_id,dst_id) = ((TO_FLOYD_LINK(src_id,dst_id))->generic_route.link_list)->used; /* count of links, old model assume 1 */
-    xbt_dynar_free(&keys);
-  }
-
-  /* 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);
-          }
-        }
-      }
-    }
-  }
-
-   /* delete the parse table */
-  xbt_dict_foreach(routing->parse_routes, cursor, key, data) {
-    route_t route = (route_t)data;
-    xbt_dynar_free(&(route->link_list));
-    xbt_free(data);
-  }
-  
-  /* delete parse dict */
-  xbt_dict_free(&(routing->parse_routes));
-
-  /* cleanup */
-  xbt_free(cost_table);
-}
-
-/* ************************************************************************** */
-/* ********** Dijkstra & Dijkstra Cached ROUTING **************************** */
-
-typedef struct {
-  s_routing_component_t generic_routing;
-  xbt_dict_t to_index;
-  xbt_dict_t bypassRoutes;
-  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;
-  xbt_dict_t parse_routes;
-} 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_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 route_extended_t dijkstra_get_route(routing_component_t rc, const char* src,const char* dst) {
-  xbt_assert1(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->to_index,src);
-  int *dst_id = xbt_dict_get_or_null(routing->to_index,dst);
-  xbt_assert2(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_assert2(src_elm != NULL && dst_elm != NULL, "src %d or dst %d does not exist", *src_id, *dst_id);
-  src_node_id = ((graph_node_data_t)xbt_graph_node_get_data(src_elm->node))->graph_id;
-  dst_node_id = ((graph_node_data_t)xbt_graph_node_get_data(dst_elm->node))->graph_id;
-
-  /* if 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_assert2(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_assert2(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_assert2(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->bypassRoutes);
-    /* Delete index dict */
-    xbt_dict_free(&(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 = generic_set_route;
-  new_component->generic_routing.set_ASroute = generic_set_ASroute;
-  new_component->generic_routing.set_bypassroute = generic_set_bypassroute;
-  new_component->generic_routing.get_route = dijkstra_get_route;
-  new_component->generic_routing.get_bypass_route = generic_get_bypassroute;
-  new_component->generic_routing.finalize = dijkstra_finalize;
-  new_component->cached = cached;
-  new_component->to_index = xbt_dict_new();
-  new_component->bypassRoutes = xbt_dict_new();
-  new_component->parse_routes = xbt_dict_new();
-  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_dict_cursor_t cursor = NULL;
-   char *key, *data, *end;
-   const char *sep = "#";
-   xbt_dynar_t keys;
-  xbt_node_t node = NULL;
-  unsigned int cursor2;
-  xbt_dynar_t nodes = NULL;
-  int src_id, dst_id;
-  route_t route;
-  
-  /* Create the topology graph */
-  routing->route_graph = xbt_graph_new_graph(1, NULL);
-  routing->graph_node_map = xbt_dict_new();
-  
-  if(routing->cached)
-    routing->route_cache = xbt_dict_new();
-
-  /* Put the routes in position */
-  xbt_dict_foreach(routing->parse_routes, cursor, key, data) {
-    keys = xbt_str_split_str(key, sep);
-    src_id = strtol(xbt_dynar_get_as(keys, 0, char *), &end, 10);
-    dst_id = strtol(xbt_dynar_get_as(keys, 1, char *), &end, 10);
-    route_extended_t e_route = generic_new_extended_route(current_routing->hierarchy,data,0);
-    route_new_dijkstra(routing,src_id,dst_id,e_route);
-    xbt_dynar_free(&keys);
-  }
-
-  /* delete the parse table */
-  xbt_dict_foreach(routing->parse_routes, cursor, key, data) {
-    route = (route_t)data;
-    xbt_dynar_free(&(route->link_list));
-    xbt_free(data);
-  }
-      
-  /* delete parse dict */
-  xbt_dict_free(&(routing->parse_routes));
-  
-  /* 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;
-  }
-  
-}
-
-/* ************************************************** */
-/* ************** 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, route_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;
-  ruleroute->re_src = pcre_compile(src,0,&error,&erroffset,NULL);
-  xbt_assert3(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_assert3(ruleroute->re_src,"PCRE compilation failed at offset %d (\"%s\"): %s\n", erroffset, dst, error);
-  ruleroute->re_str_link = 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, 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;
-  ruleroute_e->generic_rule_route.re_src = pcre_compile(src,0,&error,&erroffset,NULL);
-  xbt_assert3(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_assert3(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_assert2( 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_assert2(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_assert2(0,"bad string parameter, support only \"src\" and \"dst\", at offset: %d (\"%s\")",i,value);
-      }
-      i=i+3;
-      
-      xbt_assert4( 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_assert2( 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);
-}
-
-/* Business methods */
-static route_extended_t rulebased_get_route(routing_component_t rc, const char* src,const char* dst) {
-  xbt_assert1(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;
-  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_assert2(NULL, "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;
-  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 ) {
-        xbt_assert1(!pcre_get_substring_list(src,ovector_src,rc_src,&list_src),"error solving substring list for src \"%s\"",src);
-        xbt_assert1(!pcre_get_substring_list(dst,ovector_dst,rc_dst,&list_dst),"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_dict_get_or_null(surf_network_model->resource_set, new_link_name);
-          if (link)
-            xbt_dynar_push(links_list,&link);
-          else
-            THROW1(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_route = rulebased_get_route;
-  new_component->generic_routing.get_bypass_route = NULL; //rulebased_get_bypass_route;
-  new_component->generic_routing.finalize = rulebased_finalize;
-  /* 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) {
-}
-
-/* ************************************************************************** */
-/* ******************************* 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 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_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);}
+/*** 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) {
@@ -1811,263 +1062,219 @@ static void  model_none_end(void) {}
 // static void  model_NEW_end(void) {}    /* mandatory */
 
 /* ************************************************************************** */
-/* ************************* GENERIC PARSE FUNCTIONS ************************ */ 
+/* ************************* GENERIC PARSE FUNCTIONS ************************ */
 
-static void generic_set_processing_unit(routing_component_t rc, const char* name) {
-  DEBUG1("Load process unit \"%s\"",name);
-  model_type_t modeltype = rc->routing;
-  int *id = xbt_new0(int,1);
+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;
-  if(modeltype==&routing_models[SURF_MODEL_FULL])
-    _to_index = ((routing_component_full_t)rc)->to_index;
-  
-  else if(modeltype==&routing_models[SURF_MODEL_FLOYD])
-    _to_index = ((routing_component_floyd_t)rc)->to_index;
-  
-  else if(modeltype==&routing_models[SURF_MODEL_DIJKSTRA]||
-          modeltype==&routing_models[SURF_MODEL_DIJKSTRACACHE])
-    _to_index = ((routing_component_dijkstra_t)rc)->to_index;
-  
-  else xbt_die("\"generic_set_processing_unit\" not supported");
+  _to_index = current_routing->to_index;
   *id = xbt_dict_length(_to_index);
-  xbt_dict_set(_to_index,name,id,xbt_free);
+  xbt_dict_set(_to_index, name, id, xbt_free);
 }
 
-static void generic_set_autonomous_system(routing_component_t rc, const char* name) {
-  DEBUG1("Load Autonomous system \"%s\"",name);
-  model_type_t modeltype = rc->routing;
-  int *id = xbt_new0(int,1);
+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;
-  if(modeltype==&routing_models[SURF_MODEL_FULL])
-    _to_index = ((routing_component_full_t)rc)->to_index;
-  
-  else if(modeltype==&routing_models[SURF_MODEL_FLOYD])
-    _to_index = ((routing_component_floyd_t)rc)->to_index;
-  
-  else if(modeltype==&routing_models[SURF_MODEL_DIJKSTRA]||
-          modeltype==&routing_models[SURF_MODEL_DIJKSTRACACHE])
-    _to_index = ((routing_component_dijkstra_t)rc)->to_index;
-  
-  else xbt_die("\"generic_set_autonomous_system\" not supported");
+  _to_index = current_routing->to_index;
   *id = xbt_dict_length(_to_index);
-  xbt_dict_set(_to_index,name,id,xbt_free);
+  xbt_dict_set(_to_index, name, id, xbt_free);
 }
 
-static void generic_set_route(routing_component_t rc, const char* src, const char* dst, route_t route) {
-  DEBUG2("Load Route from \"%s\" to \"%s\"",src,dst);
-  model_type_t modeltype = rc->routing;
-  xbt_dict_t _parse_routes;
-  xbt_dict_t _to_index;
-  char *route_name;
-  int *src_id, *dst_id;
-  
-  if(modeltype==&routing_models[SURF_MODEL_FULL]) {
-    _parse_routes = ((routing_component_full_t)rc)->parse_routes;
-    _to_index = ((routing_component_full_t)rc)->to_index;
-    
-  } else if(modeltype==&routing_models[SURF_MODEL_FLOYD]) {
-    _parse_routes = ((routing_component_floyd_t)rc)->parse_routes;
-    _to_index = ((routing_component_floyd_t)rc)->to_index;
-    
-  } else if(modeltype==&routing_models[SURF_MODEL_DIJKSTRA]||
-          modeltype==&routing_models[SURF_MODEL_DIJKSTRACACHE]) {
-    _parse_routes = ((routing_component_dijkstra_t)rc)->parse_routes;
-    _to_index = ((routing_component_dijkstra_t)rc)->to_index;
-  
-  } else xbt_die("\"generic_set_route\" not supported");
-
-  src_id = xbt_dict_get_or_null(_to_index, src);
-  dst_id = xbt_dict_get_or_null(_to_index, dst);
-  
-  xbt_assert2(src_id&&dst_id,"Network elements %s or %s not found", src, dst);
-  route_name = bprintf("%d#%d",*src_id,*dst_id);
-  
-  xbt_assert2(xbt_dynar_length(route->link_list)>0, "Invalid count of links, must be greater than zero (%s,%s)",src,dst);   
-  xbt_assert2(!xbt_dict_get_or_null(_parse_routes,route_name),
-    "The route between \"%s\" and \"%s\" already exist",src,dst);
-
-  xbt_dict_set(_parse_routes, route_name, route, NULL);
-  xbt_free(route_name);
+int surf_pointer_resource_cmp(const void *a, const void *b)
+{
+  return a != b;
 }
 
-static void generic_set_ASroute(routing_component_t rc, const char* src, const char* dst, route_extended_t e_route) {
-  DEBUG4("Load ASroute from \"%s(%s)\" to \"%s(%s)\"",src,e_route->src_gateway,dst,e_route->dst_gateway);
-  model_type_t modeltype = rc->routing;
-  xbt_dict_t _parse_routes;
-  xbt_dict_t _to_index;
-  char *route_name;
-  int *src_id, *dst_id;
-  
-  if(modeltype==&routing_models[SURF_MODEL_FULL]) {
-    _parse_routes = ((routing_component_full_t)rc)->parse_routes;
-    _to_index = ((routing_component_full_t)rc)->to_index;
-    
-  } else if(modeltype==&routing_models[SURF_MODEL_FLOYD]) {
-    _parse_routes = ((routing_component_floyd_t)rc)->parse_routes;
-    _to_index = ((routing_component_floyd_t)rc)->to_index;
-    
-  } else if(modeltype==&routing_models[SURF_MODEL_DIJKSTRA]||
-          modeltype==&routing_models[SURF_MODEL_DIJKSTRACACHE]) {
-    _parse_routes = ((routing_component_dijkstra_t)rc)->parse_routes;
-    _to_index = ((routing_component_dijkstra_t)rc)->to_index;
-  
-  } else xbt_die("\"generic_set_route\" not supported");
-  
-  src_id = xbt_dict_get_or_null(_to_index, src);
-  dst_id = xbt_dict_get_or_null(_to_index, dst);
-  
-  xbt_assert2(src_id&&dst_id,"Network elements %s or %s not found", src, dst);
-  route_name = bprintf("%d#%d",*src_id,*dst_id);
-  
-  xbt_assert2(xbt_dynar_length(e_route->generic_route.link_list)>0, "Invalid count of links, must be greater than zero (%s,%s)",src,dst);   
-  xbt_assert4(!xbt_dict_get_or_null(_parse_routes,route_name),
-    "The route between \"%s\"(\"%s\") and \"%s\"(\"%s\") already exist",src,e_route->src_gateway,dst,e_route->dst_gateway);
-    
-  xbt_dict_set(_parse_routes, route_name, e_route, NULL);
-  xbt_free(route_name);
+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) {
-  DEBUG2("Load bypassRoute from \"%s\" to \"%s\"",src,dst);
-  model_type_t modeltype = rc->routing;
-  xbt_dict_t dict_bypassRoutes;
+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;
-  if(modeltype==&routing_models[SURF_MODEL_FULL]) {
-    dict_bypassRoutes = ((routing_component_full_t)rc)->bypassRoutes;
-  } else if(modeltype==&routing_models[SURF_MODEL_FLOYD]) {
-    dict_bypassRoutes = ((routing_component_floyd_t)rc)->bypassRoutes;
-  } else if(modeltype==&routing_models[SURF_MODEL_DIJKSTRA]||
-          modeltype==&routing_models[SURF_MODEL_DIJKSTRACACHE]) {
-    dict_bypassRoutes = ((routing_component_dijkstra_t)rc)->bypassRoutes;
-  } else xbt_die("\"generic_set_bypassroute\" not supported");
-  route_name = bprintf("%s#%s",src,dst);
-  xbt_assert2(xbt_dynar_length(e_route->generic_route.link_list)>0, "Invalid count of links, must be greater than zero (%s,%s)",src,dst);
-  xbt_assert4(!xbt_dict_get_or_null(dict_bypassRoutes,route_name),
-    "The bypass route between \"%s\"(\"%s\") and \"%s\"(\"%s\") already exist",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) );
+
+  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_dict_set(dict_bypassRoutes, route_name, new_e_route,
+               (void (*)(void *)) generic_free_extended_route);
   xbt_free(route_name);
 }
 
 /* ************************************************************************** */
 /* *********************** GENERIC BUSINESS METHODS ************************* */
 
-static route_extended_t generic_get_bypassroute(routing_component_t rc, const char* src, const char* dst) {
-  model_type_t modeltype = rc->routing;
-  xbt_dict_t dict_bypassRoutes;
-  
-  if(modeltype==&routing_models[SURF_MODEL_FULL]) {
-    dict_bypassRoutes = ((routing_component_full_t)rc)->bypassRoutes;
-  } else if(modeltype==&routing_models[SURF_MODEL_FLOYD]) {
-    dict_bypassRoutes = ((routing_component_floyd_t)rc)->bypassRoutes;
-  } else if(modeltype==&routing_models[SURF_MODEL_DIJKSTRA]||
-          modeltype==&routing_models[SURF_MODEL_DIJKSTRACACHE]) {
-    dict_bypassRoutes = ((routing_component_dijkstra_t)rc)->bypassRoutes;
-  } else xbt_die("\"generic_set_bypassroute\" not supported");
+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;
+
+       route = route?route:rc->get_route(rc,src,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;
+}
+
+xbt_dynar_t generic_get_onelink_routes(routing_component_t rc)
+{
+  xbt_die("\"generic_get_onelink_routes\" not implemented yet");
+}
 
+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_tcurrent_src = NULL;
-  routing_component_tcurrent_dst = NULL;
+  routing_component_t *current_src = NULL;
+  routing_component_t *current_dst = NULL;
 
   /* (1) find the as where the src and dst are located */
-  src_as = xbt_dict_get_or_null(global_routing->where_network_elements,src);
-  dst_as = xbt_dict_get_or_null(global_routing->where_network_elements,dst); 
-  xbt_assert2(src_as&&dst_as, "Ask for route \"from\"(%s) or \"to\"(%s) no found",src,dst);
+  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 = 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 = dst_as;
+  while (current != NULL) {
+    xbt_dynar_push(path_dst, &current);
     current = current->routing_father;
   }
 
   /* (3) find the common father */
-  index_src  = (path_src->used)-1;
-  index_dst  = (path_dst->used)-1;
-  current_src = xbt_dynar_get_ptr(path_src,index_src);
-  current_dst = xbt_dynar_get_ptr(path_dst,index_dst);
-  while( index_src >= 0 && index_dst >= 0 && *current_src == *current_dst ) {
-    routing_component_t *tmp_src,*tmp_dst;
-    tmp_src = xbt_dynar_pop_ptr(path_src);
-    tmp_dst = xbt_dynar_pop_ptr(path_dst);
+  index_src = path_src->used - 1;
+  index_dst = path_dst->used - 1;
+  current_src = xbt_dynar_get_ptr(path_src, index_src);
+  current_dst = xbt_dynar_get_ptr(path_dst, index_dst);
+  while (index_src >= 0 && index_dst >= 0 && *current_src == *current_dst) {
+    xbt_dynar_pop_ptr(path_src);
+    xbt_dynar_pop_ptr(path_dst);
     index_src--;
     index_dst--;
-    current_src = xbt_dynar_get_ptr(path_src,index_src);
-    current_dst = xbt_dynar_get_ptr(path_dst,index_dst);
+    current_src = xbt_dynar_get_ptr(path_src, index_src);
+    current_dst = xbt_dynar_get_ptr(path_dst, index_dst);
   }
-  
-  int max_index_src = (path_src->used)-1;
-  int max_index_dst = (path_dst->used)-1;
-  
-  int max_index = max(max_index_src,max_index_dst);
+
+  int max_index_src = path_src->used - 1;
+  int max_index_dst = path_dst->used - 1;
+
+  int max_index = max(max_index_src, max_index_dst);
   int i, max;
- route_extended_t e_route_bypass = NULL;
-  for( max=0;max<=max_index;max++)
-  {
-    for(i=0;i<max;i++)
-    {
-      if( i <= max_index_src  && max <= max_index_dst ) {
-        char* route_name = bprintf("%s#%s",
-          (*(routing_component_t*)(xbt_dynar_get_ptr(path_src,i)))->name,
-          (*(routing_component_t*)(xbt_dynar_get_ptr(path_dst,max)))->name);
-        e_route_bypass = xbt_dict_get_or_null(dict_bypassRoutes,route_name);
+
+  route_extended_t e_route_bypass = NULL;
+
+  for (max = 0; max <= max_index; max++) {
+    for (i = 0; i < max; i++) {
+      if (i <= max_index_src && max <= max_index_dst) {
+        char *route_name = bprintf("%s#%s",
+                                   (*(routing_component_t *)
+                                    (xbt_dynar_get_ptr
+                                     (path_src, i)))->name,
+                                   (*(routing_component_t *)
+                                    (xbt_dynar_get_ptr
+                                     (path_dst, max)))->name);
+        e_route_bypass =
+            xbt_dict_get_or_null(dict_bypassRoutes, route_name);
         xbt_free(route_name);
       }
-      if( e_route_bypass ) break;
-      if( max <= max_index_src  && i <= max_index_dst ) {
-        char* route_name = bprintf("%s#%s",
-          (*(routing_component_t*)(xbt_dynar_get_ptr(path_src,max)))->name,
-          (*(routing_component_t*)(xbt_dynar_get_ptr(path_dst,i)))->name);
-        e_route_bypass = xbt_dict_get_or_null(dict_bypassRoutes,route_name);
+      if (e_route_bypass)
+        break;
+      if (max <= max_index_src && i <= max_index_dst) {
+        char *route_name = bprintf("%s#%s",
+                                   (*(routing_component_t *)
+                                    (xbt_dynar_get_ptr
+                                     (path_src, max)))->name,
+                                   (*(routing_component_t *)
+                                    (xbt_dynar_get_ptr
+                                     (path_dst, i)))->name);
+        e_route_bypass =
+            xbt_dict_get_or_null(dict_bypassRoutes, route_name);
         xbt_free(route_name);
       }
-      if( e_route_bypass ) break;
+      if (e_route_bypass)
+        break;
     }
-    
-    if( e_route_bypass ) break;
-     
-    if( max <= max_index_src  && max <= max_index_dst ) {
-      char* route_name = bprintf("%s#%s",
-        (*(routing_component_t*)(xbt_dynar_get_ptr(path_src,max)))->name,
-        (*(routing_component_t*)(xbt_dynar_get_ptr(path_dst,max)))->name);
-      e_route_bypass = xbt_dict_get_or_null(dict_bypassRoutes,route_name);
+
+    if (e_route_bypass)
+      break;
+
+    if (max <= max_index_src && max <= max_index_dst) {
+      char *route_name = bprintf("%s#%s",
+                                 (*(routing_component_t *)
+                                  (xbt_dynar_get_ptr
+                                   (path_src, max)))->name,
+                                 (*(routing_component_t *)
+                                  (xbt_dynar_get_ptr
+                                   (path_dst, max)))->name);
+      e_route_bypass = xbt_dict_get_or_null(dict_bypassRoutes, route_name);
       xbt_free(route_name);
     }
-    if( e_route_bypass ) break;
+    if (e_route_bypass)
+      break;
   }
 
   xbt_dynar_free(&path_src);
   xbt_dynar_free(&path_dst);
-  
+
   route_extended_t new_e_route = NULL;
-  
-  if(e_route_bypass) {
-    voidlink;
-    unsigned int cpt=0;
-    new_e_route = xbt_new0(s_route_extended_t,1);
+
+  if (e_route_bypass) {
+    void *link;
+    unsigned int cpt = 0;
+    new_e_route = xbt_new0(s_route_extended_t, 1);
     new_e_route->src_gateway = xbt_strdup(e_route_bypass->src_gateway);
     new_e_route->dst_gateway = xbt_strdup(e_route_bypass->dst_gateway);
-    new_e_route->generic_route.link_list = xbt_dynar_new(global_routing->size_of_link,NULL);
+    new_e_route->generic_route.link_list =
+        xbt_dynar_new(global_routing->size_of_link, NULL);
     xbt_dynar_foreach(e_route_bypass->generic_route.link_list, cpt, link) {
-      xbt_dynar_push(new_e_route->generic_route.link_list,&link);
+      xbt_dynar_push(new_e_route->generic_route.link_list, &link);
     }
   }
 
@@ -2077,321 +1284,816 @@ static route_extended_t generic_get_bypassroute(routing_component_t rc, const ch
 /* ************************************************************************** */
 /* ************************* GENERIC AUX FUNCTIONS ************************** */
 
-static route_extended_t generic_new_extended_route(e_surf_routing_hierarchy_t hierarchy, void* data, int order) {
-  
+route_t
+generic_new_route(e_surf_routing_hierarchy_t hierarchy,
+                           void *data, int order)
+{
+
+  char *link_name;
+  route_t new_route;
+  unsigned int cpt;
+  xbt_dynar_t links = NULL, links_id = NULL;
+
+  new_route = xbt_new0(s_route_t, 1);
+  new_route->link_list =
+      xbt_dynar_new(global_routing->size_of_link, NULL);
+
+  xbt_assert(hierarchy == SURF_ROUTING_BASE,
+              "the hierarchy type is not SURF_ROUTING_BASE");
+
+  links = ((route_t) data)->link_list;
+
+
+  links_id = new_route->link_list;
+
+  xbt_dynar_foreach(links, cpt, link_name) {
+
+    void *link =
+               xbt_lib_get_or_null(link_lib, link_name, SURF_LINK_LEVEL);
+    if (link) {
+      if (order)
+        xbt_dynar_push(links_id, &link);
+      else
+        xbt_dynar_unshift(links_id, &link);
+    } else
+      THROWF(mismatch_error, 0, "Link %s not found", link_name);
+  }
+
+  return new_route;
+}
+
+route_extended_t
+generic_new_extended_route(e_surf_routing_hierarchy_t hierarchy,
+                           void *data, int order)
+{
+
   char *link_name;
   route_extended_t e_route, new_e_route;
   route_t route;
   unsigned int cpt;
-  xbt_dynar_t links, links_id;
-  
-  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);
+  xbt_dynar_t links = NULL, links_id = NULL;
+
+  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;
 
-  xbt_assert0(hierarchy == SURF_ROUTING_BASE || hierarchy == SURF_ROUTING_RECURSIVE,
-      "the hierarchy type is not defined");
-  
-  if(hierarchy == SURF_ROUTING_BASE ) {
-    
-    route = (route_t)data;
+  xbt_assert(hierarchy == SURF_ROUTING_BASE
+              || hierarchy == SURF_ROUTING_RECURSIVE,
+              "the hierarchy type is not defined");
+
+  if (hierarchy == SURF_ROUTING_BASE) {
+
+    route = (route_t) data;
     links = route->link_list;
-    
-  } else if(hierarchy == SURF_ROUTING_RECURSIVE ) {
 
-    e_route = (route_extended_t)data;
-    xbt_assert0(e_route->src_gateway&&e_route->dst_gateway,"bad gateway, is null");
+  } else if (hierarchy == SURF_ROUTING_RECURSIVE) {
+
+    e_route = (route_extended_t) data;
+    xbt_assert(e_route->src_gateway
+                && e_route->dst_gateway, "bad gateway, is null");
     links = e_route->generic_route.link_list;
-    
+
     /* remeber not erase the gateway names */
-    new_e_route->src_gateway = e_route->src_gateway;
-    new_e_route->dst_gateway = e_route->dst_gateway;
+    new_e_route->src_gateway = strdup(e_route->src_gateway);
+    new_e_route->dst_gateway = strdup(e_route->dst_gateway);
   }
-  
+
   links_id = new_e_route->generic_route.link_list;
-  
+
   xbt_dynar_foreach(links, cpt, link_name) {
-    
-    void* link = xbt_dict_get_or_null(surf_network_model->resource_set, link_name);
-    if (link)
-    {
-      if( order )
-        xbt_dynar_push(links_id,&link);
+
+    void *link =
+               xbt_lib_get_or_null(link_lib, link_name, SURF_LINK_LEVEL);
+    if (link) {
+      if (order)
+        xbt_dynar_push(links_id, &link);
       else
-        xbt_dynar_unshift(links_id,&link);
-    }
-    else
-      THROW1(mismatch_error,0,"Link %s not found", link_name);
+        xbt_dynar_unshift(links_id, &link);
+    } else
+      THROWF(mismatch_error, 0, "Link %s not found", link_name);
   }
+
   return new_e_route;
 }
 
-static void generic_free_route(route_t route) {
-  if(route) {
+void generic_free_route(route_t route)
+{
+  if (route) {
     xbt_dynar_free(&(route->link_list));
     xbt_free(route);
   }
 }
 
-static void generic_free_extended_route(route_extended_t e_route) {
-  if(e_route) {
+void generic_free_extended_route(route_extended_t e_route)
+{
+  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);
+    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);
   }
 }
 
-static routing_component_t generic_as_exist(routing_component_t find_from, routing_component_t to_find) {
+static routing_component_t generic_as_exist(routing_component_t find_from,
+                                            routing_component_t to_find)
+{
   //return to_find; // FIXME: BYPASSERROR OF FOREACH WITH BREAK
   xbt_dict_cursor_t cursor = NULL;
   char *key;
-  int found=0;
+  int found = 0;
   routing_component_t elem;
   xbt_dict_foreach(find_from->routing_sons, cursor, key, elem) {
-    if( to_find == elem || generic_as_exist(elem,to_find) ){
-      found=1;
+    if (to_find == elem || generic_as_exist(elem, to_find)) {
+      found = 1;
       break;
     }
   }
-  if(found) return to_find;
+  if (found)
+    return to_find;
   return NULL;
 }
 
-static routing_component_t generic_autonomous_system_exist(routing_component_t rc, char* element) {
+routing_component_t
+generic_autonomous_system_exist(routing_component_t rc, char *element)
+{
   //return rc; // FIXME: BYPASSERROR OF FOREACH WITH BREAK
   routing_component_t element_as, result, elem;
   xbt_dict_cursor_t cursor = NULL;
   char *key;
-  element_as = xbt_dict_get_or_null(global_routing->where_network_elements,element);
-  result = ((routing_component_t)-1);
-  if(element_as!=rc)
-    result = generic_as_exist(rc,element_as);
-  
-  int found=0;
-  if(result)
-  {
+  element_as = ((network_element_info_t)
+                xbt_lib_get_or_null(as_router_lib, element, ROUTING_ASR_LEVEL))->rc_component;
+  result = ((routing_component_t) - 1);
+  if (element_as != rc)
+    result = generic_as_exist(rc, element_as);
+
+  int found = 0;
+  if (result) {
     xbt_dict_foreach(element_as->routing_sons, cursor, key, elem) {
-      found = !strcmp(elem->name,element);
-      if( found ) break;
+      found = !strcmp(elem->name, element);
+      if (found)
+        break;
     }
-    if( found ) return element_as;
+    if (found)
+      return element_as;
   }
   return NULL;
 }
 
-static routing_component_t generic_processing_units_exist(routing_component_t rc, char* element) {
+routing_component_t
+generic_processing_units_exist(routing_component_t rc, char *element)
+{
   routing_component_t element_as;
-  element_as = xbt_dict_get_or_null(global_routing->where_network_elements,element);
-  if(element_as==rc) return element_as;
-  return generic_as_exist(rc,element_as);
-}
-
-static void generic_src_dst_check(routing_component_t rc, const char* src, const char* dst) {
-  
-  routing_component_t src_as = xbt_dict_get_or_null(global_routing->where_network_elements,src);
-  routing_component_t dst_as = xbt_dict_get_or_null(global_routing->where_network_elements,dst);
-   
-  xbt_assert3(src_as != NULL && dst_as  != NULL, 
-      "Ask for route \"from\"(%s) or \"to\"(%s) no found at AS \"%s\"",src,dst,rc->name);
-  xbt_assert4(src_as == dst_as,
-      "The src(%s in %s) and dst(%s in %s) are in differents AS",src,src_as->name,dst,dst_as->name);
-  xbt_assert2(rc == dst_as,
-      "The routing component of src and dst is not the same as the network elements belong (%s==%s)",rc->name,dst_as->name);
-}
-
-static void routing_full_parse_Scluster(void)
-{
-       static int AX_ptr = 0;
-
-       char *cluster_id = A_surfxml_cluster_id;
-       char *cluster_prefix = A_surfxml_cluster_prefix;
-       char *cluster_suffix = A_surfxml_cluster_suffix;
-       char *cluster_radical = A_surfxml_cluster_radical;
-       char *cluster_power = A_surfxml_cluster_power;
-       char *cluster_bw = A_surfxml_cluster_bw;
-       char *cluster_lat = A_surfxml_cluster_lat;
-       char *cluster_bb_bw = A_surfxml_cluster_bb_bw;
-       char *cluster_bb_lat = A_surfxml_cluster_bb_lat;
-       char *host_id, *groups, *link_id;
-       char *router_id, *link_router, *link_backbone, *route_src_dst;
-       unsigned int iter;
-       int start, end, i;
-       xbt_dynar_t radical_elements;
-       xbt_dynar_t radical_ends;
-
-       static unsigned int surfxml_buffer_stack_stack_ptr = 1;
-       static unsigned int surfxml_buffer_stack_stack[1024];
-
-       surfxml_buffer_stack_stack[0]= 0;
-
-       surfxml_bufferstack_push(1);
-
-       DEBUG1("<AS id=\"%s\"\trouting=\"RuleBased\">",cluster_id);
-       SURFXML_BUFFER_SET(AS_id, cluster_id);
-       SURFXML_BUFFER_SET(AS_routing, "RuleBased");
-       SURFXML_START_TAG(AS);
-
-       radical_elements = xbt_str_split(cluster_radical, ",");
-       xbt_dynar_foreach(radical_elements, iter, groups)
-       {
-               radical_ends = xbt_str_split(groups, "-");
-               switch (xbt_dynar_length(radical_ends))
+  element_as = ((network_element_info_t)
+                xbt_lib_get_or_null(host_lib,
+                 element, ROUTING_HOST_LEVEL))->rc_component;
+  if (element_as == rc)
+    return element_as;
+  return generic_as_exist(rc, element_as);
+}
+
+void generic_src_dst_check(routing_component_t rc, const char *src,
+                                  const char *dst)
+{
+
+  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);
+
+  routing_component_t src_as = ((network_element_info_t)src_data)->rc_component;
+  routing_component_t dst_as = ((network_element_info_t)dst_data)->rc_component;
+
+  if(src_as != dst_as)
+         xbt_die("The src(%s in %s) and dst(%s in %s) are in differents AS",
+              src, src_as->name, dst, dst_as->name);
+  if(rc != dst_as)
+        xbt_die("The routing component of src'%s' and dst'%s' is not the same as the network elements belong (%s?=%s?=%s)",
+     src,dst,src_as->name, dst_as->name,rc->name);
+}
+
+static void routing_parse_Sconfig(void)
+{
+  XBT_DEBUG("START configuration name = %s",A_surfxml_config_id);
+}
+
+static void routing_parse_Econfig(void)
+{
+  xbt_dict_cursor_t cursor = NULL;
+  char *key;
+  char *elem;
+  char *cfg;
+  xbt_dict_foreach(current_property_set, cursor, key, elem) {
+         cfg = bprintf("%s:%s",key,elem);
+         if(xbt_cfg_is_default_value(_surf_cfg_set, key))
+                 xbt_cfg_set_parse(_surf_cfg_set, cfg);
+         else
+                 XBT_INFO("The custom configuration '%s' is already defined by user!",key);
+         free(cfg);
+  }
+  XBT_DEBUG("End configuration name = %s",A_surfxml_config_id);
+}
+
+void routing_parse_Scluster(void)
+{
+  if(!cluster_host_link)
+         cluster_host_link = xbt_dict_new();
+
+  static int AX_ptr = 0;
+  char *host_id, *groups, *link_id = NULL;
+  char *availability_file = xbt_strdup(A_surfxml_cluster_availability_file);
+  char *state_file = xbt_strdup(A_surfxml_cluster_state_file);
+
+  if( !strcmp(A_surfxml_cluster_state_file,"") || !strcmp(A_surfxml_cluster_availability_file,"") ){
+         if(xbt_dict_size(patterns)==0)
+                 patterns = xbt_dict_new();
+
+         xbt_dict_set(patterns,"id",struct_cluster->V_cluster_id,NULL);
+         xbt_dict_set(patterns,"prefix",struct_cluster->V_cluster_prefix,NULL);
+         xbt_dict_set(patterns,"suffix",struct_cluster->V_cluster_suffix,NULL);
+  }
+
+  char *route_src_dst;
+  unsigned int iter;
+  int start, end, i;
+  xbt_dynar_t radical_elements;
+  xbt_dynar_t radical_ends;
+  int cluster_sharing_policy = AX_surfxml_cluster_sharing_policy;
+  int cluster_bb_sharing_policy = AX_surfxml_cluster_bb_sharing_policy;
+  if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
+         xbt_dict_set(cluster_host_link,struct_cluster->V_cluster_id,bprintf("fullduplex"),free);
+
+  static unsigned int surfxml_buffer_stack_stack_ptr = 1;
+  static unsigned int surfxml_buffer_stack_stack[1024];
+
+  surfxml_buffer_stack_stack[0] = 0;
+
+  surfxml_bufferstack_push(1);
+
+  SURFXML_BUFFER_SET(AS_id, struct_cluster->V_cluster_id);
+  SURFXML_BUFFER_SET(AS_routing, "Cluster");
+  XBT_DEBUG("<AS id=\"%s\"\trouting=\"Cluster\">", struct_cluster->V_cluster_id);
+  SURFXML_START_TAG(AS);
+
+  radical_elements = xbt_str_split(struct_cluster->V_cluster_radical, ",");
+  xbt_dynar_foreach(radical_elements, iter, groups) {
+    radical_ends = xbt_str_split(groups, "-");
+    switch (xbt_dynar_length(radical_ends)) {
+    case 1:
+               surf_parse_get_int(&start, xbt_dynar_get_as(radical_ends, 0, char *));
+               host_id = bprintf("%s%d%s", struct_cluster->V_cluster_prefix, start, struct_cluster->V_cluster_suffix);
+               link_id = bprintf("%s_link_%d", struct_cluster->V_cluster_id, start);
+
+               XBT_DEBUG("<host\tid=\"%s\"\tpower=\"%f\">", host_id, struct_cluster->S_cluster_power);
+               struct_host = xbt_new0(s_hostSG_t, 1);
+               struct_host->V_host_id = host_id;
+               if(!strcmp(A_surfxml_cluster_availability_file,"")){
+                 xbt_dict_set(patterns, "radical", bprintf("%d", start), xbt_free);
+                 char* tmp_availability_file = xbt_strdup(availability_file);
+                 xbt_str_varsubst(tmp_availability_file,patterns);
+                 XBT_DEBUG("\tavailability_file=\"%s\"",tmp_availability_file);
+                 struct_host->V_host_power_trace = tmgr_trace_new(tmp_availability_file);
+                 xbt_free(tmp_availability_file);
+               }
+               else
                {
-                       case 1:
-                         surf_parse_get_int(&start, xbt_dynar_get_as(radical_ends, 0, char *));
-                         host_id = bprintf("%s%d%s", cluster_prefix, start, cluster_suffix);
-                         link_id = bprintf("%s_link_%d", cluster_id, start);
-
-                         DEBUG2("<host\tid=\"%s\"\tpower=\"%s\"/>",host_id,cluster_power);
-                         SURFXML_BUFFER_SET(host_id, host_id);
-                         SURFXML_BUFFER_SET(host_power, cluster_power);
-                         SURFXML_BUFFER_SET(host_availability, "1.0");
-                         SURFXML_BUFFER_SET(host_availability_file, "");
-                         A_surfxml_host_state = A_surfxml_host_state_ON;
-                         SURFXML_BUFFER_SET(host_state_file, "");
-                         SURFXML_BUFFER_SET(host_interference_send, "1.0");
-                         SURFXML_BUFFER_SET(host_interference_recv, "1.0");
-                         SURFXML_BUFFER_SET(host_interference_send_recv, "1.0");
-                         SURFXML_BUFFER_SET(host_max_outgoing_rate, "-1.0");
-                         SURFXML_START_TAG(host);
-                         SURFXML_END_TAG(host);
-
-                         DEBUG3("<link\tid=\"%s\"\tbw=\"%s\"\tlat=\"%s\"/>",link_id,cluster_bw,cluster_lat);
-                         SURFXML_BUFFER_SET(link_id, link_id);
-                         SURFXML_BUFFER_SET(link_bandwidth, cluster_bw);
-                         SURFXML_BUFFER_SET(link_latency, cluster_lat);
-                         SURFXML_BUFFER_SET(link_bandwidth_file, "");
-                         SURFXML_BUFFER_SET(link_latency_file, "");
-                         A_surfxml_link_state = A_surfxml_link_state_ON;
-                         SURFXML_BUFFER_SET(link_state_file, "");
-                         A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
-                         SURFXML_START_TAG(link);
-                         SURFXML_END_TAG(link);
-
-                         break;
-
-                       case 2:
-
-                         surf_parse_get_int(&start, xbt_dynar_get_as(radical_ends, 0, char *));
-                         surf_parse_get_int(&end, xbt_dynar_get_as(radical_ends, 1, char *));
-                         DEBUG2("Create hosts and links from %d to %d",start,end);
-                         for (i = start; i <= end; i++)
-                         {
-                                 host_id = bprintf("%s%d%s", cluster_prefix, i, cluster_suffix);
-                                 link_id = bprintf("%s_link_%d", cluster_id, i);
-
-                                 DEBUG2("<host\tid=\"%s\"\tpower=\"%s\"/>",host_id,cluster_power);
-                                 SURFXML_BUFFER_SET(host_id, host_id);
-                                 SURFXML_BUFFER_SET(host_power, cluster_power);
-                                 SURFXML_BUFFER_SET(host_availability, "1.0");
-                                 SURFXML_BUFFER_SET(host_availability_file, "");
-                                 A_surfxml_host_state = A_surfxml_host_state_ON;
-                                 SURFXML_BUFFER_SET(host_state_file, "");
-                                 SURFXML_BUFFER_SET(host_interference_send, "1.0");
-                                 SURFXML_BUFFER_SET(host_interference_recv, "1.0");
-                                 SURFXML_BUFFER_SET(host_interference_send_recv, "1.0");
-                                 SURFXML_BUFFER_SET(host_max_outgoing_rate, "-1.0");
-                                 SURFXML_START_TAG(host);
-                                 SURFXML_END_TAG(host);
-
-                                 DEBUG3("<link\tid=\"%s\"\tbw=\"%s\"\tlat=\"%s\"/>",link_id,cluster_bw,cluster_lat);
-                                 SURFXML_BUFFER_SET(link_id, link_id);
-                                 SURFXML_BUFFER_SET(link_bandwidth, cluster_bw);
-                                 SURFXML_BUFFER_SET(link_latency, cluster_lat);
-                                 SURFXML_BUFFER_SET(link_bandwidth_file, "");
-                                 SURFXML_BUFFER_SET(link_latency_file, "");
-                                 A_surfxml_link_state = A_surfxml_link_state_ON;
-                                 SURFXML_BUFFER_SET(link_state_file, "");
-                                 A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
-                                 SURFXML_START_TAG(link);
-                                 SURFXML_END_TAG(link);
-                         }
-                         break;
+                 XBT_DEBUG("\tavailability_file=\"\"");
+               }
+               if(!strcmp(A_surfxml_cluster_state_file,"")){
+                 char *tmp_state_file = xbt_strdup(state_file);
+                 xbt_str_varsubst(tmp_state_file,patterns);
+                 XBT_DEBUG("\tstate_file=\"%s\"",tmp_state_file);
+                 struct_host->V_host_state_trace = tmgr_trace_new(tmp_state_file);
+                 xbt_free(tmp_state_file);
+               }
+               else
+               {
+                 XBT_DEBUG("\tstate_file=\"\"");
+               }
 
-                       default:
-                               DEBUG0("Malformed radical");
+               struct_host->V_host_power_peak = struct_cluster->S_cluster_power;
+               struct_host->V_host_power_scale = 1.0;
+               struct_host->V_host_core = struct_cluster->S_cluster_core;
+               struct_host->V_host_state_initial = SURF_RESOURCE_ON;
+               struct_host->V_host_coord = "";
+               STag_surfxml_host_cluster();
+               XBT_DEBUG("</host>");
+
+               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;}
+
+               XBT_DEBUG("<link\tid=\"%s\"\tbw=\"%f\"\tlat=\"%f\"/>", link_id,struct_cluster->S_cluster_bw, struct_cluster->S_cluster_lat);
+
+               struct_lnk = xbt_new0(s_link_t, 1);
+               struct_lnk->V_link_id = link_id;
+               struct_lnk->V_link_bandwidth = struct_cluster->S_cluster_bw;
+               struct_lnk->V_link_latency = struct_cluster->S_cluster_lat;
+               struct_lnk->V_link_bandwidth_file = NULL;
+               struct_lnk->V_link_latency_file = NULL;
+               struct_lnk->V_link_state_file = NULL;
+               struct_lnk->V_link_state = SURF_RESOURCE_ON;
+               struct_lnk->V_link_sharing_policy = A_surfxml_link_sharing_policy;
+
+               if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_SHARED)
+                       struct_lnk->V_policy_initial_link = SURF_LINK_SHARED;
+               else
+               {
+                if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FATPIPE)
+                        struct_lnk->V_policy_initial_link = SURF_LINK_FATPIPE;
+                else if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FULLDUPLEX)
+                        struct_lnk->V_policy_initial_link = SURF_LINK_FULLDUPLEX;
+               }
+               STag_surfxml_link_cluster();
+
+               xbt_dict_set(cluster_host_link,host_id,strdup(link_id),free);
+//             XBT_INFO("key '%s' Value '%s'",host_id,link_id);
+               ETag_surfxml_host();
+               ETag_surfxml_link();
+
+               break;
+
+    case 2:
+
+      surf_parse_get_int(&start,
+                         xbt_dynar_get_as(radical_ends, 0, char *));
+      surf_parse_get_int(&end, xbt_dynar_get_as(radical_ends, 1, char *));
+      for (i = start; i <= end; i++) {
+               host_id = bprintf("%s%d%s", struct_cluster->V_cluster_prefix, i, struct_cluster->V_cluster_suffix);
+               link_id = bprintf("%s_link_%d", struct_cluster->V_cluster_id, i);
+
+               A_surfxml_host_state = A_surfxml_host_state_ON;
+
+               XBT_DEBUG("<host\tid=\"%s\"\tpower=\"%f\">", host_id, struct_cluster->S_cluster_power);
+               struct_host = xbt_new0(s_hostSG_t, 1);
+               struct_host->V_host_id = host_id;
+               if(!strcmp(A_surfxml_cluster_availability_file,"")){
+                 xbt_dict_set(patterns, "radical", bprintf("%d", i), xbt_free);
+                 char* tmp_availability_file = xbt_strdup(availability_file);
+                 xbt_str_varsubst(tmp_availability_file,patterns);
+                 XBT_DEBUG("\tavailability_file=\"%s\"",tmp_availability_file);
+                 struct_host->V_host_power_trace = tmgr_trace_new(tmp_availability_file);
+                 xbt_free(tmp_availability_file);
+               }
+               else
+               {
+                 XBT_DEBUG("\tavailability_file=\"\"");
+               }
+               if(!strcmp(A_surfxml_cluster_state_file,"")){
+                 char *tmp_state_file = xbt_strdup(state_file);
+                 xbt_str_varsubst(tmp_state_file,patterns);
+                 XBT_DEBUG("\tstate_file=\"%s\"",tmp_state_file);
+                 struct_host->V_host_state_trace = tmgr_trace_new(tmp_state_file);
+                 xbt_free(tmp_state_file);
+               }
+               else
+               {
+                 XBT_DEBUG("\tstate_file=\"\"");
                }
 
-               xbt_dynar_free(&radical_ends);
-       }
+               struct_host->V_host_power_peak = struct_cluster->S_cluster_power;
+               struct_host->V_host_power_scale = 1.0;
+               struct_host->V_host_core = struct_cluster->S_cluster_core;
+               struct_host->V_host_state_initial = SURF_RESOURCE_ON;
+               struct_host->V_host_coord = "";
+               STag_surfxml_host_cluster();
+               XBT_DEBUG("</host>");
+
+               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;}
+
+               XBT_DEBUG("<link\tid=\"%s\"\tbw=\"%f\"\tlat=\"%f\"/>", link_id,struct_cluster->S_cluster_bw, struct_cluster->S_cluster_lat);
+
+               struct_lnk = xbt_new0(s_link_t, 1);
+               struct_lnk->V_link_id = link_id;
+               struct_lnk->V_link_bandwidth = struct_cluster->S_cluster_bw;
+               struct_lnk->V_link_latency = struct_cluster->S_cluster_lat;
+               struct_lnk->V_link_bandwidth_file = NULL;
+               struct_lnk->V_link_latency_file = NULL;
+               struct_lnk->V_link_state_file = NULL;
+               struct_lnk->V_link_state = SURF_RESOURCE_ON;
+               struct_lnk->V_link_sharing_policy = A_surfxml_link_sharing_policy;
+
+               if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_SHARED)
+                       struct_lnk->V_policy_initial_link = SURF_LINK_SHARED;
+               else
+               {
+                if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FATPIPE)
+                        struct_lnk->V_policy_initial_link = SURF_LINK_FATPIPE;
+                else if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FULLDUPLEX)
+                        struct_lnk->V_policy_initial_link = SURF_LINK_FULLDUPLEX;
+               }
+               STag_surfxml_link_cluster();
 
-       DEBUG0(" ");
-       router_id = bprintf("%srouter%s",cluster_prefix,cluster_suffix);
-       link_router = bprintf("%s_link_router",cluster_id);
-       link_backbone = bprintf("%s_backbone",cluster_id);
-
-       DEBUG1("<router id=\"%s\"\">",router_id);
-       SURFXML_BUFFER_SET(router_id, router_id);;
-       SURFXML_START_TAG(router);
-       SURFXML_END_TAG(router);
-
-       DEBUG3("<link\tid=\"%s\"\tbw=\"%s\"\tlat=\"%s\"/>",link_router,cluster_bw,cluster_lat);
-       SURFXML_BUFFER_SET(link_id, link_router);
-       SURFXML_BUFFER_SET(link_bandwidth, cluster_bw);
-       SURFXML_BUFFER_SET(link_latency, cluster_lat);
-       SURFXML_BUFFER_SET(link_bandwidth_file, "");
-       SURFXML_BUFFER_SET(link_latency_file, "");
-       A_surfxml_link_state = A_surfxml_link_state_ON;
-       SURFXML_BUFFER_SET(link_state_file, "");
-       A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
-       SURFXML_START_TAG(link);
-       SURFXML_END_TAG(link);
-
-       DEBUG3("<link\tid=\"%s\"\tbw=\"%s\"\tlat=\"%s\"/>",link_backbone,cluster_bb_bw,cluster_bb_lat);
-       SURFXML_BUFFER_SET(link_id, link_backbone);
-       SURFXML_BUFFER_SET(link_bandwidth, cluster_bb_bw);
-       SURFXML_BUFFER_SET(link_latency, cluster_bb_lat);
-       SURFXML_BUFFER_SET(link_bandwidth_file, "");
-       SURFXML_BUFFER_SET(link_latency_file, "");
-       A_surfxml_link_state = A_surfxml_link_state_ON;
-       SURFXML_BUFFER_SET(link_state_file, "");
-       A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
-       SURFXML_START_TAG(link);
-       SURFXML_END_TAG(link);
-
-       char *new_suffix = bprintf("%s","");
-
-       radical_elements = xbt_str_split(cluster_suffix, ".");
-       xbt_dynar_foreach(radical_elements, iter, groups)
-       {
-                   if(strcmp(groups,""))
-                   {
-                       new_suffix = bprintf("%s\\.%s",new_suffix,groups);
-                   }
-       }
-       route_src_dst = bprintf("%s(.*)%s",cluster_prefix,new_suffix);
+               xbt_dict_set(cluster_host_link,host_id,strdup(link_id),free);
+//             XBT_INFO("key '%s' Value '%s'",host_id,link_id);
+
+               ETag_surfxml_host();
+               ETag_surfxml_link();
+
+      }
+      break;
 
-       DEBUG0(" ");
+    default:
+      XBT_DEBUG("Malformed radical");
+      break;
+    }
 
-       DEBUG2("<route\tsrc=\"%s\"\tdst=\"%s\">",route_src_dst,route_src_dst);
-       SURFXML_BUFFER_SET(route_src, route_src_dst);
-       SURFXML_BUFFER_SET(route_dst, route_src_dst);
-       SURFXML_START_TAG(route);
+    xbt_dynar_free(&radical_ends);
+  }
+  xbt_dynar_free(&radical_elements);
+
+  XBT_DEBUG(" ");
+  XBT_DEBUG("<router id=\"%s\"/>", struct_cluster->S_cluster_router_id);
+  SURFXML_BUFFER_SET(router_id, struct_cluster->S_cluster_router_id);
+  SURFXML_BUFFER_SET(router_coordinates, "");
+  SURFXML_START_TAG(router);
+  SURFXML_END_TAG(router);
+
+  if( (struct_cluster->S_cluster_bb_bw!= 0)  && (struct_cluster->S_cluster_bb_lat!=0)  ){
+         char *link_backbone = bprintf("%s_backbone", struct_cluster->V_cluster_id);
+         XBT_DEBUG("<link\tid=\"%s\" bw=\"%f\" lat=\"%f\"/>", link_backbone,struct_cluster->S_cluster_bb_bw, struct_cluster->S_cluster_bb_lat);
+
+         A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
+         if(cluster_bb_sharing_policy == A_surfxml_cluster_bb_sharing_policy_FATPIPE)
+         {A_surfxml_link_sharing_policy =  A_surfxml_link_sharing_policy_FATPIPE;}
+
+         struct_lnk = xbt_new0(s_link_t, 1);
+         struct_lnk->V_link_id = link_backbone;
+         struct_lnk->V_link_bandwidth = struct_cluster->S_cluster_bb_bw;
+         struct_lnk->V_link_latency = struct_cluster->S_cluster_bb_lat;
+         struct_lnk->V_link_bandwidth_file = NULL;
+         struct_lnk->V_link_latency_file = NULL;
+         struct_lnk->V_link_state_file = NULL;
+         struct_lnk->V_link_state = SURF_RESOURCE_ON;
+         struct_lnk->V_link_sharing_policy = A_surfxml_link_sharing_policy;
+
+         if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_SHARED)
+                 struct_lnk->V_policy_initial_link = SURF_LINK_SHARED;
+         else
+         {
+          if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FATPIPE)
+                  struct_lnk->V_policy_initial_link = SURF_LINK_FATPIPE;
+          else if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FULLDUPLEX)
+                  struct_lnk->V_policy_initial_link = SURF_LINK_FULLDUPLEX;
+         }
+
+         STag_surfxml_link_cluster();
+         ETag_surfxml_link();
+//       free(link_backbone);
+  }
 
-       DEBUG1("<link:ctn\tid=\"%s_link_$1src\"/>",cluster_id);
-       SURFXML_BUFFER_SET(link_c_ctn_id, bprintf("%s_link_$1src",cluster_id));
-       SURFXML_START_TAG(link_c_ctn);
-       SURFXML_END_TAG(link_c_ctn);
+  XBT_DEBUG(" ");
 
-       DEBUG1("<link:ctn\tid=\"%s_backbone\"/>",cluster_id);
-       SURFXML_BUFFER_SET(link_c_ctn_id, bprintf("%s_backbone",cluster_id));
-       SURFXML_START_TAG(link_c_ctn);
-       SURFXML_END_TAG(link_c_ctn);
+  char *new_suffix = xbt_strdup("");
 
-       DEBUG1("<link:ctn\tid=\"%s_link_$1dst\"/>",cluster_id);
-       SURFXML_BUFFER_SET(link_c_ctn_id, bprintf("%s_link_$1dst",cluster_id));
-       SURFXML_START_TAG(link_c_ctn);
-       SURFXML_END_TAG(link_c_ctn);
+  radical_elements = xbt_str_split(struct_cluster->V_cluster_suffix, ".");
+  xbt_dynar_foreach(radical_elements, iter, groups) {
+    if (strcmp(groups, "")) {
+      char *old_suffix = new_suffix;
+      new_suffix = bprintf("%s\\.%s", old_suffix, groups);
+      free(old_suffix);
+    }
+  }
+
+  xbt_dynar_free(&radical_elements);
+  xbt_free(new_suffix);
+  xbt_free(availability_file);
+  xbt_free(state_file);
+
+  if( !strcmp(A_surfxml_cluster_state_file,"") || !strcmp(A_surfxml_cluster_availability_file,"") )
+         xbt_dict_free(&patterns);
 
-       DEBUG0("</route>");
-       SURFXML_END_TAG(route);
+  XBT_DEBUG("</AS>");
+  SURFXML_END_TAG(AS);
+  XBT_DEBUG(" ");
 
-       DEBUG0("</AS>");
-       SURFXML_END_TAG(AS);
-       DEBUG0(" ");
+  surfxml_bufferstack_pop(1);
 
-       surfxml_bufferstack_pop(1);
+//  xbt_dict_cursor_t cursor = NULL;
+//  char *key,*data;
+//
+//  XBT_INFO("\n");
+//  xbt_dict_foreach(cluster_host_link,cursor,key,data){
+//       XBT_INFO("%s : %s",key,data);
+//  }
+}
+/*
+ * This function take a string and replace parameters from patterns dict.
+ * It returns the new value.
+ */
+static char* replace_random_parameter(char * string)
+{
+  char *test_string = NULL;
+
+  if(xbt_dict_size(random_value)==0)
+    return string;
+
+  string = xbt_str_varsubst(string, patterns); // for patterns of cluster
+  test_string = bprintf("${%s}", string);
+  test_string = xbt_str_varsubst(test_string,random_value); //Add ${xxxxx} for random Generator
+
+  if (strcmp(test_string,"")) { //if not empty, keep this value.
+    xbt_free(string);
+    string = test_string;
+  } //In other case take old value (without ${})
+  else
+       free(test_string);
+  return string;
+}
+
+static void clean_routing_after_parse(void)
+{
+       xbt_dict_free(&random_value);
+       xbt_dict_free(&patterns);
+}
+
+static void routing_parse_Speer(void)
+{
+  static int AX_ptr = 0;
+  char *host_id = NULL;
+  char *router_id, *link_router, *link_backbone, *link_id_up, *link_id_down;
+
+  static unsigned int surfxml_buffer_stack_stack_ptr = 1;
+  static unsigned int surfxml_buffer_stack_stack[1024];
+
+  surfxml_buffer_stack_stack[0] = 0;
+
+  surfxml_bufferstack_push(1);
+
+  SURFXML_BUFFER_SET(AS_id, struct_peer->V_peer_id);
+
+  SURFXML_BUFFER_SET(AS_routing, "Full");
+  XBT_DEBUG("<AS id=\"%s\"\trouting=\"Full\">", struct_peer->V_peer_id);
+
+  SURFXML_START_TAG(AS);
+
+  XBT_DEBUG(" ");
+  host_id = bprintf("peer_%s", struct_peer->V_peer_id);
+  router_id = bprintf("router_%s", struct_peer->V_peer_id);
+  link_id_up = bprintf("link_%s_up", struct_peer->V_peer_id);
+  link_id_down = bprintf("link_%s_down", struct_peer->V_peer_id);
+
+  link_router = bprintf("%s_link_router", struct_peer->V_peer_id);
+  link_backbone = bprintf("%s_backbone", struct_peer->V_peer_id);
+
+  XBT_DEBUG("<host\tid=\"%s\"\tpower=\"%s\"/>", host_id, struct_peer->V_peer_power);
+  A_surfxml_host_state = A_surfxml_host_state_ON;
+  SURFXML_BUFFER_SET(host_id, host_id);
+  SURFXML_BUFFER_SET(host_power, struct_peer->V_peer_power);
+  SURFXML_BUFFER_SET(host_availability, "1.0");
+  SURFXML_BUFFER_SET(host_availability_file, struct_peer->V_peer_availability_trace);
+  SURFXML_BUFFER_SET(host_state_file, struct_peer->V_peer_state_trace);
+  SURFXML_BUFFER_SET(host_coordinates, "");
+  SURFXML_BUFFER_SET(host_core, "1.0");
+  SURFXML_START_TAG(host);
+  SURFXML_END_TAG(host);
+
+  XBT_DEBUG("<router id=\"%s\"\tcoordinates=\"%s\"/>", router_id, struct_peer->V_peer_coord);
+  SURFXML_BUFFER_SET(router_id, router_id);
+  SURFXML_BUFFER_SET(router_coordinates, struct_peer->V_peer_coord);
+  SURFXML_START_TAG(router);
+  SURFXML_END_TAG(router);
+
+  XBT_DEBUG("<link\tid=\"%s\"\tbw=\"%s\"\tlat=\"%s\"/>", link_id_up, struct_peer->V_peer_bw_in, struct_peer->V_peer_lat);
+  A_surfxml_link_state = A_surfxml_link_state_ON;
+  A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
+  SURFXML_BUFFER_SET(link_id, link_id_up);
+  SURFXML_BUFFER_SET(link_bandwidth, struct_peer->V_peer_bw_in);
+  SURFXML_BUFFER_SET(link_latency, struct_peer->V_peer_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_DEBUG("<link\tid=\"%s\"\tbw=\"%s\"\tlat=\"%s\"/>", link_id_down, struct_peer->V_peer_bw_out, struct_peer->V_peer_lat);
+  A_surfxml_link_state = A_surfxml_link_state_ON;
+  A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
+  SURFXML_BUFFER_SET(link_id, link_id_down);
+  SURFXML_BUFFER_SET(link_bandwidth, struct_peer->V_peer_bw_out);
+  SURFXML_BUFFER_SET(link_latency, struct_peer->V_peer_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_DEBUG(" ");
+
+  // begin here
+  XBT_DEBUG("<route\tsrc=\"%s\"\tdst=\"%s\"", host_id, router_id);
+  XBT_DEBUG("symmetrical=\"NO\">");
+  SURFXML_BUFFER_SET(route_src, host_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\"/>", link_id_up);
+  SURFXML_BUFFER_SET(link_ctn_id, link_id_up);
+  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);
+
+  //Opposite Route
+  XBT_DEBUG("<route\tsrc=\"%s\"\tdst=\"%s\"", router_id, host_id);
+  XBT_DEBUG("symmetrical=\"NO\">");
+  SURFXML_BUFFER_SET(route_src, router_id);
+  SURFXML_BUFFER_SET(route_dst, host_id);
+  A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_NO;
+  SURFXML_START_TAG(route);
+
+  XBT_DEBUG("<link_ctn\tid=\"%s\"/>", link_id_down);
+  SURFXML_BUFFER_SET(link_ctn_id, link_id_down);
+  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);
+
+  XBT_DEBUG("</AS>");
+  SURFXML_END_TAG(AS);
+  XBT_DEBUG(" ");
+
+  //xbt_dynar_free(&tab_elements_num);
+       free(host_id);
+       free(router_id);
+       free(link_router);
+       free(link_backbone);
+       free(link_id_up);
+       free(link_id_down);
+  surfxml_bufferstack_pop(1);
+}
+
+static void routing_parse_Srandom(void)
+{
+         double mean, std, min, max, seed;
+         char *random_id = A_surfxml_random_id;
+         char *random_radical = A_surfxml_random_radical;
+         char *rd_name = NULL;
+         char *rd_value;
+         surf_parse_get_double(&mean,A_surfxml_random_mean);
+         surf_parse_get_double(&std,A_surfxml_random_std_deviation);
+         surf_parse_get_double(&min,A_surfxml_random_min);
+         surf_parse_get_double(&max,A_surfxml_random_max);
+         surf_parse_get_double(&seed,A_surfxml_random_seed);
+
+         double res = 0;
+         int i = 0;
+         random_data_t random = xbt_new0(s_random_data_t, 1);
+          char *tmpbuf;
+
+         xbt_dynar_t radical_elements;
+         unsigned int iter;
+         char *groups;
+         int start, end;
+         xbt_dynar_t radical_ends;
+
+         random->generator = A_surfxml_random_generator;
+         random->seed = seed;
+         random->min = min;
+         random->max = max;
+
+         /* Check user stupidities */
+         if (max < min)
+           THROWF(arg_error, 0, "random->max < random->min (%f < %f)", max, min);
+         if (mean < min)
+           THROWF(arg_error, 0, "random->mean < random->min (%f < %f)", mean,
+                  min);
+         if (mean > max)
+           THROWF(arg_error, 0, "random->mean > random->max (%f > %f)", mean,
+                  max);
+
+         /* normalize the mean and standard deviation before storing */
+         random->mean = (mean - min) / (max - min);
+         random->std = std / (max - min);
+
+         if (random->mean * (1 - random->mean) < random->std * random->std)
+           THROWF(arg_error, 0, "Invalid mean and standard deviation (%f and %f)",
+                  random->mean, random->std);
+
+         XBT_DEBUG("id = '%s' min = '%f' max = '%f' mean = '%f' std_deviatinon = '%f' generator = '%d' seed = '%ld' radical = '%s'",
+         random_id,
+         random->min,
+         random->max,
+         random->mean,
+         random->std,
+         random->generator,
+         random->seed,
+         random_radical);
+
+         if(xbt_dict_size(random_value)==0)
+                 random_value = xbt_dict_new();
+
+         if(!strcmp(random_radical,""))
+         {
+                 res = random_generate(random);
+                 rd_value = bprintf("%f",res);
+                 xbt_dict_set(random_value, random_id, rd_value, free);
+         }
+         else
+         {
+                 radical_elements = xbt_str_split(random_radical, ",");
+                 xbt_dynar_foreach(radical_elements, iter, groups) {
+                       radical_ends = xbt_str_split(groups, "-");
+                       switch (xbt_dynar_length(radical_ends)) {
+                       case 1:
+                                         xbt_assert(!xbt_dict_get_or_null(random_value,random_id),"Custom Random '%s' already exists !",random_id);
+                                         res = random_generate(random);
+                                          tmpbuf = bprintf("%s%d",random_id,atoi(xbt_dynar_getfirst_as(radical_ends,char *)));
+                                          xbt_dict_set(random_value, tmpbuf, bprintf("%f",res), free);
+                                          xbt_free(tmpbuf);
+                                         break;
+
+                       case 2:   surf_parse_get_int(&start,
+                                                                                xbt_dynar_get_as(radical_ends, 0, char *));
+                                         surf_parse_get_int(&end, xbt_dynar_get_as(radical_ends, 1, char *));
+                                         for (i = start; i <= end; i++) {
+                                                 xbt_assert(!xbt_dict_get_or_null(random_value,random_id),"Custom Random '%s' already exists !",bprintf("%s%d",random_id,i));
+                                                 res = random_generate(random);
+                          tmpbuf = bprintf("%s%d",random_id,i);
+                                                 xbt_dict_set(random_value, tmpbuf, bprintf("%f",res), free);
+                          xbt_free(tmpbuf);
+                                         }
+                                         break;
+                       default:
+                               XBT_INFO("Malformed radical");
+                               break;
+                       }
+                       res = random_generate(random);
+                       rd_name  = bprintf("%s_router",random_id);
+                       rd_value = bprintf("%f",res);
+                       xbt_dict_set(random_value, rd_name, rd_value, free);
+
+                       xbt_dynar_free(&radical_ends);
+                 }
+                 free(rd_name);
+                 xbt_dynar_free(&radical_elements);
+         }
+}
+
+static void routing_parse_Erandom(void)
+{
+       /*xbt_dict_cursor_t cursor = NULL;
+       char *key;
+       char *elem;
+
+       xbt_dict_foreach(random_value, cursor, key, elem) {
+         XBT_DEBUG("%s = %s",key,elem);
+       }
+*/
+}
+
+/*
+ * New methods to init the routing model component from the lua script
+ */
+
+
+/*
+ * add a host to the network element list
+ */
+
+void routing_add_host(const char *host_id)
+{
+  parse_S_host_lua((char *) host_id, (char*)""); // FIXME propagate coordinate system to lua
+}
+
+/*
+ * Set a new link on the actual list of link for a route or ASroute
+ */
+void routing_add_link(const char *link_id)
+{
+  parse_E_link_c_ctn_new_elem_lua((char *) link_id);
+}
+
+/*
+ *Set the endpoints for a route
+ */
+void routing_set_route(const char *src_id, const char *dst_id)
+{
+  parse_S_route_new_and_endpoints_lua(src_id, dst_id);
+}
+
+/*
+ * Store the route by calling parse_E_route_store_route
+ */
+void routing_store_route(void)
+{
+  parse_E_route_store_route();
 }