[SURF] Cosmetics - indented assignments in surf_routing.cpp.

[simgrid.git] / src / surf / surf_routing.cpp

diff --git a/src/surf/surf_routing.cpp b/src/surf/surf_routing.cpp
index b2e8bdb..4a381dc 100644 (file)
--- a/src/surf/surf_routing.cpp
+++ b/src/surf/surf_routing.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, 2010, 2011, 2013. The SimGrid Team.
+/* Copyright (c) 2009-2011, 2013-2014. The SimGrid Team.

  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it


@@ -8,26 +8,29 @@
 #include "surf_routing_private.hpp"
 #include "surf_routing_cluster.hpp"
 #include "surf_routing_cluster_torus.hpp"
 #include "surf_routing_private.hpp"
 #include "surf_routing_cluster.hpp"
 #include "surf_routing_cluster_torus.hpp"

-
+#include "surf_routing_cluster_fat_tree.hpp"

 
 #include "simgrid/platf_interface.h"    // platform creation API internal interface
 #include "simgrid/sg_config.h"
 
 #include "simgrid/platf_interface.h"    // platform creation API internal interface
 #include "simgrid/sg_config.h"

+#include "storage_interface.hpp"

 
 #include "surf/surfxml_parse_values.h"
 
 
 #include "surf/surfxml_parse_values.h"
 

+

 /**
  * @ingroup SURF_build_api
 /**
  * @ingroup SURF_build_api

- * @brief A library containing all known workstations
+ * @brief A library containing all known hosts

  */
 xbt_lib_t host_lib;
 
 int ROUTING_HOST_LEVEL;         //Routing level
 int SURF_CPU_LEVEL;             //Surf cpu level
  */
 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 SURF_HOST_LEVEL;            //Surf host level

 int SIMIX_HOST_LEVEL;           //Simix host level
 int SIMIX_STORAGE_LEVEL;        //Simix storage level
 int MSG_HOST_LEVEL;             //Msg host level
 int MSG_STORAGE_LEVEL;          //Msg storage level
 int SIMIX_HOST_LEVEL;           //Simix host level
 int SIMIX_STORAGE_LEVEL;        //Simix storage level
 int MSG_HOST_LEVEL;             //Msg host level
 int MSG_STORAGE_LEVEL;          //Msg storage level

+int MSG_FILE_LEVEL;             //Msg file level

 int SD_HOST_LEVEL;              //Simdag host level
 int SD_STORAGE_LEVEL;           //Simdag storage level
 int COORD_HOST_LEVEL=0;         //Coordinates level
 int SD_HOST_LEVEL;              //Simdag host level
 int SD_STORAGE_LEVEL;           //Simdag storage level
 int COORD_HOST_LEVEL=0;         //Coordinates level


@@ -40,7 +43,6 @@ 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
 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
 
 xbt_lib_t as_router_lib;
 int ROUTING_ASR_LEVEL;          //Routing level


@@ -53,7 +55,7 @@ static xbt_dict_t random_value = NULL;
 
 /** @brief Retrieve a routing edge from its name
  *
 
 /** @brief Retrieve a routing edge from its name
  *

- * Routing edges are either CPU/workstation and routers, whatever
+ * Routing edges are either host and routers, whatever

  */
 RoutingEdgePtr sg_routing_edge_by_name_or_null(const char *name) {
   RoutingEdgePtr net_elm = (RoutingEdgePtr) xbt_lib_get_or_null(host_lib, name, ROUTING_HOST_LEVEL);
  */
 RoutingEdgePtr sg_routing_edge_by_name_or_null(const char *name) {
   RoutingEdgePtr net_elm = (RoutingEdgePtr) xbt_lib_get_or_null(host_lib, name, ROUTING_HOST_LEVEL);


@@ -86,7 +88,7 @@ typedef enum {
   SURF_MODEL_VIVALDI,
   SURF_MODEL_CLUSTER,
   SURF_MODEL_TORUS_CLUSTER,
   SURF_MODEL_VIVALDI,
   SURF_MODEL_CLUSTER,
   SURF_MODEL_TORUS_CLUSTER,

-
+  SURF_MODEL_FAT_TREE_CLUSTER,

 } e_routing_types;
 
 struct s_model_type routing_models[] = {
 } e_routing_types;
 
 struct s_model_type routing_models[] = {


@@ -108,8 +110,10 @@ struct s_model_type routing_models[] = {
    model_vivaldi_create, NULL},
   {"Cluster", "Cluster routing",
    model_cluster_create, NULL},
    model_vivaldi_create, NULL},
   {"Cluster", "Cluster routing",
    model_cluster_create, NULL},

-   {"Torus_Cluster", "Torus Cluster routing",
-    model_torus_cluster_create, NULL},
+  {"Torus_Cluster", "Torus Cluster routing",
+   model_torus_cluster_create, NULL},
+  {"Fat_Tree_Cluster", "Fat Tree Cluster routing",
+   model_fat_tree_cluster_create, NULL},

   {NULL, NULL, NULL, NULL}
 };
 
   {NULL, NULL, NULL, NULL}
 };
 


@@ -135,12 +139,12 @@ static void parse_S_host_link(sg_platf_host_link_cbarg_t host)
     current_routing->p_linkUpDownList = xbt_dynar_new(sizeof(s_surf_parsing_link_up_down_t),NULL);
 
   // If dynar is is greater than edge id and if the host_link is already defined
     current_routing->p_linkUpDownList = xbt_dynar_new(sizeof(s_surf_parsing_link_up_down_t),NULL);
 
   // If dynar is is greater than edge id and if the host_link is already defined

-  if((int)xbt_dynar_length(current_routing->p_linkUpDownList) > info->m_id &&
-      xbt_dynar_get_as(current_routing->p_linkUpDownList, info->m_id, void*))
-    xbt_die("Host_link for '%s' is already defined!",host->id);
+  if((int)xbt_dynar_length(current_routing->p_linkUpDownList) > info->getId() &&
+      xbt_dynar_get_as(current_routing->p_linkUpDownList, info->getId(), void*))
+       surf_parse_error("Host_link for '%s' is already defined!",host->id);

 
 

-  XBT_DEBUG("Push Host_link for host '%s' to position %d", info->p_name, info->m_id);
-  xbt_dynar_set_as(current_routing->p_linkUpDownList, info->m_id, s_surf_parsing_link_up_down_t, link_up_down);
+  XBT_DEBUG("Push Host_link for host '%s' to position %d", info->getName(), info->getId());
+  xbt_dynar_set_as(current_routing->p_linkUpDownList, info->getId(), s_surf_parsing_link_up_down_t, link_up_down);

 }
 
 /**
 }
 
 /**


@@ -153,13 +157,13 @@ static void parse_S_host(sg_platf_host_cbarg_t host)
   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(!xbt_lib_get_or_null(host_lib, host->id, ROUTING_HOST_LEVEL),
              "Reading a host, processing unit \"%s\" already exists", host->id);
 

-  RoutingEdgePtr info = new RoutingEdge();
-  info->p_rcComponent = current_routing;
-  info->p_rcType = SURF_NETWORK_ELEMENT_HOST;
-  info->p_name = xbt_strdup(host->id);
-  info->m_id = current_routing->parsePU(info);
+  RoutingEdgePtr info = new RoutingEdgeImpl(xbt_strdup(host->id),
+                                                   -1,
+                                                   SURF_NETWORK_ELEMENT_HOST,
+                                                   current_routing);
+  info->setId(current_routing->parsePU(info));

   xbt_lib_set(host_lib, host->id, ROUTING_HOST_LEVEL, (void *) info);
   xbt_lib_set(host_lib, host->id, ROUTING_HOST_LEVEL, (void *) info);

-  XBT_DEBUG("Having set name '%s' id '%d'", host->id, info->m_id);
+  XBT_DEBUG("Having set name '%s' id '%d'", host->id, info->getId());

 
   if(mount_list){
     xbt_lib_set(storage_lib, host->id, ROUTING_STORAGE_HOST_LEVEL, (void *) mount_list);
 
   if(mount_list){
     xbt_lib_set(storage_lib, host->id, ROUTING_STORAGE_HOST_LEVEL, (void *) mount_list);


@@ -197,13 +201,13 @@ static void parse_S_router(sg_platf_router_cbarg_t router)
              "Reading a router, processing unit \"%s\" already exists",
              router->id);
 
              "Reading a router, processing unit \"%s\" already exists",
              router->id);
 

-  RoutingEdgePtr info = new RoutingEdge();
-  info->p_rcComponent = current_routing;
-  info->p_rcType = SURF_NETWORK_ELEMENT_ROUTER;
-  info->p_name = xbt_strdup(router->id);
-  info->m_id = current_routing->parsePU(info);
+  RoutingEdgePtr info = new RoutingEdgeImpl(xbt_strdup(router->id),
+                                            -1,
+                                            SURF_NETWORK_ELEMENT_ROUTER,
+                                            current_routing);
+  info->setId(current_routing->parsePU(info));

   xbt_lib_set(as_router_lib, router->id, ROUTING_ASR_LEVEL, (void *) info);
   xbt_lib_set(as_router_lib, router->id, ROUTING_ASR_LEVEL, (void *) info);

-  XBT_DEBUG("Having set name '%s' id '%d'", router->id, info->m_id);
+  XBT_DEBUG("Having set name '%s' id '%d'", router->id, info->getId());

 
   if (router->coord && strcmp(router->coord, "")) {
     unsigned int cursor;
 
   if (router->coord && strcmp(router->coord, "")) {
     unsigned int cursor;


@@ -319,7 +323,7 @@ static void routing_parse_trace_connect(sg_platf_trace_connect_cbarg_t trace_con
         xbt_strdup(trace_connect->element), NULL);
     break;
   default:
         xbt_strdup(trace_connect->element), NULL);
     break;
   default:

-    xbt_die("Cannot connect trace %s to %s: kind of trace unknown",
+       surf_parse_error("Cannot connect trace %s to %s: kind of trace unknown",

         trace_connect->trace, trace_connect->element);
     break;
   }
         trace_connect->trace, trace_connect->element);
     break;
   }


@@ -353,14 +357,15 @@ void routing_AS_begin(sg_platf_AS_cbarg_t AS)
 
   /* search the routing model */
   switch(AS->routing){
 
   /* search the routing model */
   switch(AS->routing){

-    case A_surfxml_AS_routing_Cluster:         model = &routing_models[SURF_MODEL_CLUSTER];break;
-    case A_surfxml_AS_routing_Cluster___torus: model = &routing_models[SURF_MODEL_TORUS_CLUSTER];break;
-    case A_surfxml_AS_routing_Dijkstra:        model = &routing_models[SURF_MODEL_DIJKSTRA];break;
-    case A_surfxml_AS_routing_DijkstraCache:   model = &routing_models[SURF_MODEL_DIJKSTRACACHE];break;
-    case A_surfxml_AS_routing_Floyd:           model = &routing_models[SURF_MODEL_FLOYD];break;
-    case A_surfxml_AS_routing_Full:            model = &routing_models[SURF_MODEL_FULL];break;
-    case A_surfxml_AS_routing_None:            model = &routing_models[SURF_MODEL_NONE];break;
-    case A_surfxml_AS_routing_Vivaldi:         model = &routing_models[SURF_MODEL_VIVALDI];break;
+    case A_surfxml_AS_routing_Cluster:               model = &routing_models[SURF_MODEL_CLUSTER];break;
+    case A_surfxml_AS_routing_Cluster___torus:       model = &routing_models[SURF_MODEL_TORUS_CLUSTER];break;
+    case A_surfxml_AS_routing_Cluster___fat___tree:  model = &routing_models[SURF_MODEL_FAT_TREE_CLUSTER];break;
+    case A_surfxml_AS_routing_Dijkstra:              model = &routing_models[SURF_MODEL_DIJKSTRA];break;
+    case A_surfxml_AS_routing_DijkstraCache:         model = &routing_models[SURF_MODEL_DIJKSTRACACHE];break;
+    case A_surfxml_AS_routing_Floyd:                 model = &routing_models[SURF_MODEL_FLOYD];break;
+    case A_surfxml_AS_routing_Full:                  model = &routing_models[SURF_MODEL_FULL];break;
+    case A_surfxml_AS_routing_None:                  model = &routing_models[SURF_MODEL_NONE];break;
+    case A_surfxml_AS_routing_Vivaldi:               model = &routing_models[SURF_MODEL_VIVALDI];break;

     default: xbt_die("Not a valid model!!!");
     break;
   }
     default: xbt_die("Not a valid model!!!");
     break;
   }


@@ -372,14 +377,16 @@ void routing_AS_begin(sg_platf_AS_cbarg_t AS)
   new_as->p_hierarchy = SURF_ROUTING_NULL;
   new_as->p_name = xbt_strdup(AS->id);
 
   new_as->p_hierarchy = SURF_ROUTING_NULL;
   new_as->p_name = xbt_strdup(AS->id);
 

-  RoutingEdgePtr info = new RoutingEdge();
-
+  RoutingEdgePtr info = new RoutingEdgeImpl(xbt_strdup(new_as->p_name),
+                                            -1,
+                                            SURF_NETWORK_ELEMENT_AS,
+                                            current_routing);

   if (current_routing == NULL && routing_platf->p_root == NULL) {
 
     /* it is the first one */
     new_as->p_routingFather = NULL;
     routing_platf->p_root = new_as;
   if (current_routing == NULL && routing_platf->p_root == NULL) {
 
     /* it is the first one */
     new_as->p_routingFather = NULL;
     routing_platf->p_root = new_as;

-    info->m_id = -1;
+    info->setId(-1);

   } else if (current_routing != NULL && routing_platf->p_root != NULL) {
 
     xbt_assert(!xbt_dict_get_or_null
   } else if (current_routing != NULL && routing_platf->p_root != NULL) {
 
     xbt_assert(!xbt_dict_get_or_null


@@ -394,18 +401,14 @@ void routing_AS_begin(sg_platf_AS_cbarg_t AS)
     xbt_dict_set(current_routing->p_routingSons, AS->id,
                  (void *) new_as, NULL);
     /* add to the father element list */
     xbt_dict_set(current_routing->p_routingSons, AS->id,
                  (void *) new_as, NULL);
     /* add to the father element list */

-    info->m_id = current_routing->parseAS(info);
+    info->setId(current_routing->parseAS(info));

   } else {
   } else {

-    THROWF(arg_error, 0, "All defined components must be belong to a AS");
+    THROWF(arg_error, 0, "All defined components must belong to a AS");

   }
 
   }
 

-  info->p_rcComponent = new_as->p_routingFather;
-  info->p_rcType = SURF_NETWORK_ELEMENT_AS;
-  info->p_name = xbt_strdup(new_as->p_name);
-
-  xbt_lib_set(as_router_lib, info->p_name, ROUTING_ASR_LEVEL,
+  xbt_lib_set(as_router_lib, info->getName(), ROUTING_ASR_LEVEL,

               (void *) info);
               (void *) info);

-  XBT_DEBUG("Having set name '%s' id '%d'", new_as->p_name, info->m_id);
+  XBT_DEBUG("Having set name '%s' id '%d'", new_as->p_name, info->getId());

 
   /* set the new current component of the tree */
   current_routing = new_as;
 
   /* set the new current component of the tree */
   current_routing = new_as;


@@ -467,11 +470,11 @@ static void elements_father(sg_routing_edge_t src, sg_routing_edge_t dst,
   /* (1) find the as where the src and dst are located */
   sg_routing_edge_t src_data = src;
   sg_routing_edge_t dst_data = dst;
   /* (1) find the as where the src and dst are located */
   sg_routing_edge_t src_data = src;
   sg_routing_edge_t dst_data = dst;

-  src_as = src_data->p_rcComponent;
-  dst_as = dst_data->p_rcComponent;
+  src_as = src_data->getRcComponent();
+  dst_as = dst_data->getRcComponent();

 #ifndef NDEBUG
 #ifndef NDEBUG

-  char* src_name = src_data->p_name;
-  char* dst_name = dst_data->p_name;
+  char* src_name = src_data->getName();
+  char* dst_name = dst_data->getName();

 #endif
 
   xbt_assert(src_as && dst_as,
 #endif
 
   xbt_assert(src_as && dst_as,


@@ -529,7 +532,7 @@ static void _get_route_and_latency(RoutingEdgePtr src, RoutingEdgePtr dst,
   memset(&route,0,sizeof(route));
 
   xbt_assert(src && dst, "bad parameters for \"_get_route_latency\" method");
   memset(&route,0,sizeof(route));
 
   xbt_assert(src && dst, "bad parameters for \"_get_route_latency\" method");

-  XBT_DEBUG("Solve route/latency  \"%s\" to \"%s\"", src->p_name, dst->p_name);
+  XBT_DEBUG("Solve route/latency  \"%s\" to \"%s\"", src->getName(), dst->getName());

 
   /* Find how src and dst are interconnected */
   AsPtr common_father, src_father, dst_father;
 
   /* Find how src and dst are interconnected */
   AsPtr common_father, src_father, dst_father;


@@ -569,7 +572,7 @@ static void _get_route_and_latency(RoutingEdgePtr src, RoutingEdgePtr dst,
                                     &route, latency);
 
   xbt_assert((route.gw_src != NULL) && (route.gw_dst != NULL),
                                     &route, latency);
 
   xbt_assert((route.gw_src != NULL) && (route.gw_dst != NULL),

-      "bad gateways for route from \"%s\" to \"%s\"", src->p_name, dst->p_name);
+      "bad gateways for route from \"%s\" to \"%s\"", src->getName(), dst->getName());

 
   sg_routing_edge_t src_gateway_net_elm = route.gw_src;
   sg_routing_edge_t dst_gateway_net_elm = route.gw_dst;
 
   sg_routing_edge_t src_gateway_net_elm = route.gw_src;
   sg_routing_edge_t dst_gateway_net_elm = route.gw_dst;


@@ -591,7 +594,7 @@ AS_t surf_platf_get_root(routing_platf_t platf){
 }
 
 e_surf_network_element_type_t surf_routing_edge_get_rc_type(sg_routing_edge_t edge){
 }
 
 e_surf_network_element_type_t surf_routing_edge_get_rc_type(sg_routing_edge_t edge){

-  return edge->p_rcType;
+  return edge->getRcType();

 }
 
 
 }
 
 


@@ -612,7 +615,7 @@ e_surf_network_element_type_t surf_routing_edge_get_rc_type(sg_routing_edge_t ed
 void RoutingPlatf::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst,
                                    xbt_dynar_t* route, double *latency)
 {
 void RoutingPlatf::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst,
                                    xbt_dynar_t* route, double *latency)
 {

-  XBT_DEBUG("routing_get_route_and_latency from %s to %s", src->p_name, dst->p_name);
+  XBT_DEBUG("routing_get_route_and_latency from %s to %s", src->getName(), dst->getName());

   if (!*route) {
     xbt_dynar_reset(routing_platf->p_lastRoute);
     *route = routing_platf->p_lastRoute;
   if (!*route) {
     xbt_dynar_reset(routing_platf->p_lastRoute);
     *route = routing_platf->p_lastRoute;


@@ -621,7 +624,7 @@ void RoutingPlatf::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst,
   _get_route_and_latency(src, dst, route, latency);
 
   xbt_assert(!latency || *latency >= 0.0,
   _get_route_and_latency(src, dst, route, latency);
 
   xbt_assert(!latency || *latency >= 0.0,

-             "negative latency on route between \"%s\" and \"%s\"", src->p_name, dst->p_name);
+             "negative latency on route between \"%s\" and \"%s\"", src->getName(), dst->getName());

 }
 
 xbt_dynar_t RoutingPlatf::getOneLinkRoutes(){
 }
 
 xbt_dynar_t RoutingPlatf::getOneLinkRoutes(){


@@ -630,7 +633,7 @@ xbt_dynar_t RoutingPlatf::getOneLinkRoutes(){
 
 xbt_dynar_t RoutingPlatf::recursiveGetOneLinkRoutes(AsPtr rc)
 {
 
 xbt_dynar_t RoutingPlatf::recursiveGetOneLinkRoutes(AsPtr rc)
 {

-  xbt_dynar_t ret = xbt_dynar_new(sizeof(OnelinkPtr), xbt_free);
+  xbt_dynar_t ret = xbt_dynar_new(sizeof(OnelinkPtr), xbt_free_f);

 
   //adding my one link routes
   xbt_dynar_t onelink_mine = rc->getOneLinkRoutes();
 
   //adding my one link routes
   xbt_dynar_t onelink_mine = rc->getOneLinkRoutes();


@@ -653,7 +656,7 @@ e_surf_network_element_type_t routing_get_network_element_type(const char *name)
 {
   RoutingEdgePtr rc = sg_routing_edge_by_name_or_null(name);
   if (rc)
 {
   RoutingEdgePtr rc = sg_routing_edge_by_name_or_null(name);
   if (rc)

-    return rc->p_rcType;
+    return rc->getRcType();

 
   return SURF_NETWORK_ELEMENT_NULL;
 }
 
   return SURF_NETWORK_ELEMENT_NULL;
 }


@@ -758,36 +761,36 @@ static void routing_parse_cabinet(sg_platf_cabinet_cbarg_t cabinet)
     s_sg_platf_host_cbarg_t host;
     memset(&host, 0, sizeof(host));
     host.initial_state = SURF_RESOURCE_ON;
     s_sg_platf_host_cbarg_t host;
     memset(&host, 0, sizeof(host));
     host.initial_state = SURF_RESOURCE_ON;

-    host.pstate = 0;
-    host.power_scale = 1.0;
-    host.core_amount = 1;
+    host.pstate        = 0;
+    host.power_scale   = 1.0;
+    host.core_amount   = 1;

 
     s_sg_platf_link_cbarg_t link;
     memset(&link, 0, sizeof(link));
 
     s_sg_platf_link_cbarg_t link;
     memset(&link, 0, sizeof(link));

-    link.state = SURF_RESOURCE_ON;
-    link.policy = SURF_LINK_FULLDUPLEX;
-    link.latency = cabinet->lat;
+    link.state     = SURF_RESOURCE_ON;
+    link.policy    = SURF_LINK_FULLDUPLEX;
+    link.latency   = cabinet->lat;

     link.bandwidth = cabinet->bw;
 
     s_sg_platf_host_link_cbarg_t host_link;
     memset(&host_link, 0, sizeof(host_link));
 
     for (i = start; i <= end; i++) {
     link.bandwidth = cabinet->bw;
 
     s_sg_platf_host_link_cbarg_t host_link;
     memset(&host_link, 0, sizeof(host_link));
 
     for (i = start; i <= end; i++) {

-      host_id = bprintf("%s%d%s",cabinet->prefix,i,cabinet->suffix);
-      link_id = bprintf("link_%s%d%s",cabinet->prefix,i,cabinet->suffix);
-      host.id = host_id;
-      link.id = link_id;
+      host_id                      = bprintf("%s%d%s",cabinet->prefix,i,cabinet->suffix);
+      link_id                      = bprintf("link_%s%d%s",cabinet->prefix,i,cabinet->suffix);
+      host.id                      = host_id;
+      link.id                      = link_id;

       xbt_dynar_t power_state_list = xbt_dynar_new(sizeof(double), NULL);
       xbt_dynar_push(power_state_list,&cabinet->power);
       host.power_peak = power_state_list;
       sg_platf_new_host(&host);
       sg_platf_new_link(&link);
 
       xbt_dynar_t power_state_list = xbt_dynar_new(sizeof(double), NULL);
       xbt_dynar_push(power_state_list,&cabinet->power);
       host.power_peak = power_state_list;
       sg_platf_new_host(&host);
       sg_platf_new_link(&link);
 

-      char* link_up = bprintf("%s_UP",link_id);
-      char* link_down = bprintf("%s_DOWN",link_id);
-      host_link.id = host_id;
-      host_link.link_up = link_up;
-      host_link.link_down= link_down;
+      char* link_up       = bprintf("%s_UP",link_id);
+      char* link_down     = bprintf("%s_DOWN",link_id);
+      host_link.id        = host_id;
+      host_link.link_up   = link_up;
+      host_link.link_down = link_down;

       sg_platf_new_host_link(&host_link);
 
       free(host_id);
       sg_platf_new_host_link(&host_link);
 
       free(host_id);


@@ -835,7 +838,15 @@ static void routing_parse_cluster(sg_platf_cluster_cbarg_t cluster)
     AS.routing = A_surfxml_AS_routing_Cluster___torus;
     sg_platf_new_AS_begin(&AS);
     ((AsClusterTorusPtr)current_routing)->parse_specific_arguments(cluster);
     AS.routing = A_surfxml_AS_routing_Cluster___torus;
     sg_platf_new_AS_begin(&AS);
     ((AsClusterTorusPtr)current_routing)->parse_specific_arguments(cluster);

-  }else{
+  }
+  else if (cluster->topology == SURF_CLUSTER_FAT_TREE) {
+    XBT_DEBUG("<AS id=\"%s\"\trouting=\"Fat_Tree_Cluster\">", cluster->id);
+    AS.routing = A_surfxml_AS_routing_Cluster___fat___tree;
+    sg_platf_new_AS_begin(&AS);
+    ((AsClusterFatTree*)current_routing)->parse_specific_arguments(cluster);
+  }
+
+  else{

     XBT_DEBUG("<AS id=\"%s\"\trouting=\"Cluster\">", cluster->id);
     AS.routing = A_surfxml_AS_routing_Cluster;
     sg_platf_new_AS_begin(&AS);
     XBT_DEBUG("<AS id=\"%s\"\trouting=\"Cluster\">", cluster->id);
     AS.routing = A_surfxml_AS_routing_Cluster;
     sg_platf_new_AS_begin(&AS);


@@ -883,6 +894,15 @@ static void routing_parse_cluster(sg_platf_cluster_cbarg_t cluster)
 
       memset(&host, 0, sizeof(host));
       host.id = host_id;
 
       memset(&host, 0, sizeof(host));
       host.id = host_id;

+      if ((cluster->properties != NULL) && (!xbt_dict_is_empty(cluster->properties))) {
+         xbt_dict_cursor_t cursor=NULL;
+         char *key,*data;
+         host.properties = xbt_dict_new();
+
+         xbt_dict_foreach(cluster->properties,cursor,key,data) {
+                 xbt_dict_set(host.properties, key, xbt_strdup(data),free);
+         }
+      }

       if (cluster->availability_trace && strcmp(cluster->availability_trace, "")) {
         xbt_dict_set(patterns, "radical", bprintf("%d", i), NULL);
         char *avail_file = xbt_str_varsubst(cluster->availability_trace, patterns);
       if (cluster->availability_trace && strcmp(cluster->availability_trace, "")) {
         xbt_dict_set(patterns, "radical", bprintf("%d", i), NULL);
         char *avail_file = xbt_str_varsubst(cluster->availability_trace, patterns);


@@ -935,13 +955,13 @@ static void routing_parse_cluster(sg_platf_cluster_cbarg_t cluster)
 
 
         memset(&link, 0, sizeof(link));
 
 
         memset(&link, 0, sizeof(link));

-        link.id = tmp_link;
+        link.id        = tmp_link;

         link.bandwidth = cluster->loopback_bw;
         link.bandwidth = cluster->loopback_bw;

-        link.latency = cluster->loopback_lat;
-        link.state = SURF_RESOURCE_ON;
-        link.policy = SURF_LINK_FATPIPE;
+        link.latency   = cluster->loopback_lat;
+        link.state     = SURF_RESOURCE_ON;
+        link.policy    = SURF_LINK_FATPIPE;

         sg_platf_new_link(&link);
         sg_platf_new_link(&link);

-        info_loop.link_up =
+        info_loop.link_up   =

             xbt_lib_get_or_null(link_lib, tmp_link, SURF_LINK_LEVEL);
         info_loop.link_down = info_loop.link_up;
         free(tmp_link);
             xbt_lib_get_or_null(link_lib, tmp_link, SURF_LINK_LEVEL);
         info_loop.link_down = info_loop.link_up;
         free(tmp_link);


@@ -974,12 +994,15 @@ static void routing_parse_cluster(sg_platf_cluster_cbarg_t cluster)
 
 
       //call the cluster function that adds the others links
 
 
       //call the cluster function that adds the others links

-
+      if (cluster->topology == SURF_CLUSTER_FAT_TREE) {
+        ((AsClusterFatTree*) current_routing)->addProcessingNode(i);
+      }
+      else {

       ((AsClusterPtr)current_routing)->create_links_for_node(cluster, i, rankId, rankId*
           ((AsClusterPtr)current_routing)->p_nb_links_per_node
           + ((AsClusterPtr)current_routing)->p_has_loopback
           + ((AsClusterPtr)current_routing)->p_has_limiter );
       ((AsClusterPtr)current_routing)->create_links_for_node(cluster, i, rankId, rankId*
           ((AsClusterPtr)current_routing)->p_nb_links_per_node
           + ((AsClusterPtr)current_routing)->p_has_loopback
           + ((AsClusterPtr)current_routing)->p_has_limiter );

-
+      }

       xbt_free(link_id);
       xbt_free(host_id);
       rankId++;
       xbt_free(link_id);
       xbt_free(host_id);
       rankId++;


@@ -989,6 +1012,10 @@ static void routing_parse_cluster(sg_platf_cluster_cbarg_t cluster)
   }
   xbt_dynar_free(&radical_elements);
 
   }
   xbt_dynar_free(&radical_elements);
 

+  // For fat trees, the links must be created once all nodes have been added
+  if(cluster->topology == SURF_CLUSTER_FAT_TREE) {
+    ((AsClusterFatTree*)current_routing)->create_links();
+  }

   // Add a router. It is magically used thanks to the way in which surf_routing_cluster is written,
   // and it's very useful to connect clusters together
   XBT_DEBUG(" ");
   // Add a router. It is magically used thanks to the way in which surf_routing_cluster is written,
   // and it's very useful to connect clusters together
   XBT_DEBUG(" ");


@@ -1013,11 +1040,11 @@ static void routing_parse_cluster(sg_platf_cluster_cbarg_t cluster)
               cluster->bb_bw, cluster->bb_lat);
 
     memset(&link, 0, sizeof(link));
               cluster->bb_bw, cluster->bb_lat);
 
     memset(&link, 0, sizeof(link));

-    link.id = link_backbone;
+    link.id        = link_backbone;

     link.bandwidth = cluster->bb_bw;
     link.bandwidth = cluster->bb_bw;

-    link.latency = cluster->bb_lat;
-    link.state = SURF_RESOURCE_ON;
-    link.policy = cluster->bb_sharing_policy;
+    link.latency   = cluster->bb_lat;
+    link.state     = SURF_RESOURCE_ON;
+    link.policy    = cluster->bb_sharing_policy;

 
     sg_platf_new_link(&link);
 
 
     sg_platf_new_link(&link);
 


@@ -1049,8 +1076,8 @@ static void routing_parse_peer(sg_platf_peer_cbarg_t peer)
 
   XBT_DEBUG("<AS id=\"%s\"\trouting=\"Cluster\">", peer->id);
   s_sg_platf_AS_cbarg_t AS = SG_PLATF_AS_INITIALIZER;
 
   XBT_DEBUG("<AS id=\"%s\"\trouting=\"Cluster\">", peer->id);
   s_sg_platf_AS_cbarg_t AS = SG_PLATF_AS_INITIALIZER;

-  AS.id = peer->id;
-  AS.routing = A_surfxml_AS_routing_Cluster;
+  AS.id                    = peer->id;
+  AS.routing               = A_surfxml_AS_routing_Cluster;

   sg_platf_new_AS_begin(&AS);
 
   current_routing->p_linkUpDownList = xbt_dynar_new(sizeof(s_surf_parsing_link_up_down_t),NULL);
   sg_platf_new_AS_begin(&AS);
 
   current_routing->p_linkUpDownList = xbt_dynar_new(sizeof(s_surf_parsing_link_up_down_t),NULL);


@@ -1074,8 +1101,8 @@ static void routing_parse_peer(sg_platf_peer_cbarg_t peer)
 
   s_sg_platf_link_cbarg_t link;
   memset(&link, 0, sizeof(link));
 
   s_sg_platf_link_cbarg_t link;
   memset(&link, 0, sizeof(link));

-  link.state = SURF_RESOURCE_ON;
-  link.policy = SURF_LINK_SHARED;
+  link.state   = SURF_RESOURCE_ON;
+  link.policy  = SURF_LINK_SHARED;

   link.latency = peer->lat;
 
   char* link_up = bprintf("%s_UP",link_id);
   link.latency = peer->lat;
 
   char* link_up = bprintf("%s_UP",link_id);


@@ -1095,9 +1122,9 @@ static void routing_parse_peer(sg_platf_peer_cbarg_t peer)
   XBT_DEBUG("<host_link\tid=\"%s\"\tup=\"%s\"\tdown=\"%s\" />", host_id,link_up,link_down);
   s_sg_platf_host_link_cbarg_t host_link;
   memset(&host_link, 0, sizeof(host_link));
   XBT_DEBUG("<host_link\tid=\"%s\"\tup=\"%s\"\tdown=\"%s\" />", host_id,link_up,link_down);
   s_sg_platf_host_link_cbarg_t host_link;
   memset(&host_link, 0, sizeof(host_link));

-  host_link.id = host_id;
-  host_link.link_up = link_up;
-  host_link.link_down= link_down;
+  host_link.id        = host_id;
+  host_link.link_up   = link_up;
+  host_link.link_down = link_down;

   sg_platf_new_host_link(&host_link);
 
   XBT_DEBUG("<router id=\"%s\"/>", router_id);
   sg_platf_new_host_link(&host_link);
 
   XBT_DEBUG("<router id=\"%s\"/>", router_id);


@@ -1240,6 +1267,22 @@ static void routing_parse_peer(sg_platf_peer_cbarg_t peer)
 //   }
 // }
 
 //   }
 // }
 

+static void check_disk_attachment()
+{
+  xbt_lib_cursor_t cursor;
+  char *key;
+  void **data;
+  RoutingEdgePtr host_elm;
+  xbt_lib_foreach(storage_lib, cursor, key, data) {
+    if(xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL) != NULL) {
+         StoragePtr storage = static_cast<StoragePtr>(xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL));
+         host_elm = sg_routing_edge_by_name_or_null(storage->p_attach);
+         if(!host_elm)
+                 surf_parse_error("Unable to attach storage %s: host %s doesn't exist.", storage->getName(), storage->p_attach);
+    }
+  }
+}
+

 void routing_register_callbacks()
 {
   sg_platf_host_add_cb(parse_S_host);
 void routing_register_callbacks()
 {
   sg_platf_host_add_cb(parse_S_host);


@@ -1255,6 +1298,7 @@ void routing_register_callbacks()
 
   sg_platf_peer_add_cb(routing_parse_peer);
   sg_platf_postparse_add_cb(routing_parse_postparse);
 
   sg_platf_peer_add_cb(routing_parse_peer);
   sg_platf_postparse_add_cb(routing_parse_postparse);

+  sg_platf_postparse_add_cb(check_disk_attachment);

 
   /* we care about the ASes while parsing the platf. Incredible, isnt it? */
   sg_platf_AS_end_add_cb(routing_AS_end);
 
   /* we care about the ASes while parsing the platf. Incredible, isnt it? */
   sg_platf_AS_end_add_cb(routing_AS_end);


@@ -1263,9 +1307,7 @@ void routing_register_callbacks()
   sg_platf_trace_add_cb(routing_parse_trace);
   sg_platf_trace_connect_add_cb(routing_parse_trace_connect);
 
   sg_platf_trace_add_cb(routing_parse_trace);
   sg_platf_trace_connect_add_cb(routing_parse_trace_connect);
 

-#ifdef HAVE_TRACING

   instr_routing_define_callbacks();
   instr_routing_define_callbacks();

-#endif

 }
 
 /**
 }
 
 /**


@@ -1307,6 +1349,32 @@ const char *surf_AS_get_name(AsPtr as) {
   return as->p_name;
 }
 
   return as->p_name;
 }
 

+static AsPtr surf_AS_recursive_get_by_name(AsPtr current, const char * name) {
+  xbt_dict_cursor_t cursor = NULL;
+  char *key;
+  AS_t elem;
+  AsPtr tmp = NULL;
+
+  if(!strcmp(current->p_name, name))
+    return current;
+
+  xbt_dict_foreach(current->p_routingSons, cursor, key, elem) {
+    tmp = surf_AS_recursive_get_by_name(elem, name);
+    if(tmp != NULL ) {
+        break;
+    }
+  }
+  return tmp;
+}
+
+
+AsPtr surf_AS_get_by_name(const char * name) {
+  AsPtr as = surf_AS_recursive_get_by_name(routing_platf->p_root, name);
+  if(as == NULL)
+    XBT_WARN("Impossible to find an AS with name %s, please check your input", name);
+  return as;
+}
+

 xbt_dict_t surf_AS_get_routing_sons(AsPtr as) {
   return as->p_routingSons;
 }
 xbt_dict_t surf_AS_get_routing_sons(AsPtr as) {
   return as->p_routingSons;
 }


@@ -1324,7 +1392,7 @@ xbt_dynar_t surf_AS_get_hosts(AsPtr as) {
   xbt_dynar_t res =  xbt_dynar_new(sizeof(xbt_dictelm_t), NULL);
   for (index = 0; index < count; index++) {
      relm = xbt_dynar_get_as(elms, index, RoutingEdgePtr);
   xbt_dynar_t res =  xbt_dynar_new(sizeof(xbt_dictelm_t), NULL);
   for (index = 0; index < count; index++) {
      relm = xbt_dynar_get_as(elms, index, RoutingEdgePtr);

-     delm = xbt_lib_get_elm_or_null(host_lib, relm->p_name);
+     delm = xbt_lib_get_elm_or_null(host_lib, relm->getName());

      if (delm!=NULL) {
        xbt_dynar_push(res, &delm);
      }
      if (delm!=NULL) {
        xbt_dynar_push(res, &delm);
      }


@@ -1335,4 +1403,3 @@ xbt_dynar_t surf_AS_get_hosts(AsPtr as) {
 void surf_AS_get_graph(AS_t as, xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges) {
   as->getGraph(graph, nodes, edges);
 }
 void surf_AS_get_graph(AS_t as, xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges) {
   as->getGraph(graph, nodes, edges);
 }

-