Merge branch 'master' of git+ssh://scm.gforge.inria.fr/gitroot/simgrid/simgrid

[simgrid.git] / src / surf / surf_routing_cluster.c

diff --git a/src/surf/surf_routing_cluster.c b/src/surf/surf_routing_cluster.c
index 140f0fc..37f2e32 100644 (file)
--- a/src/surf/surf_routing_cluster.c
+++ b/src/surf/surf_routing_cluster.c
@@ -13,15 +13,10 @@ 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,
     sg_routing_edge_t src, sg_routing_edge_t dst,
-                                          route_t route, double *lat) {
+    sg_platf_route_cbarg_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]",
@@ -54,7 +49,6 @@ static void cluster_get_route_and_latency(AS_t as,
 }
 
 static void model_cluster_finalize(AS_t as) {
-  xbt_dynar_free(&(as->link_up_down_list));
   model_none_finalize(as);
 }
 
@@ -81,7 +75,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;
-}