Remove dict cluster_host_link specific to cluster model.

[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 9c8e028..a34dc31 100644 (file)
--- a/src/surf/surf_routing_cluster.c
+++ b/src/surf/surf_routing_cluster.c
@@ -6,7 +6,6 @@
 #include "surf_routing_private.h"
 
 /* Global vars */
-extern routing_global_t global_routing;
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_cluster, surf, "Routing part of surf");
 
@@ -19,21 +18,23 @@ typedef struct {
   void *backbone;
 } s_as_cluster_t, *as_cluster_t;
 
-
-static xbt_dict_t cluster_host_link = NULL;
-
 /* Business methods */
 static void cluster_get_route_and_latency(AS_t as,
-                                          const char *src, const char *dst,
+    network_element_t src, network_element_t dst,
                                           route_t route, double *lat) {
 
-         surf_parsing_link_up_down_t info;
-
-         info = xbt_dict_get_or_null(cluster_host_link,src);
-         if(info) { // 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);
+      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);
+
+         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 ) {
@@ -42,35 +43,43 @@ static void cluster_get_route_and_latency(AS_t as,
         *lat += surf_network_model->extension.network.get_link_latency(((as_cluster_t)as)->backbone);
          }
 
-         info = xbt_dict_get_or_null(cluster_host_link,dst);
-         if(info) { // 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);
+         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) {
-  xbt_dict_free(&cluster_host_link);
+  xbt_dynar_free(&(as->link_up_down_list));
   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);
+  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);
+  return xbt_dynar_length(rc->index_network_elm)-1;
+}
+
 /* Creation routing model functions */
 AS_t model_cluster_create(void)
 {
   AS_t result = model_none_create_sized(sizeof(s_as_cluster_t));
   result->get_route_and_latency = cluster_get_route_and_latency;
   result->finalize = model_cluster_finalize;
+  result->parse_AS = cluster_parse_AS;
+  result->parse_PU = cluster_parse_PU;
 
   return (AS_t) result;
 }
 
-void surf_routing_cluster_add_link(const char* host_id,surf_parsing_link_up_down_t info) {
-  if(!cluster_host_link)
-    cluster_host_link = xbt_dict_new_homogeneous(xbt_free);
-
- xbt_dict_set(cluster_host_link,host_id,info,NULL);
-}
-
 void surf_routing_cluster_add_backbone(AS_t as, void* bb) {
   ((as_cluster_t)as)->backbone = bb;
 }