X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/084e8bbede5c1c275292a037a5b2fbfcb8c7d381..7abffd12021a46a0ac1bd2b4ff48ca4b3cc8c71c:/src/surf/surf_routing_cluster.c

diff --git a/src/surf/surf_routing_cluster.c b/src/surf/surf_routing_cluster.c
index a34dc31c33..09b74f2893 100644
--- a/src/surf/surf_routing_cluster.c
+++ b/src/surf/surf_routing_cluster.c
@@ -13,44 +13,39 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_cluster, surf, "Routing part of surf"
  * Note that a router is created, easing the interconnexion with the rest of the world.
  */
 
-typedef struct {
-  s_as_t generic_routing;
-  void *backbone;
-} s_as_cluster_t, *as_cluster_t;
-
 /* Business methods */
 static void cluster_get_route_and_latency(AS_t as,
-    network_element_t src, network_element_t dst,
+    sg_routing_edge_t src, sg_routing_edge_t dst,
                                           route_t route, double *lat) {
 
       s_surf_parsing_link_up_down_t info;
-	  XBT_DEBUG("cluster_get_route_and_latency from '%s'[%d] to '%s'[%d]",
-	      src->name,src->id,
-	      dst->name,dst->id);
+    XBT_DEBUG("cluster_get_route_and_latency from '%s'[%d] to '%s'[%d]",
+        src->name,src->id,
+        dst->name,dst->id);
 
-	  if(src->rc_type != SURF_NETWORK_ELEMENT_ROUTER){ // No specific link for router
+    if(src->rc_type != SURF_NETWORK_ELEMENT_ROUTER){ // No specific link for router
         info = xbt_dynar_get_as(as->link_up_down_list,src->id,s_surf_parsing_link_up_down_t);
         if(info.link_up) { // link up
           xbt_dynar_push_as(route->link_list,void*,info.link_up);
         if (lat)
           *lat += surf_network_model->extension.network.get_link_latency(info.link_up);
         }
-	  }
+    }
 
-	  if ( ((as_cluster_t)as)->backbone ) {
-	    xbt_dynar_push_as(route->link_list,void*, ((as_cluster_t)as)->backbone) ;
+    if ( ((as_cluster_t)as)->backbone ) {
+      xbt_dynar_push_as(route->link_list,void*, ((as_cluster_t)as)->backbone) ;
       if (lat)
         *lat += surf_network_model->extension.network.get_link_latency(((as_cluster_t)as)->backbone);
-	  }
+    }
 
-	  if(dst->rc_type != SURF_NETWORK_ELEMENT_ROUTER){ // No specific link for router
+    if(dst->rc_type != SURF_NETWORK_ELEMENT_ROUTER){ // No specific link for router
         info = xbt_dynar_get_as(as->link_up_down_list,dst->id,s_surf_parsing_link_up_down_t);
         if(info.link_down) { // link down
           xbt_dynar_push_as(route->link_list,void*,info.link_down);
         if (lat)
           *lat += surf_network_model->extension.network.get_link_latency(info.link_down);
         }
-	  }
+    }
 }
 
 static void model_cluster_finalize(AS_t as) {
@@ -58,13 +53,15 @@ static void model_cluster_finalize(AS_t as) {
   model_none_finalize(as);
 }
 
-static int cluster_parse_PU(AS_t rc, network_element_t elm) {
-  xbt_dynar_push(rc->index_network_elm, (void *)elm);
+static int cluster_parse_PU(AS_t rc, sg_routing_edge_t elm) {
+  XBT_DEBUG("Load process unit \"%s\"", elm->name);
+  xbt_dynar_push_as(rc->index_network_elm,sg_routing_edge_t,elm);
   return xbt_dynar_length(rc->index_network_elm)-1;
 }
 
-static int cluster_parse_AS(AS_t rc, network_element_t elm) {
-  xbt_dynar_push(rc->index_network_elm, (void *)elm);
+static int cluster_parse_AS(AS_t rc, sg_routing_edge_t elm) {
+  XBT_DEBUG("Load Autonomous system \"%s\"", elm->name);
+  xbt_dynar_push_as(rc->index_network_elm,sg_routing_edge_t,elm);
   return xbt_dynar_length(rc->index_network_elm)-1;
 }
 
@@ -79,7 +76,3 @@ AS_t model_cluster_create(void)
 
   return (AS_t) result;
 }
-
-void surf_routing_cluster_add_backbone(AS_t as, void* bb) {
-  ((as_cluster_t)as)->backbone = bb;
-}