Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
bug fix: typo found by David
[simgrid.git] / src / surf / surf_routing.c
index 077027a..9c7d787 100644 (file)
@@ -1,26 +1,84 @@
-/* Copyright (c) 2009 The SimGrid team. All rights reserved.                */
+/* 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 "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");// FIXME: connect this under windows
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route,surf,"Routing part of surf");
 
+routing_t used_routing = NULL;
+xbt_dict_t onelink_routes = NULL;
+
+/* Prototypes of each model */
+static void routing_model_full_create(size_t size_of_link,void *loopback);
+static void routing_model_floyd_create(size_t size_of_link, void*loopback);
+static void routing_model_dijkstra_create(size_t size_of_link, void*loopback);
+static void routing_model_dijkstracache_create(size_t size_of_link, void*loopback);
+static void routing_model_none_create(size_t size_of_link, void*loopback);
+
+/* Definition of each model */
+struct model_type {
+  const char *name;
+  const char *desc;
+  void (*fun)(size_t,void*);
+};
+struct model_type models[] =
+{ {"Full", "Full routing data (fast, large memory requirements, fully expressive)", routing_model_full_create },
+  {"Floyd", "Floyd routing data (slow initialization, fast lookup, lesser memory requirements, shortest path routing only)", routing_model_floyd_create },
+  {"Dijkstra", "Dijkstra routing data (fast initialization, slow lookup, small memory requirements, shortest path routing only)", routing_model_dijkstra_create },
+  {"DijkstraCache", "Dijkstra routing data (fast initialization, fast lookup, small memory requirements, shortest path routing only)", routing_model_dijkstracache_create },
+  {"none", "No routing (usable with Constant network only)", routing_model_none_create },
+    {NULL,NULL,NULL}};
+
+
+void routing_model_create(size_t size_of_links, void* loopback) {
+
+  char * wanted=xbt_cfg_get_string(_surf_cfg_set,"routing");
+  int cpt;
+  for (cpt=0;models[cpt].name;cpt++) {
+    if (!strcmp(wanted,models[cpt].name)) {
+      (*(models[cpt].fun))(size_of_links,loopback);
+      return;
+    }
+  }
+  fprintf(stderr,"Routing model %s not found. Existing models:\n",wanted);
+  for (cpt=0;models[cpt].name;cpt++)
+    if (!strcmp(wanted,models[cpt].name))
+      fprintf(stderr,"   %s: %s\n",models[cpt].name,models[cpt].desc);
+  exit(1);
+}
+
+/* ************************************************************************** */
+/* *************************** FULL ROUTING ********************************* */
 typedef struct {
   s_routing_t generic_routing;
   xbt_dynar_t *routing_table;
   void *loopback;
   size_t size_of_link;
-}s_routing_full_t,*routing_full_t;
-
-routing_t used_routing = NULL;
-/* ************************************************************************** */
-/* *************************** FULL ROUTING ********************************* */
+} s_routing_full_t,*routing_full_t;
 
 #define ROUTE_FULL(i,j) ((routing_full_t)used_routing)->routing_table[(i)+(j)*(used_routing)->host_count]
+#define HOST2ROUTER(id) ((id)+(2<<29))
+#define ROUTER2HOST(id) ((id)-(2<<29))
+#define ISROUTER(id) ((id)>=(2<<29))
+
+/*
+ * Free the onelink routes
+ */
+static void onelink_route_elem_free(void *e) {
+  s_onelink_t tmp = (s_onelink_t)e;
+  if(tmp) {
+    free(tmp);
+  }
+}
 
 /*
  * Parsing
@@ -30,7 +88,23 @@ static void routing_full_parse_Shost(void) {
   DEBUG2("Seen host %s (#%d)",A_surfxml_host_id,used_routing->host_count);
   *val = used_routing->host_count++;
   xbt_dict_set(used_routing->host_id,A_surfxml_host_id,val,xbt_free);
+#ifdef HAVE_TRACING
+  TRACE_surf_host_define_id (A_surfxml_host_id, *val);
+#endif
+}
+
+static void routing_full_parse_Srouter(void) {
+       int *val = xbt_malloc(sizeof(int));
+  DEBUG3("Seen router %s (%d -> #%d)",A_surfxml_router_id,used_routing->router_count,
+               HOST2ROUTER(used_routing->router_count));
+  *val = HOST2ROUTER(used_routing->router_count++);
+  xbt_dict_set(used_routing->host_id,A_surfxml_router_id,val,xbt_free);
+#ifdef HAVE_TRACING
+  TRACE_surf_host_define_id (A_surfxml_host_id, *val);
+  TRACE_surf_host_declaration (A_surfxml_host_id, 0);
+#endif
 }
+
 static int src_id = -1;
 static int dst_id = -1;
 static void routing_full_parse_Sroute_set_endpoints(void)
@@ -50,6 +124,162 @@ static void routing_full_parse_Eroute(void)
   }
 }
 
+/* Cluster tag functions */
+
+static void routing_full_parse_change_cpu_data(const char *hostName,
+                                  const char *surfxml_host_power,
+                                  const char *surfxml_host_availability,
+                                  const char *surfxml_host_availability_file,
+                                  const char *surfxml_host_state_file)
+{
+  int AX_ptr = 0;
+
+  SURFXML_BUFFER_SET(host_id, hostName);
+  SURFXML_BUFFER_SET(host_power, surfxml_host_power /*hostPower */ );
+  SURFXML_BUFFER_SET(host_availability, surfxml_host_availability);
+  SURFXML_BUFFER_SET(host_availability_file, surfxml_host_availability_file);
+  SURFXML_BUFFER_SET(host_state_file, surfxml_host_state_file);
+}
+
+static void routing_full_parse_change_link_data(const char *linkName,
+                                   const char *surfxml_link_bandwidth,
+                                   const char *surfxml_link_bandwidth_file,
+                                   const char *surfxml_link_latency,
+                                   const char *surfxml_link_latency_file,
+                                   const char *surfxml_link_state_file)
+{
+  int AX_ptr = 0;
+
+  SURFXML_BUFFER_SET(link_id, linkName);
+  SURFXML_BUFFER_SET(link_bandwidth, surfxml_link_bandwidth);
+  SURFXML_BUFFER_SET(link_bandwidth_file, surfxml_link_bandwidth_file);
+  SURFXML_BUFFER_SET(link_latency, surfxml_link_latency);
+  SURFXML_BUFFER_SET(link_latency_file, surfxml_link_latency_file);
+  SURFXML_BUFFER_SET(link_state_file, surfxml_link_state_file);
+}
+
+static void routing_full_parse_Scluster(void)
+{
+  static int AX_ptr = 0;
+
+  char *cluster_id = A_surfxml_cluster_id;
+  char *cluster_prefix = A_surfxml_cluster_prefix;
+  char *cluster_suffix = A_surfxml_cluster_suffix;
+  char *cluster_radical = A_surfxml_cluster_radical;
+  char *cluster_power = A_surfxml_cluster_power;
+  char *cluster_bw = A_surfxml_cluster_bw;
+  char *cluster_lat = A_surfxml_cluster_lat;
+  char *cluster_bb_bw = A_surfxml_cluster_bb_bw;
+  char *cluster_bb_lat = A_surfxml_cluster_bb_lat;
+  char *backbone_name;
+  unsigned int it1,it2;
+  char *name1,*name2;
+  xbt_dynar_t names = NULL;
+  surfxml_bufferstack_push(1);
+
+  /* Make set a set to parse the prefix/suffix/radical into a neat list of names */
+  DEBUG4("Make <set id='%s' prefix='%s' suffix='%s' radical='%s'>",
+      cluster_id,cluster_prefix,cluster_suffix,cluster_radical);
+  SURFXML_BUFFER_SET(set_id, cluster_id);
+  SURFXML_BUFFER_SET(set_prefix, cluster_prefix);
+  SURFXML_BUFFER_SET(set_suffix, cluster_suffix);
+  SURFXML_BUFFER_SET(set_radical, cluster_radical);
+
+  SURFXML_START_TAG(set);
+  SURFXML_END_TAG(set);
+
+  names = xbt_dict_get(set_list,cluster_id);
+
+  xbt_dynar_foreach(names,it1,name1) {
+    /* create the host */
+    routing_full_parse_change_cpu_data(name1, cluster_power, "1.0", "", "");
+    A_surfxml_host_state = A_surfxml_host_state_ON;
+
+    SURFXML_START_TAG(host);
+    SURFXML_END_TAG(host);
+
+    /* Here comes the link */
+    routing_full_parse_change_link_data(name1, cluster_bw, "", cluster_lat, "", "");
+    A_surfxml_link_state = A_surfxml_link_state_ON;
+    A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
+
+    SURFXML_START_TAG(link);
+    SURFXML_END_TAG(link);
+  }
+
+  /* Make backbone link */
+  backbone_name = bprintf("%s_bb", cluster_id);
+  routing_full_parse_change_link_data(backbone_name, cluster_bb_bw, "", cluster_bb_lat, "",
+                         "");
+  A_surfxml_link_state = A_surfxml_link_state_ON;
+  A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FATPIPE;
+
+  SURFXML_START_TAG(link);
+  SURFXML_END_TAG(link);
+
+  /* And now the internal routes */
+  xbt_dynar_foreach(names,it1,name1) {
+    xbt_dynar_foreach(names,it2,name2) {
+      if (strcmp(name1,name2)) {
+        A_surfxml_route_action = A_surfxml_route_action_POSTPEND;
+        SURFXML_BUFFER_SET(route_src,name1);
+        SURFXML_BUFFER_SET(route_dst,name2);
+        SURFXML_START_TAG(route); {
+          /* FIXME: name1 link is added by error about 20 lines below, so don't add it here
+          SURFXML_BUFFER_SET(link_c_ctn_id, name1);
+          SURFXML_START_TAG(link_c_ctn);
+          SURFXML_END_TAG(link_c_ctn);
+           */
+          SURFXML_BUFFER_SET(link_c_ctn_id, backbone_name);
+          SURFXML_START_TAG(link_c_ctn);
+          SURFXML_END_TAG(link_c_ctn);
+
+          SURFXML_BUFFER_SET(link_c_ctn_id, name2);
+          SURFXML_START_TAG(link_c_ctn);
+          SURFXML_END_TAG(link_c_ctn);
+
+        } SURFXML_END_TAG(route);
+      }
+    }
+  }
+
+  /* Make route multi with the outside world, i.e. cluster->$* */
+
+  /* FIXME
+   * This also adds an elements to the routes within the cluster,
+   * and I guess it's wrong, but since this element is commented out in the above
+   * code creating the internal routes, we're good.
+   * To fix it, I'd say that we need a way to understand "$*-${cluster_id}" as "whole world, but the guys in that cluster"
+   * But for that, we need to install a real expression parser for src/dst attributes
+   *
+   * FIXME
+   * This also adds a dumb element (the private link) in place of the loopback. Then, since
+   * the loopback is added only if no link to self already exist, this fails.
+   * That's really dumb.
+   *
+   * FIXME
+   * It seems to me that it does not add the backbone to the path to outside world...
+   */
+  SURFXML_BUFFER_SET(route_c_multi_src, cluster_id);
+  SURFXML_BUFFER_SET(route_c_multi_dst, "$*");
+  A_surfxml_route_c_multi_symmetric = A_surfxml_route_c_multi_symmetric_NO;
+  A_surfxml_route_c_multi_action = A_surfxml_route_c_multi_action_PREPEND;
+
+  SURFXML_START_TAG(route_c_multi);
+
+  SURFXML_BUFFER_SET(link_c_ctn_id, "$src");
+
+  SURFXML_START_TAG(link_c_ctn);
+  SURFXML_END_TAG(link_c_ctn);
+
+  SURFXML_END_TAG(route_c_multi);
+
+  free(backbone_name);
+
+  /* Restore buff */
+  surfxml_bufferstack_pop(1);
+}
+
 
 static void routing_full_parse_end(void) {
   routing_full_t routing = (routing_full_t) used_routing;
@@ -80,10 +310,29 @@ static void routing_full_parse_end(void) {
     dst_id = strtol(xbt_dynar_get_as(keys, 1, char *), &end, 16);
     xbt_dynar_free(&keys);
 
+    if(xbt_dynar_length(links) == 1){
+      s_onelink_t new_link = (s_onelink_t) xbt_malloc0(sizeof(s_onelink));
+      new_link->src_id = src_id;
+      new_link->dst_id = dst_id;
+      link_name = xbt_dynar_getfirst_as(links, char*);
+      new_link->link_ptr = xbt_dict_get_or_null(surf_network_model->resource_set, link_name);
+      DEBUG3("Adding onelink route from (#%d) to (#%d), link_name %s",src_id, dst_id, link_name);
+      xbt_dict_set(onelink_routes, link_name, (void *)new_link, onelink_route_elem_free);
+#ifdef HAVE_TRACING
+      TRACE_surf_link_save_endpoints (link_name, src_id, dst_id);
+#endif
+    }
+
+    if(ISROUTER(src_id) || ISROUTER(dst_id)) {
+                               DEBUG2("There is route with a router here: (%d ,%d)",src_id,dst_id);
+                               /* Check there is only one link in the route and store the information */
+                               continue;
+    }
+
     DEBUG4("Handle %d %d (from %d hosts): %ld links",
         src_id,dst_id,routing->generic_routing.host_count,xbt_dynar_length(links));
     xbt_dynar_foreach(links, cpt, link_name) {
-      void* link = xbt_dict_get_or_null(link_set, link_name);
+      void* link = xbt_dict_get_or_null(surf_network_model->resource_set, link_name);
       if (link)
         xbt_dynar_push(ROUTE_FULL(src_id,dst_id),&link);
       else
@@ -106,9 +355,18 @@ static void routing_full_parse_end(void) {
  * Business methods
  */
 static xbt_dynar_t routing_full_get_route(int src,int dst) {
+  xbt_assert0(!(ISROUTER(src) || ISROUTER(dst)), "Ask for route \"from\" or \"to\" a router node");
   return ROUTE_FULL(src,dst);
 }
 
+static xbt_dict_t routing_full_get_onelink_routes(void){
+  return onelink_routes;
+}
+
+static int routing_full_is_router(int id){
+       return ISROUTER(id);
+}
+
 static void routing_full_finalize(void) {
   routing_full_t routing = (routing_full_t)used_routing;
   int i,j;
@@ -119,31 +377,678 @@ static void routing_full_finalize(void) {
         xbt_dynar_free(&ROUTE_FULL(i, j));
     free(routing->routing_table);
     xbt_dict_free(&used_routing->host_id);
+    xbt_dict_free(&onelink_routes);
     free(routing);
     routing=NULL;
   }
 }
 
-routing_t routing_model_full_create(size_t size_of_link,void *loopback) {
+static void routing_model_full_create(size_t size_of_link,void *loopback) {
   /* initialize our structure */
-  routing_full_t res = xbt_new0(s_routing_full_t,1);
-  res->generic_routing.name = "Full";
-  res->generic_routing.host_count = 0;
-  res->generic_routing.get_route = routing_full_get_route;
-  res->generic_routing.finalize = routing_full_finalize;
-  res->size_of_link = size_of_link;
-  res->loopback = loopback;
+  routing_full_t routing = xbt_new0(s_routing_full_t,1);
+  routing->generic_routing.name = "Full";
+  routing->generic_routing.host_count = 0;
+  routing->generic_routing.get_route = routing_full_get_route;
+  routing->generic_routing.get_onelink_routes = routing_full_get_onelink_routes;
+  routing->generic_routing.is_router = routing_full_is_router;
+  routing->generic_routing.finalize = routing_full_finalize;
+
+  routing->size_of_link = size_of_link;
+  routing->loopback = loopback;
 
   /* Set it in position */
-  used_routing = (routing_t) res;
+  used_routing = (routing_t) routing;
+
+  /* Set the dict for onehop routes */
+  onelink_routes =  xbt_dict_new();
 
   /* Setup the parsing callbacks we need */
-  used_routing->host_id = xbt_dict_new();
+  routing->generic_routing.host_id = xbt_dict_new();
   surfxml_add_callback(STag_surfxml_host_cb_list, &routing_full_parse_Shost);
+  surfxml_add_callback(STag_surfxml_router_cb_list, &routing_full_parse_Srouter);
   surfxml_add_callback(ETag_surfxml_platform_cb_list, &routing_full_parse_end);
   surfxml_add_callback(STag_surfxml_route_cb_list,
-                       &routing_full_parse_Sroute_set_endpoints);
+      &routing_full_parse_Sroute_set_endpoints);
+  surfxml_add_callback(ETag_surfxml_route_cb_list, &routing_full_parse_Eroute);
+  surfxml_add_callback(STag_surfxml_cluster_cb_list, &routing_full_parse_Scluster);
+}
+
+/* ************************************************************************** */
+
+static void routing_shortest_path_parse_Scluster(void)
+{
+  static int AX_ptr = 0;
+
+  char *cluster_id = A_surfxml_cluster_id;
+  char *cluster_prefix = A_surfxml_cluster_prefix;
+  char *cluster_suffix = A_surfxml_cluster_suffix;
+  char *cluster_radical = A_surfxml_cluster_radical;
+  char *cluster_power = A_surfxml_cluster_power;
+  char *cluster_bb_bw = A_surfxml_cluster_bb_bw;
+  char *cluster_bb_lat = A_surfxml_cluster_bb_lat;
+  char *backbone_name;
+
+  surfxml_bufferstack_push(1);
+
+  /* Make set */
+  SURFXML_BUFFER_SET(set_id, cluster_id);
+  SURFXML_BUFFER_SET(set_prefix, cluster_prefix);
+  SURFXML_BUFFER_SET(set_suffix, cluster_suffix);
+  SURFXML_BUFFER_SET(set_radical, cluster_radical);
+
+  SURFXML_START_TAG(set);
+  SURFXML_END_TAG(set);
+
+  /* Make foreach */
+  SURFXML_BUFFER_SET(foreach_set_id, cluster_id);
+
+  SURFXML_START_TAG(foreach);
+
+  /* Make host for the foreach */
+  routing_full_parse_change_cpu_data("$1", cluster_power, "1.0", "", "");
+  A_surfxml_host_state = A_surfxml_host_state_ON;
+
+  SURFXML_START_TAG(host);
+  SURFXML_END_TAG(host);
+
+  SURFXML_END_TAG(foreach);
+
+  /* Make backbone link */
+  backbone_name = bprintf("%s_bb", cluster_id);
+  routing_full_parse_change_link_data(backbone_name, cluster_bb_bw, "", cluster_bb_lat, "",
+                         "");
+  A_surfxml_link_state = A_surfxml_link_state_ON;
+  A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FATPIPE;
+
+  SURFXML_START_TAG(link);
+  SURFXML_END_TAG(link);
+
+  free(backbone_name);
+
+  /* Restore buff */
+  surfxml_bufferstack_pop(1);
+}
+
+/* ************************************************************************** */
+/* *************************** FLOYD ROUTING ********************************* */
+typedef struct {
+  s_routing_t generic_routing;
+  int *predecessor_table;
+  void** link_table;
+  xbt_dynar_t last_route;
+  void *loopback;
+  size_t size_of_link;
+} s_routing_floyd_t,*routing_floyd_t;
+
+#define FLOYD_COST(i,j) cost_table[(i)+(j)*(used_routing)->host_count]
+#define FLOYD_PRED(i,j) ((routing_floyd_t)used_routing)->predecessor_table[(i)+(j)*(used_routing)->host_count]
+#define FLOYD_LINK(i,j) ((routing_floyd_t)used_routing)->link_table[(i)+(j)*(used_routing)->host_count]
+
+static void routing_floyd_parse_end(void) {
+
+  routing_floyd_t routing = (routing_floyd_t) used_routing;
+  int nb_link = 0;
+  void* link_list = NULL;
+  double * cost_table;
+  xbt_dict_cursor_t cursor = NULL;
+  char *key,*data, *end;
+  const char *sep = "#";
+  xbt_dynar_t links, keys;
+
+  unsigned int i,j;
+  unsigned int a,b,c;
+  int host_count = routing->generic_routing.host_count;
+  char * link_name = NULL;
+  void * link = NULL;
+
+  /* Create Cost, Predecessor and Link tables */
+  cost_table = xbt_new0(double, host_count * host_count); //link cost from host to host
+  routing->predecessor_table = xbt_new0(int, host_count*host_count); //predecessor host numbers
+  routing->link_table = xbt_new0(void*,host_count*host_count); //actual link between src and dst
+  routing->last_route = xbt_dynar_new(routing->size_of_link, NULL);
+
+  /* Initialize costs and predecessors*/
+  for(i = 0; i<host_count;i++)
+    for(j = 0; j<host_count;j++) {
+        FLOYD_COST(i,j) = DBL_MAX;
+        FLOYD_PRED(i,j) = -1;
+    }
+
+   /* Put the routes in position */
+  xbt_dict_foreach(route_table, cursor, key, data) {
+    nb_link = 0;
+    links = (xbt_dynar_t)data;
+    keys = xbt_str_split_str(key, sep);
+
+    
+    src_id = strtol(xbt_dynar_get_as(keys, 0, char*), &end, 16);
+    dst_id = strtol(xbt_dynar_get_as(keys, 1, char*), &end, 16);
+    xbt_dynar_free(&keys);
+    DEBUG4("Handle %d %d (from %d hosts): %ld links",
+        src_id,dst_id,routing->generic_routing.host_count,xbt_dynar_length(links));
+    xbt_assert3(xbt_dynar_length(links) == 1, "%ld links in route between host %d and %d, should be 1", xbt_dynar_length(links), src_id, dst_id);
+    
+    link_name = xbt_dynar_getfirst_as(links, char*);
+    link = xbt_dict_get_or_null(surf_network_model->resource_set, link_name);
+
+    if (link)
+      link_list = link;
+    else
+      THROW1(mismatch_error,0,"Link %s not found", link_name);
+    
+
+    FLOYD_LINK(src_id,dst_id) = link_list;
+    FLOYD_PRED(src_id, dst_id) = src_id;
+
+    //link cost
+    FLOYD_COST(src_id, dst_id) = 1; // assume 1 for now
+
+  }
+
+    /* Add the loopback if needed */
+  for (i = 0; i < host_count; i++)
+    if (!FLOYD_PRED(i, i)) {
+      FLOYD_PRED(i, i) = i;
+      FLOYD_COST(i, i) = 1;
+      FLOYD_LINK(i, i) = routing->loopback;
+    }
+
+
+  //Calculate path costs 
+
+  for(c=0;c<host_count;c++) {
+    for(a=0;a<host_count;a++) {
+      for(b=0;b<host_count;b++) {
+        if(FLOYD_COST(a,c) < DBL_MAX && FLOYD_COST(c,b) < DBL_MAX) {
+          if(FLOYD_COST(a,b) == DBL_MAX || (FLOYD_COST(a,c)+FLOYD_COST(c,b) < FLOYD_COST(a,b))) {
+            FLOYD_COST(a,b) = FLOYD_COST(a,c)+FLOYD_COST(c,b);
+            FLOYD_PRED(a,b) = FLOYD_PRED(c,b);
+          }
+        }
+      }
+    }
+  }
+
+  //cleanup
+  free(cost_table);
+}
+
+/*
+ * Business methods
+ */
+static xbt_dynar_t routing_floyd_get_route(int src_id,int dst_id) {
+
+  routing_floyd_t routing = (routing_floyd_t) used_routing;
+
+  int pred = dst_id;
+  int prev_pred = 0;
+
+  xbt_dynar_reset(routing->last_route);
+
+  do {
+    prev_pred = pred;
+    pred = FLOYD_PRED(src_id, pred);
+
+    if(pred == -1) // if no pred in route -> no route to host
+        break;
+
+    xbt_dynar_unshift(routing->last_route, &FLOYD_LINK(pred,prev_pred));
+
+  } while(pred != src_id);
+
+  xbt_assert2(pred != -1, "no route from host %d to %d", src_id, dst_id);
+
+  return routing->last_route;
+}
+
+static void routing_floyd_finalize(void) {
+  routing_floyd_t routing = (routing_floyd_t)used_routing;
+
+  if (routing) {
+    free(routing->link_table);
+    free(routing->predecessor_table);
+    xbt_dynar_free(&routing->last_route);
+    xbt_dict_free(&used_routing->host_id);
+    free(routing);
+    routing=NULL;
+  }
+}
+
+static xbt_dict_t routing_floyd_get_onelink_routes(void){
+  xbt_assert0(0,"The get_onelink_routes feature is not supported in routing model Floyd");
+}
+
+static int routing_floyd_is_router(int id){
+  xbt_assert0(0,"The get_is_router feature is not supported in routing model Floyd");
+}
+
+static void routing_model_floyd_create(size_t size_of_link,void *loopback) {
+  /* initialize our structure */
+  routing_floyd_t routing = xbt_new0(s_routing_floyd_t,1);
+  routing->generic_routing.name = "Floyd";
+  routing->generic_routing.host_count = 0;
+  routing->generic_routing.host_id = xbt_dict_new();
+  routing->generic_routing.get_route = routing_floyd_get_route;
+  routing->generic_routing.get_onelink_routes = routing_floyd_get_onelink_routes;
+  routing->generic_routing.is_router = routing_floyd_is_router;
+  routing->generic_routing.finalize = routing_floyd_finalize;
+  routing->size_of_link = size_of_link;
+  routing->loopback = loopback;
+
+  /* Set it in position */
+  used_routing = (routing_t) routing;
+  
+  /* Setup the parsing callbacks we need */
+  surfxml_add_callback(STag_surfxml_host_cb_list, &routing_full_parse_Shost);
+  surfxml_add_callback(ETag_surfxml_platform_cb_list, &routing_floyd_parse_end);
+  surfxml_add_callback(STag_surfxml_route_cb_list, 
+      &routing_full_parse_Sroute_set_endpoints);
+  surfxml_add_callback(ETag_surfxml_route_cb_list, &routing_full_parse_Eroute);
+  surfxml_add_callback(STag_surfxml_cluster_cb_list, &routing_shortest_path_parse_Scluster);
+  
+}
+
+/* ************************************************************************** */
+/* ********** Dijkstra & Dijkstra Cached ROUTING **************************** */
+typedef struct {
+  s_routing_t generic_routing;
+  xbt_graph_t route_graph;
+  xbt_dict_t graph_node_map;
+  xbt_dict_t route_cache;
+  xbt_dynar_t last_route;
+  int cached;
+  void *loopback;
+  size_t size_of_link;
+} s_routing_dijkstra_t,*routing_dijkstra_t;
+
+
+typedef struct graph_node_data {
+  int id; 
+  int graph_id; //used for caching internal graph id's
+} s_graph_node_data_t, * graph_node_data_t;
+
+typedef struct graph_node_map_element {
+  xbt_node_t node;
+} s_graph_node_map_element_t, * graph_node_map_element_t;
+
+typedef struct route_cache_element {
+  int * pred_arr;
+  int size;
+} s_route_cache_element_t, * route_cache_element_t;    
+
+/*
+ * Free functions
+ */
+static void route_cache_elem_free(void *e) {
+  route_cache_element_t elm=(route_cache_element_t)e;
+
+  if (elm) {
+    free(elm->pred_arr);
+    free(elm);
+  }
+}
+
+static void graph_node_map_elem_free(void *e) {
+  graph_node_map_element_t elm = (graph_node_map_element_t)e;
+
+  if(elm) {
+    free(elm);
+  }
+}
+
+/*
+ * Utility functions
+*/
+static xbt_node_t route_graph_new_node(int id, int graph_id) {
+  xbt_node_t node = NULL;
+  graph_node_data_t data = NULL;
+  graph_node_map_element_t elm = NULL;
+  routing_dijkstra_t routing = (routing_dijkstra_t) used_routing;
+
+  data = xbt_new0(struct graph_node_data, sizeof(struct graph_node_data));
+  data->id = id;
+  data->graph_id = graph_id;
+  node = xbt_graph_new_node(routing->route_graph, data);
+
+  elm = xbt_new0(struct graph_node_map_element, sizeof(struct graph_node_map_element));
+  elm->node = node;
+  xbt_dict_set_ext(routing->graph_node_map, (char*)(&id), sizeof(int), (xbt_set_elm_t)elm, &graph_node_map_elem_free);
+
+  return node;
+}
+
+static graph_node_map_element_t graph_node_map_search(int id) {
+  routing_dijkstra_t routing = (routing_dijkstra_t) used_routing;
+
+  graph_node_map_element_t elm = (graph_node_map_element_t)xbt_dict_get_or_null_ext(routing->graph_node_map, (char*)(&id), sizeof(int));
+
+  return elm;
+}
+
+/*
+ * Parsing
+ */
+static void route_new_dijkstra(int src_id, int dst_id, void* link) {
+  routing_dijkstra_t routing = (routing_dijkstra_t) used_routing;
+
+  xbt_node_t src = NULL;
+  xbt_node_t dst = NULL;
+  graph_node_map_element_t src_elm = (graph_node_map_element_t)xbt_dict_get_or_null_ext(routing->graph_node_map, (char*)(&src_id), sizeof(int));
+  graph_node_map_element_t dst_elm = (graph_node_map_element_t)xbt_dict_get_or_null_ext(routing->graph_node_map, (char*)(&dst_id), sizeof(int));
+
+  if(src_elm)
+    src = src_elm->node;
+
+  if(dst_elm)
+    dst = dst_elm->node;
+
+  //add nodes if they don't exist in the graph
+  if(src_id == dst_id && src == NULL && dst == NULL) {
+    src = route_graph_new_node(src_id, -1);
+    dst = src;
+  } else {
+    if(src == NULL) {
+      src = route_graph_new_node(src_id, -1);
+    }
+       
+    if(dst == NULL) {
+      dst = route_graph_new_node(dst_id, -1);
+    }
+  }
+
+  //add link as edge to graph
+  xbt_graph_new_edge(routing->route_graph, src, dst, link);
+  
+}
+
+static void add_loopback_dijkstra(void) {
+  routing_dijkstra_t routing = (routing_dijkstra_t) used_routing;
+
+       xbt_dynar_t nodes = xbt_graph_get_nodes(routing->route_graph);
+       
+       xbt_node_t node = NULL;
+       unsigned int cursor2;
+       xbt_dynar_foreach(nodes, cursor2, node) {
+               xbt_dynar_t out_edges = xbt_graph_node_get_outedges(node); 
+               xbt_edge_t edge = NULL;
+               unsigned int cursor;
+       
+               int found = 0;
+               xbt_dynar_foreach(out_edges, cursor, edge) {
+                       xbt_node_t other_node = xbt_graph_edge_get_target(edge);
+                       if(other_node == node) {
+                               found = 1;
+                               break;
+                       }
+               }
+
+               if(!found)
+                       xbt_graph_new_edge(routing->route_graph, node, node, &routing->loopback);
+       }
+}
+
+static void routing_dijkstra_parse_end(void) {
+  routing_dijkstra_t routing = (routing_dijkstra_t) used_routing;
+  int nb_link = 0;
+  xbt_dict_cursor_t cursor = NULL;
+  char *key, *data, *end;
+  const char *sep = "#";
+  xbt_dynar_t links, keys;
+  char* link_name = NULL;
+  void* link = NULL;
+  xbt_node_t node = NULL;
+  unsigned int cursor2;
+  xbt_dynar_t nodes = NULL;
+  /* Create the topology graph */
+  routing->route_graph = xbt_graph_new_graph(1, NULL);
+  routing->graph_node_map = xbt_dict_new();
+  routing->last_route = xbt_dynar_new(routing->size_of_link, NULL);
+  if(routing->cached)
+    routing->route_cache = xbt_dict_new();
+
+
+  /* Put the routes in position */
+  xbt_dict_foreach(route_table, cursor, key, data) {
+    nb_link = 0;
+    links = (xbt_dynar_t) data;
+    keys = xbt_str_split_str(key, sep);
+
+    src_id = strtol(xbt_dynar_get_as(keys, 0, char *), &end, 16);
+    dst_id = strtol(xbt_dynar_get_as(keys, 1, char *), &end, 16);
+    xbt_dynar_free(&keys);
+
+    DEBUG4("Handle %d %d (from %d hosts): %ld links",
+        src_id,dst_id,routing->generic_routing.host_count,xbt_dynar_length(links));
+
+    xbt_assert3(xbt_dynar_length(links) == 1, "%ld links in route between host %d and %d, should be 1", xbt_dynar_length(links), src_id, dst_id);
+
+    link_name = xbt_dynar_getfirst_as(links, char*);
+    link = xbt_dict_get_or_null(surf_network_model->resource_set, link_name);
+    if (link)
+      route_new_dijkstra(src_id,dst_id,link);
+    else
+      THROW1(mismatch_error,0,"Link %s not found", link_name);
+    
+  }
+
+  /* Add the loopback if needed */
+  add_loopback_dijkstra();
+
+  /* initialize graph indexes in nodes after graph has been built */
+  nodes = xbt_graph_get_nodes(routing->route_graph);
+
+  xbt_dynar_foreach(nodes, cursor2, node) {
+    graph_node_data_t data = xbt_graph_node_get_data(node);
+    data->graph_id = cursor2;
+  }
+
+}
+
+/*
+ * Business methods
+ */
+static xbt_dynar_t routing_dijkstra_get_route(int src_id,int dst_id) {
+
+  routing_dijkstra_t routing = (routing_dijkstra_t) used_routing;
+  int * pred_arr = NULL;
+  int src_node_id = 0;
+  int dst_node_id = 0;
+  int * nodeid = NULL;
+  int v;
+  int size = 0;
+  void * link = NULL;
+  route_cache_element_t elm = NULL;
+  xbt_dynar_t nodes = xbt_graph_get_nodes(routing->route_graph);
+
+  /*Use the graph_node id mapping set to quickly find the nodes */
+  graph_node_map_element_t src_elm = graph_node_map_search(src_id);
+  graph_node_map_element_t dst_elm = graph_node_map_search(dst_id);
+  xbt_assert2(src_elm != NULL && dst_elm != NULL, "src %d or dst %d does not exist", src_id, dst_id);
+  src_node_id = ((graph_node_data_t)xbt_graph_node_get_data(src_elm->node))->graph_id;
+  dst_node_id = ((graph_node_data_t)xbt_graph_node_get_data(dst_elm->node))->graph_id;
+
+  if(routing->cached) {
+    /*check if there is a cached predecessor list avail */
+    elm = (route_cache_element_t)xbt_dict_get_or_null_ext(routing->route_cache, (char*)(&src_id), sizeof(int));
+  }
+
+  if(elm) { //cached mode and cache hit
+    pred_arr = elm->pred_arr;
+  } else { //not cached mode or cache miss
+    double * cost_arr = NULL;
+    xbt_heap_t pqueue = NULL;
+    int i = 0;
+
+    int nr_nodes = xbt_dynar_length(nodes);
+    cost_arr = xbt_new0(double, nr_nodes); //link cost from src to other hosts
+    pred_arr = xbt_new0(int, nr_nodes); //predecessors in path from src
+    pqueue = xbt_heap_new(nr_nodes, free);
+
+    //initialize
+    cost_arr[src_node_id] = 0.0;
+
+    for(i = 0; i < nr_nodes; i++) {
+      if(i != src_node_id) {
+        cost_arr[i] = DBL_MAX;
+      }
+
+      pred_arr[i] = 0;
+
+      //initialize priority queue
+      nodeid = xbt_new0(int, 1);
+      *nodeid = i;
+      xbt_heap_push(pqueue, nodeid, cost_arr[i]);
+
+    }
+
+    // apply dijkstra using the indexes from the graph's node array
+    while(xbt_heap_size(pqueue) > 0) {
+      int * v_id = xbt_heap_pop(pqueue);
+      xbt_node_t v_node = xbt_dynar_get_as(nodes, *v_id, xbt_node_t);
+      xbt_dynar_t out_edges = xbt_graph_node_get_outedges(v_node); 
+      xbt_edge_t edge = NULL;
+      unsigned int cursor;
+
+      xbt_dynar_foreach(out_edges, cursor, edge) {
+        xbt_node_t u_node = xbt_graph_edge_get_target(edge);
+        graph_node_data_t data = xbt_graph_node_get_data(u_node);
+        int u_id = data->graph_id;
+        int cost_v_u = 1; //fixed link cost for now
+
+        if(cost_v_u + cost_arr[*v_id] < cost_arr[u_id]) {
+          pred_arr[u_id] = *v_id;
+          cost_arr[u_id] = cost_v_u + cost_arr[*v_id];
+          nodeid = xbt_new0(int, 1);
+          *nodeid = u_id;
+          xbt_heap_push(pqueue, nodeid, cost_arr[u_id]);
+        }
+      }
+
+      //free item popped from pqueue
+      free(v_id);
+    }
+
+    free(cost_arr);
+    xbt_heap_free(pqueue);
+
+  }
+
+  //compose route path with links
+  xbt_dynar_reset(routing->last_route);
+
+  for(v = dst_node_id; v != src_node_id; v = pred_arr[v]) {
+    xbt_node_t node_pred_v = xbt_dynar_get_as(nodes, pred_arr[v], xbt_node_t);
+    xbt_node_t node_v = xbt_dynar_get_as(nodes, v, xbt_node_t);
+    xbt_edge_t edge = xbt_graph_get_edge(routing->route_graph, node_pred_v, node_v);
+
+    xbt_assert2(edge != NULL, "no route between host %d and %d", src_id, dst_id);
+
+    link = xbt_graph_edge_get_data(edge);
+    xbt_dynar_unshift(routing->last_route, &link);
+    size++;
+  }
+
+
+  if(routing->cached && elm == NULL) {
+    //add to predecessor list of the current src-host to cache
+    elm = xbt_new0(struct route_cache_element, sizeof(struct route_cache_element));
+    elm->pred_arr = pred_arr;
+    elm->size = size;
+    xbt_dict_set_ext(routing->route_cache, (char*)(&src_id), sizeof(int), (xbt_set_elm_t)elm, &route_cache_elem_free);
+  }
+
+  if(!routing->cached)
+    free(pred_arr);
+
+  return routing->last_route;
+}
+
+
+static void routing_dijkstra_finalize(void) {
+  routing_dijkstra_t routing = (routing_dijkstra_t)used_routing;
+
+  if (routing) {
+    xbt_graph_free_graph(routing->route_graph, &free, NULL, &free);
+    xbt_dict_free(&routing->graph_node_map);
+    if(routing->cached)
+      xbt_dict_free(&routing->route_cache);
+    xbt_dynar_free(&routing->last_route);
+    xbt_dict_free(&used_routing->host_id);
+    free(routing);
+    routing=NULL;
+  }
+}
+
+static xbt_dict_t routing_dijkstraboth_get_onelink_routes(void){
+  xbt_assert0(0,"The get_onelink_routes feature is not supported in routing model dijkstraboth");
+}
+
+static int routing_dijkstraboth_is_router(int id){
+  xbt_assert0(0,"The get_is_router feature is not supported in routing model dijkstraboth");
+}
+
+/*
+ *
+ */
+static void routing_model_dijkstraboth_create(size_t size_of_link,void *loopback, int cached) {
+  /* initialize our structure */
+  routing_dijkstra_t routing = xbt_new0(s_routing_dijkstra_t,1);
+  routing->generic_routing.name = "Dijkstra";
+  routing->generic_routing.host_count = 0;
+  routing->generic_routing.get_route = routing_dijkstra_get_route;
+  routing->generic_routing.get_onelink_routes = routing_dijkstraboth_get_onelink_routes;
+  routing->generic_routing.is_router = routing_dijkstraboth_is_router;
+  routing->generic_routing.finalize = routing_dijkstra_finalize;
+  routing->size_of_link = size_of_link;
+  routing->loopback = loopback;
+  routing->cached = cached;
+
+  /* Set it in position */
+  used_routing = (routing_t) routing;
+
+  /* Setup the parsing callbacks we need */
+  routing->generic_routing.host_id = xbt_dict_new();
+  surfxml_add_callback(STag_surfxml_host_cb_list, &routing_full_parse_Shost);
+  surfxml_add_callback(ETag_surfxml_platform_cb_list, &routing_dijkstra_parse_end);
+  surfxml_add_callback(STag_surfxml_route_cb_list,
+      &routing_full_parse_Sroute_set_endpoints);
   surfxml_add_callback(ETag_surfxml_route_cb_list, &routing_full_parse_Eroute);
+  surfxml_add_callback(STag_surfxml_cluster_cb_list, &routing_shortest_path_parse_Scluster);
+}
+
+static void routing_model_dijkstra_create(size_t size_of_link,void *loopback) {
+  routing_model_dijkstraboth_create(size_of_link, loopback, 0);
+}
+
+static void routing_model_dijkstracache_create(size_t size_of_link,void *loopback) {
+  routing_model_dijkstraboth_create(size_of_link, loopback, 1);
+}
 
-  return used_routing;
+/* ************************************************** */
+/* ********** NO ROUTING **************************** */
+
+
+static void routing_none_finalize(void) {
+  if (used_routing) {
+    xbt_dict_free(&used_routing->host_id);
+    free(used_routing);
+    used_routing=NULL;
+  }
+}
+
+static void routing_model_none_create(size_t size_of_link,void *loopback) {
+  routing_t routing = xbt_new0(s_routing_t,1);
+  INFO0("Null routing");
+  routing->name = "none";
+  routing->host_count = 0;
+  routing->host_id = xbt_dict_new();
+  routing->get_onelink_routes = NULL;
+  routing->is_router = NULL;
+  routing->get_route = NULL;
+
+  routing->finalize = routing_none_finalize;
+
+  /* Set it in position */
+  used_routing = (routing_t) routing;
 }