Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
[routing] rename routing_global_t -> routing_platf_t (and friends)
[simgrid.git] / src / surf / surf_routing_floyd.c
index fc8d664..4207401 100644 (file)
@@ -7,95 +7,85 @@
 #include "surf_routing_private.h"
 
 /* Global vars */
-extern routing_global_t global_routing;
-extern routing_component_t current_routing;
-extern routing_model_description_t current_routing_model;
+extern routing_platf_t routing_platf;
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_floyd, surf, "Routing part of surf");
 
-#define TO_FLOYD_COST(i,j) (routing->cost_table)[(i)+(j)*table_size]
-#define TO_FLOYD_PRED(i,j) (routing->predecessor_table)[(i)+(j)*table_size]
-#define TO_FLOYD_LINK(i,j) (routing->link_table)[(i)+(j)*table_size]
+#define TO_FLOYD_COST(i,j) (as->cost_table)[(i)+(j)*table_size]
+#define TO_FLOYD_PRED(i,j) (as->predecessor_table)[(i)+(j)*table_size]
+#define TO_FLOYD_LINK(i,j) (as->link_table)[(i)+(j)*table_size]
 
 /* Routing model structure */
 
 typedef struct {
-  s_routing_component_t generic_routing;
+  s_as_t generic_routing;
   /* vars for calculate the floyd algorith. */
   int *predecessor_table;
   double *cost_table;
-  route_extended_t *link_table; /* char* -> int* */
-} s_routing_component_floyd_t, *routing_component_floyd_t;
+  route_t *link_table;
+} s_as_floyd_t, *as_floyd_t;
 
-static route_extended_t floyd_get_route(routing_component_t rc,
-                                        const char *src, const char *dst);
+static void floyd_get_route_and_latency(AS_t asg, sg_routing_edge_t src, sg_routing_edge_t dst,
+    route_t res, double *lat);
 
 /* Business methods */
-static xbt_dynar_t floyd_get_onelink_routes(routing_component_t rc)
+static xbt_dynar_t floyd_get_onelink_routes(AS_t asg)
 {
   xbt_dynar_t ret = xbt_dynar_new(sizeof(onelink_t), xbt_free);
-
-  routing_component_floyd_t routing = (routing_component_floyd_t) rc;
-  //size_t table_size = xbt_dict_length(routing->generic_routing.to_index);
-  xbt_dict_cursor_t c1 = NULL, c2 = NULL;
-  char *k1, *d1, *k2, *d2;
-  xbt_dict_foreach(routing->generic_routing.to_index, c1, k1, d1) {
-    xbt_dict_foreach(routing->generic_routing.to_index, c2, k2, d2) {
-      route_extended_t route = floyd_get_route(rc, k1, k2);
-      if (route) {
-        if (xbt_dynar_length(route->generic_route.link_list) == 1) {
-          void *link =
-              *(void **) xbt_dynar_get_ptr(route->generic_route.link_list,
-                                           0);
-          onelink_t onelink = xbt_new0(s_onelink_t, 1);
-          onelink->link_ptr = link;
-          if (routing->generic_routing.hierarchy == SURF_ROUTING_BASE) {
-            onelink->src = xbt_strdup(k1);
-            onelink->dst = xbt_strdup(k2);
-          } else if (routing->generic_routing.hierarchy ==
-                     SURF_ROUTING_RECURSIVE) {
-            onelink->src = xbt_strdup(route->src_gateway);
-            onelink->dst = xbt_strdup(route->dst_gateway);
-          }
-          xbt_dynar_push(ret, &onelink);
+  route_t route =   xbt_new0(s_route_t, 1);
+  route->link_list = xbt_dynar_new(sizeof(sg_routing_link_t), NULL);
+
+  int src,dst;
+  sg_routing_edge_t src_elm, dst_elm;
+  int table_size = xbt_dynar_length(asg->index_network_elm);
+  for(src=0; src < table_size; src++) {
+    for(dst=0; dst< table_size; dst++) {
+      xbt_dynar_reset(route->link_list);
+      src_elm = xbt_dynar_get_as(asg->index_network_elm,src,sg_routing_edge_t);
+      dst_elm = xbt_dynar_get_as(asg->index_network_elm,dst,sg_routing_edge_t);
+      floyd_get_route_and_latency(asg, src_elm, dst_elm, route, NULL);
+
+      if (xbt_dynar_length(route->link_list) == 1) {
+        void *link = *(void **) xbt_dynar_get_ptr(route->link_list, 0);
+        onelink_t onelink = xbt_new0(s_onelink_t, 1);
+        onelink->link_ptr = link;
+        if (asg->hierarchy == SURF_ROUTING_BASE) {
+          onelink->src = src_elm;
+          onelink->dst = dst_elm;
+        } else if (asg->hierarchy == SURF_ROUTING_RECURSIVE) {
+          onelink->src = route->src_gateway;
+          onelink->dst = route->dst_gateway;
         }
+        xbt_dynar_push(ret, &onelink);
       }
     }
   }
+
   return ret;
 }
 
-static route_extended_t floyd_get_route(routing_component_t rc,
-                                        const char *src, const char *dst)
+static void floyd_get_route_and_latency(AS_t asg, sg_routing_edge_t src, sg_routing_edge_t dst,
+    route_t res, double *lat)
 {
-  xbt_assert(rc && src
-              && dst,
-              "Invalid params for \"get_route\" function at AS \"%s\"",
-              rc->name);
 
   /* set utils vars */
-  routing_component_floyd_t routing = (routing_component_floyd_t) rc;
-  size_t table_size = xbt_dict_length(routing->generic_routing.to_index);
+  as_floyd_t as = (as_floyd_t)asg;
+  size_t table_size = xbt_dynar_length(asg->index_network_elm);
 
-  generic_src_dst_check(rc, src, dst);
-  int *src_id = xbt_dict_get_or_null(routing->generic_routing.to_index, src);
-  int *dst_id = xbt_dict_get_or_null(routing->generic_routing.to_index, dst);
-  xbt_assert(src_id
-              && dst_id,
-              "Ask for route \"from\"(%s)  or \"to\"(%s) no found in the local table",
-              src, dst);
+  generic_src_dst_check(asg, src, dst);
+  int *src_id = &(src->id);
+  int *dst_id = &(dst->id);
+  if (src_id == NULL || dst_id == NULL)
+    THROWF(arg_error,0,"No route from '%s' to '%s'",
+        src->name,
+        dst->name);
 
   /* 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, *first_gw = NULL;
+  sg_routing_edge_t gw_src, gw_dst, prev_gw_src, first_gw;
   unsigned int cpt;
   void *link;
   xbt_dynar_t links;
@@ -106,275 +96,275 @@ static route_extended_t floyd_get_route(routing_component_t rc,
     if (pred == -1)             /* if no pred in route -> no route to host */
       break;
     xbt_assert(TO_FLOYD_LINK(pred, prev_pred),
-                "Invalid link for the route between \"%s\" or \"%s\"", src,
-                dst);
+        "Invalid link for the route between \"%s\" or \"%s\"",
+        src->name,
+        dst->name);
 
     prev_gw_src = gw_src;
 
-    route_extended_t e_route = TO_FLOYD_LINK(pred, prev_pred);
+    route_t e_route = TO_FLOYD_LINK(pred, prev_pred);
     gw_src = e_route->src_gateway;
     gw_dst = e_route->dst_gateway;
 
     if (first)
       first_gw = gw_dst;
 
-    if (rc->hierarchy == SURF_ROUTING_RECURSIVE && !first
-        && strcmp(gw_dst, prev_gw_src)) {
-      xbt_dynar_t e_route_as_to_as =
-          (*(global_routing->get_route)) (gw_dst, prev_gw_src);
-      xbt_assert(e_route_as_to_as, "no route between \"%s\" and \"%s\"",
-                  gw_dst, prev_gw_src);
+    if (asg->hierarchy == SURF_ROUTING_RECURSIVE && !first
+        && strcmp(gw_dst->name, prev_gw_src->name)) {
+      xbt_dynar_t e_route_as_to_as;
+      e_route_as_to_as = xbt_dynar_new(sizeof(sg_routing_link_t), NULL);
+      routing_get_route_and_latency(gw_dst, prev_gw_src,&e_route_as_to_as,NULL);
       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);
+        xbt_dynar_insert_at(res->link_list, pos, &link);
+        if (lat)
+          *lat += surf_network_model->extension.network.get_link_latency(link);
         pos++;
       }
+      xbt_dynar_free(&e_route_as_to_as);
     }
 
-    links = e_route->generic_route.link_list;
+    links = e_route->link_list;
     xbt_dynar_foreach(links, cpt, link) {
-      xbt_dynar_unshift(new_e_route->generic_route.link_list, &link);
+      xbt_dynar_unshift(res->link_list, &link);
+      if (lat)
+        *lat += surf_network_model->extension.network.get_link_latency(link);
     }
     first = 0;
 
   } while (pred != *src_id);
-  xbt_assert(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);
+  if (pred == -1)
+    THROWF(arg_error,0,"No route from '%s' to '%s'",
+        src->name,
+        dst->name);
+
+  if (asg->hierarchy == SURF_ROUTING_RECURSIVE) {
+    res->src_gateway = gw_src;
+    res->dst_gateway = first_gw;
   }
-
-  return new_e_route;
 }
 
-static void floyd_finalize(routing_component_t rc)
+static void floyd_finalize(AS_t rc)
 {
-  routing_component_floyd_t routing = (routing_component_floyd_t) rc;
+  as_floyd_t as = (as_floyd_t) rc;
   int i, j;
   size_t table_size;
-  if (routing) {
-    table_size = xbt_dict_length(routing->generic_routing.to_index);
+  if (as) {
+    table_size = xbt_dynar_length(as->generic_routing.index_network_elm);
     /* 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);
+        generic_free_route(TO_FLOYD_LINK(i, j));
+    xbt_free(as->link_table);
     /* Delete bypass dict */
-    xbt_dict_free(&routing->generic_routing.bypassRoutes);
-    /* Delete index dict */
-    xbt_dict_free(&(routing->generic_routing.to_index));
-    /* Delete dictionary index dict, predecessor and links table */
-    xbt_free(routing->predecessor_table);
-    /* Delete structure */
-    xbt_free(rc);
+    xbt_dict_free(&as->generic_routing.bypassRoutes);
+    /* Delete predecessor and cost table */
+    xbt_free(as->predecessor_table);
+    xbt_free(as->cost_table);
+
+    model_generic_finalize(rc);
   }
 }
 
-routing_component_t model_floyd_create(void)
+AS_t model_floyd_create(void)
 {
-  routing_component_floyd_t new_component = (routing_component_floyd_t)routmod_generic_create(sizeof(s_routing_component_floyd_t));
+  as_floyd_t new_component = (as_floyd_t)model_generic_create_sized(sizeof(s_as_floyd_t));
   new_component->generic_routing.parse_route = model_floyd_parse_route;
   new_component->generic_routing.parse_ASroute = model_floyd_parse_route;
-  new_component->generic_routing.get_route = floyd_get_route;
+  new_component->generic_routing.get_route_and_latency = floyd_get_route_and_latency;
   new_component->generic_routing.get_onelink_routes =
       floyd_get_onelink_routes;
   new_component->generic_routing.finalize = floyd_finalize;
-  return (routing_component_t)new_component;
+  return (AS_t)new_component;
 }
 
-void model_floyd_end(void)
+void model_floyd_end(AS_t current_routing)
 {
 
-       routing_component_floyd_t routing =
-         ((routing_component_floyd_t) current_routing);
-
-       unsigned int i, j, a, b, c;
-
-       /* set the size of table routing */
-       size_t table_size = xbt_dict_length(routing->generic_routing.to_index);
-
-       if(!routing->link_table)
-       {
-               /* Create Cost, Predecessor and Link tables */
-               routing->cost_table = xbt_new0(double, table_size * table_size);       /* link cost from host to host */
-               routing->predecessor_table = xbt_new0(int, table_size * table_size);  /* predecessor host numbers */
-               routing->link_table = xbt_new0(route_extended_t, table_size * table_size);    /* actual link between src and dst */
-
-               /* Initialize costs and predecessors */
-               for (i = 0; i < table_size; i++)
-               for (j = 0; j < table_size; j++) {
-                 TO_FLOYD_COST(i, j) = DBL_MAX;
-                 TO_FLOYD_PRED(i, j) = -1;
-                 TO_FLOYD_LINK(i, j) = NULL;       /* fixed, missing in the previous version */
-               }
-       }
-
-       /* Add the loopback if needed */
-       if (current_routing->hierarchy == SURF_ROUTING_BASE) {
-               for (i = 0; i < table_size; i++) {
-                 route_extended_t e_route = TO_FLOYD_LINK(i, i);
-                 if (!e_route) {
-                       e_route = xbt_new0(s_route_extended_t, 1);
-                       e_route->src_gateway = NULL;
-                       e_route->dst_gateway = NULL;
-                       e_route->generic_route.link_list =
-                               xbt_dynar_new(global_routing->size_of_link, NULL);
-                       xbt_dynar_push(e_route->generic_route.link_list,
-                                                  &global_routing->loopback);
-                       TO_FLOYD_LINK(i, i) = e_route;
-                       TO_FLOYD_PRED(i, i) = i;
-                       TO_FLOYD_COST(i, i) = 1;
-                 }
-               }
-       }
-       /* Calculate path costs */
-       for (c = 0; c < table_size; c++) {
-               for (a = 0; a < table_size; a++) {
-                 for (b = 0; b < table_size; b++) {
-                       if (TO_FLOYD_COST(a, c) < DBL_MAX && TO_FLOYD_COST(c, b) < DBL_MAX) {
-                         if (TO_FLOYD_COST(a, b) == DBL_MAX ||
-                                 (TO_FLOYD_COST(a, c) + TO_FLOYD_COST(c, b) <
-                                  TO_FLOYD_COST(a, b))) {
-                               TO_FLOYD_COST(a, b) =
-                                       TO_FLOYD_COST(a, c) + TO_FLOYD_COST(c, b);
-                               TO_FLOYD_PRED(a, b) = TO_FLOYD_PRED(c, b);
-                         }
-                       }
-                 }
-               }
-       }
+  as_floyd_t as =
+      ((as_floyd_t) current_routing);
+
+  unsigned int i, j, a, b, c;
+
+  /* set the size of table routing */
+  size_t table_size = xbt_dynar_length(as->generic_routing.index_network_elm);
+
+  if(!as->link_table)
+  {
+    /* Create Cost, Predecessor and Link tables */
+    as->cost_table = xbt_new0(double, table_size * table_size);       /* link cost from host to host */
+    as->predecessor_table = xbt_new0(int, table_size * table_size);  /* predecessor host numbers */
+    as->link_table = xbt_new0(route_t, table_size * table_size);    /* actual link between src and dst */
+
+    /* Initialize costs and predecessors */
+    for (i = 0; i < table_size; i++)
+      for (j = 0; j < table_size; j++) {
+        TO_FLOYD_COST(i, j) = DBL_MAX;
+        TO_FLOYD_PRED(i, j) = -1;
+        TO_FLOYD_LINK(i, j) = NULL;       /* fixed, missing in the previous version */
+      }
+  }
+
+  /* Add the loopback if needed */
+  if (routing_platf->loopback && current_routing->hierarchy == SURF_ROUTING_BASE) {
+    for (i = 0; i < table_size; i++) {
+      route_t e_route = TO_FLOYD_LINK(i, i);
+      if (!e_route) {
+        e_route = xbt_new0(s_route_t, 1);
+        e_route->src_gateway = NULL;
+        e_route->dst_gateway = NULL;
+        e_route->link_list = xbt_dynar_new(sizeof(sg_routing_link_t), NULL);
+        xbt_dynar_push(e_route->link_list, &routing_platf->loopback);
+        TO_FLOYD_LINK(i, i) = e_route;
+        TO_FLOYD_PRED(i, i) = i;
+        TO_FLOYD_COST(i, i) = 1;
+      }
+    }
+  }
+  /* Calculate path costs */
+  for (c = 0; c < table_size; c++) {
+    for (a = 0; a < table_size; a++) {
+      for (b = 0; b < table_size; b++) {
+        if (TO_FLOYD_COST(a, c) < DBL_MAX && TO_FLOYD_COST(c, b) < DBL_MAX) {
+          if (TO_FLOYD_COST(a, b) == DBL_MAX ||
+              (TO_FLOYD_COST(a, c) + TO_FLOYD_COST(c, b) <
+                  TO_FLOYD_COST(a, b))) {
+            TO_FLOYD_COST(a, b) =
+                TO_FLOYD_COST(a, c) + TO_FLOYD_COST(c, b);
+            TO_FLOYD_PRED(a, b) = TO_FLOYD_PRED(c, b);
+          }
+        }
+      }
+    }
+  }
 }
 
-static int surf_pointer_resource_cmp(const void *a, const void *b) {
+static int floyd_pointer_resource_cmp(const void *a, const void *b) {
   return a != b;
 }
 
 //FIXME: kill dupplicates in next function with full routing
 
-void model_floyd_parse_route(routing_component_t rc, const char *src,
-        const char *dst, name_route_extended_t route)
+void model_floyd_parse_route(AS_t rc, const char *src,
+    const char *dst, route_t route)
 {
-       routing_component_floyd_t routing = (routing_component_floyd_t) rc;
-
-       /* set the size of table routing */
-       size_t table_size = xbt_dict_length(rc->to_index);
-       int *src_id, *dst_id;
-       int i,j;
-
-       src_id = xbt_dict_get_or_null(rc->to_index, src);
-       dst_id = xbt_dict_get_or_null(rc->to_index, dst);
-
-       xbt_assert(src_id, "Network elements %s not found", src);
-       xbt_assert(dst_id, "Network elements %s not found", dst);
-
-       if(!routing->link_table)
-       {
-               /* Create Cost, Predecessor and Link tables */
-               routing->cost_table = xbt_new0(double, table_size * table_size);       /* link cost from host to host */
-               routing->predecessor_table = xbt_new0(int, table_size * table_size);  /* predecessor host numbers */
-               routing->link_table = xbt_new0(route_extended_t, table_size * table_size);    /* actual link between src and dst */
-
-               /* Initialize costs and predecessors */
-               for (i = 0; i < table_size; i++)
-               for (j = 0; j < table_size; j++) {
-                 TO_FLOYD_COST(i, j) = DBL_MAX;
-                 TO_FLOYD_PRED(i, j) = -1;
-                 TO_FLOYD_LINK(i, j) = NULL;       /* fixed, missing in the previous version */
-               }
-       }
-
-       if(TO_FLOYD_LINK(*src_id, *dst_id))
-       {
-               if(!route->dst_gateway && !route->src_gateway)
-                       XBT_DEBUG("See Route from \"%s\" to \"%s\"", src, dst);
-               else
-                       XBT_DEBUG("See ASroute from \"%s(%s)\" to \"%s(%s)\"", src,
-                                route->src_gateway, dst, route->dst_gateway);
-               char * link_name;
-               unsigned int cpt;
-               xbt_dynar_t link_route_to_test = xbt_dynar_new(global_routing->size_of_link, NULL);
-               xbt_dynar_foreach(route->generic_route.link_list,cpt,link_name)
-               {
-                       void *link = xbt_lib_get_or_null(link_lib, link_name, SURF_LINK_LEVEL);
-                       xbt_assert(link,"Link : '%s' doesn't exists.",link_name);
-                       xbt_dynar_push(link_route_to_test,&link);
-               }
-               xbt_assert(!xbt_dynar_compare(
-                         (void*)TO_FLOYD_LINK(*src_id, *dst_id)->generic_route.link_list,
-                         (void*)link_route_to_test,
-                         (int_f_cpvoid_cpvoid_t) surf_pointer_resource_cmp),
-                         "The route between \"%s\" and \"%s\" already exists", src,dst);
-       }
-       else
-       {
-               if(!route->dst_gateway && !route->src_gateway)
-                 XBT_DEBUG("Load Route from \"%s\" to \"%s\"", src, dst);
-               else{
-                       XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src,
-                                route->src_gateway, dst, route->dst_gateway);
-                       if(global_routing->get_network_element_type((const char*)route->dst_gateway) == SURF_NETWORK_ELEMENT_NULL)
-                               xbt_die("The dst_gateway '%s' does not exist!",route->dst_gateway);
-                       if(global_routing->get_network_element_type((const char*)route->src_gateway) == SURF_NETWORK_ELEMENT_NULL)
-                               xbt_die("The src_gateway '%s' does not exist!",route->src_gateway);
-               }
-           TO_FLOYD_LINK(*src_id, *dst_id) =
-                       generic_new_extended_route(rc->hierarchy, route, 1);
-           TO_FLOYD_PRED(*src_id, *dst_id) = *src_id;
-           TO_FLOYD_COST(*src_id, *dst_id) =
-                       ((TO_FLOYD_LINK(*src_id, *dst_id))->generic_route.link_list)->used;   /* count of links, old model assume 1 */
-       }
-
-       if( A_surfxml_route_symmetrical == A_surfxml_route_symmetrical_YES
-               || A_surfxml_ASroute_symmetrical == A_surfxml_ASroute_symmetrical_YES )
-       {
-               if(TO_FLOYD_LINK(*dst_id, *src_id))
-               {
-                       if(!route->dst_gateway && !route->src_gateway)
-                         XBT_DEBUG("See Route from \"%s\" to \"%s\"", dst, src);
-                       else
-                         XBT_DEBUG("See ASroute from \"%s(%s)\" to \"%s(%s)\"", dst,
-                                        route->src_gateway, src, route->dst_gateway);
-                       char * link_name;
-                       unsigned int i;
-                       xbt_dynar_t link_route_to_test = xbt_dynar_new(global_routing->size_of_link, NULL);
-                       for(i=xbt_dynar_length(route->generic_route.link_list) ;i>0 ;i--)
-                       {
-                               link_name = xbt_dynar_get_as(route->generic_route.link_list,i-1,void *);
-                               void *link = xbt_lib_get_or_null(link_lib, link_name, SURF_LINK_LEVEL);
-                               xbt_assert(link,"Link : '%s' doesn't exists.",link_name);
-                               xbt_dynar_push(link_route_to_test,&link);
-                       }
-                       xbt_assert(!xbt_dynar_compare(
-                                 (void*)TO_FLOYD_LINK(*dst_id, *src_id)->generic_route.link_list,
-                             (void*)link_route_to_test,
-                                 (int_f_cpvoid_cpvoid_t) surf_pointer_resource_cmp),
-                                 "The route between \"%s\" and \"%s\" already exists", src,dst);
-               }
-               else
-               {
-                       if(route->dst_gateway && route->src_gateway)
-                       {
-                          char *gw_src = xbt_strdup(route->src_gateway);
-                          char *gw_dst = xbt_strdup(route->dst_gateway);
-                          route->src_gateway = gw_dst;
-                          route->dst_gateway = gw_src;
-                       }
-
-                       if(!route->dst_gateway && !route->src_gateway)
-                         XBT_DEBUG("Load Route from \"%s\" to \"%s\"", dst, src);
-                       else
-                         XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", dst,
-                                        route->src_gateway, src, route->dst_gateway);
-
-                   TO_FLOYD_LINK(*dst_id, *src_id) =
-                               generic_new_extended_route(rc->hierarchy, route, 0);
-                   TO_FLOYD_PRED(*dst_id, *src_id) = *dst_id;
-                   TO_FLOYD_COST(*dst_id, *src_id) =
-                               ((TO_FLOYD_LINK(*dst_id, *src_id))->generic_route.link_list)->used;   /* count of links, old model assume 1 */
-               }
-       }
+  int as_route = 0;
+  as_floyd_t as = (as_floyd_t) rc;
+
+  /* set the size of table routing */
+  size_t table_size = xbt_dynar_length(rc->index_network_elm);
+  sg_routing_edge_t src_net_elm, dst_net_elm;
+
+  src_net_elm = sg_routing_edge_by_name_or_null(src);
+  dst_net_elm = sg_routing_edge_by_name_or_null(dst);
+
+  xbt_assert(src_net_elm, "Network elements %s not found", src);
+  xbt_assert(dst_net_elm, "Network elements %s not found", dst);
+
+  if(!as->link_table)
+  {
+    int i,j;
+    /* Create Cost, Predecessor and Link tables */
+    as->cost_table = xbt_new0(double, table_size * table_size);       /* link cost from host to host */
+    as->predecessor_table = xbt_new0(int, table_size * table_size);  /* predecessor host numbers */
+    as->link_table = xbt_new0(route_t, table_size * table_size);    /* actual link between src and dst */
+
+    /* Initialize costs and predecessors */
+    for (i = 0; i < table_size; i++)
+      for (j = 0; j < table_size; j++) {
+        TO_FLOYD_COST(i, j) = DBL_MAX;
+        TO_FLOYD_PRED(i, j) = -1;
+        TO_FLOYD_LINK(i, j) = NULL;       /* fixed, missing in the previous version */
+      }
+  }
+  if(!route->dst_gateway && !route->src_gateway)
+    XBT_DEBUG("Load Route from \"%s\" to \"%s\"", src, dst);
+  else{
+    as_route = 1;
+    XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src,
+        route->src_gateway->name, dst, route->dst_gateway->name);
+    if(route->dst_gateway->rc_type == SURF_NETWORK_ELEMENT_NULL)
+      xbt_die("The dst_gateway '%s' does not exist!",route->dst_gateway->name);
+    if(route->src_gateway->rc_type == SURF_NETWORK_ELEMENT_NULL)
+      xbt_die("The src_gateway '%s' does not exist!",route->src_gateway->name);
+  }
+
+  if(TO_FLOYD_LINK(src_net_elm->id, dst_net_elm->id))
+  {
+
+    char * link_name;
+    unsigned int cpt;
+    xbt_dynar_t link_route_to_test = xbt_dynar_new(sizeof(sg_routing_link_t), NULL);
+    xbt_dynar_foreach(route->link_list,cpt,link_name)
+    {
+      void *link = xbt_lib_get_or_null(link_lib, link_name, SURF_LINK_LEVEL);
+      xbt_assert(link,"Link : '%s' doesn't exists.",link_name);
+      xbt_dynar_push(link_route_to_test,&link);
+    }
+    xbt_assert(!xbt_dynar_compare(
+        (void*)TO_FLOYD_LINK(src_net_elm->id, dst_net_elm->id)->link_list,
+        (void*)link_route_to_test,
+        (int_f_cpvoid_cpvoid_t) floyd_pointer_resource_cmp),
+        "The route between \"%s\" and \"%s\" already exists", src,dst);
+  }
+  else
+  {
+    TO_FLOYD_LINK(src_net_elm->id, dst_net_elm->id) =
+        generic_new_extended_route(rc->hierarchy, route, 1);
+    TO_FLOYD_PRED(src_net_elm->id, dst_net_elm->id) = src_net_elm->id;
+    TO_FLOYD_COST(src_net_elm->id, dst_net_elm->id) =
+        ((TO_FLOYD_LINK(src_net_elm->id, dst_net_elm->id))->link_list)->used;   /* count of links, old model assume 1 */
+  }
+
+  if ( (A_surfxml_route_symmetrical == A_surfxml_route_symmetrical_YES && as_route == 0)
+      || (A_surfxml_ASroute_symmetrical == A_surfxml_ASroute_symmetrical_YES && as_route == 1)
+  )
+  {
+    if(TO_FLOYD_LINK(dst_net_elm->id, src_net_elm->id))
+    {
+      if(!route->dst_gateway && !route->src_gateway)
+        XBT_DEBUG("See Route from \"%s\" to \"%s\"", dst, src);
+      else
+        XBT_DEBUG("See ASroute from \"%s(%s)\" to \"%s(%s)\"", dst,
+            route->src_gateway->name, src, route->dst_gateway->name);
+      char * link_name;
+      unsigned int i;
+      xbt_dynar_t link_route_to_test = xbt_dynar_new(sizeof(sg_routing_link_t), NULL);
+      for(i=xbt_dynar_length(route->link_list) ;i>0 ;i--)
+      {
+        link_name = xbt_dynar_get_as(route->link_list,i-1,void *);
+        void *link = xbt_lib_get_or_null(link_lib, link_name, SURF_LINK_LEVEL);
+        xbt_assert(link,"Link : '%s' doesn't exists.",link_name);
+        xbt_dynar_push(link_route_to_test,&link);
+      }
+      xbt_assert(!xbt_dynar_compare(
+          (void*)TO_FLOYD_LINK(dst_net_elm->id, src_net_elm->id)->link_list,
+          (void*)link_route_to_test,
+          (int_f_cpvoid_cpvoid_t) floyd_pointer_resource_cmp),
+          "The route between \"%s\" and \"%s\" already exists", src,dst);
+    }
+    else
+    {
+      if(route->dst_gateway && route->src_gateway)
+      {
+        sg_routing_edge_t gw_src = route->src_gateway;
+        sg_routing_edge_t gw_dst = route->dst_gateway;
+        route->src_gateway = gw_dst;
+        route->dst_gateway = gw_src;
+      }
+
+      if(!route->dst_gateway && !route->src_gateway)
+        XBT_DEBUG("Load Route from \"%s\" to \"%s\"", dst, src);
+      else
+        XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", dst,
+            route->src_gateway->name, src, route->dst_gateway->name);
+
+      TO_FLOYD_LINK(dst_net_elm->id, src_net_elm->id) =
+          generic_new_extended_route(rc->hierarchy, route, 0);
+      TO_FLOYD_PRED(dst_net_elm->id, src_net_elm->id) = dst_net_elm->id;
+      TO_FLOYD_COST(dst_net_elm->id, src_net_elm->id) =
+          ((TO_FLOYD_LINK(dst_net_elm->id, src_net_elm->id))->link_list)->used;   /* count of links, old model assume 1 */
+    }
+  }
 }