disable optimizations for build MC in jenkins

[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 f2d468a..fbd7b42 100644 (file)
--- a/src/surf/surf_routing_cluster.c
+++ b/src/surf/surf_routing_cluster.c
@@ -23,13 +23,27 @@ static void cluster_get_route_and_latency(AS_t as,
 {
 
   s_surf_parsing_link_up_down_t info;
-  XBT_DEBUG("cluster_get_route_and_latency from '%s'[%d] to '%s'[%d]",
+  XBT_VERB("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((src->id == dst->id) && info.loopback_link  ){
+      xbt_dynar_push_as(route->link_list, void *, info.loopback_link);
+      if (lat)
+        *lat +=
+            surf_network_model->extension.network.get_link_latency(info.
+                                                                   loopback_link);
+      return;
+    }
+                         
+                         
+    if (info.limiter_link)          // limiter for sender
+      xbt_dynar_push_as(route->link_list, void *, info.limiter_link);
+    
     if (info.link_up) {         // link up
       xbt_dynar_push_as(route->link_list, void *, info.link_up);
       if (lat)
@@ -58,6 +72,10 @@ static void cluster_get_route_and_latency(AS_t as,
             surf_network_model->extension.network.get_link_latency(info.
                                                                    link_down);
     }
+    
+    if (info.limiter_link)          // limiter for receiver
+      xbt_dynar_push_as(route->link_list, void *, info.limiter_link);
+    
   }
 }
 
@@ -119,106 +137,10 @@ static void cluster_get_graph(xbt_graph_t graph, xbt_dict_t nodes,
         } else {
           new_xbt_graph_edge(graph, current, routerNode, edges);
         }
-
       }
-/*
-      if (((as_cluster_t) rc)->backbone) {
-        char *link_name =
-          ((surf_resource_t) ((as_cluster_t) rc)->backbone)->name;
-
-        current = new_xbt_graph_node(graph, link_name, nodes);
-        new_xbt_graph_edge(graph, previous, current, edges);
-        previous = current;
-
-        revCurrent = new_xbt_graph_node(graph, link_name, nodes);
-        new_xbt_graph_edge(graph, revCurrent, revPrevious, edges);
-        revPrevious = revCurrent;
-      } else {
-        info = xbt_dynar_get_as(rc->link_up_down_list, dst->id,
-                                s_surf_parsing_link_up_down_t);
-
-        if (info.link_up) {     // link up
-          char *link_name = ((surf_resource_t) info.link_up)->name;
-          current = new_xbt_graph_node(graph, link_name, nodes);
-          new_xbt_graph_edge(graph, previous, current, edges);
-          previous = current;
-        } else if (info.link_down) {    // link down
-          char *link_name = ((surf_resource_t) info.link_down)->name;
-          revCurrent = new_xbt_graph_node(graph, link_name, nodes);
-          new_xbt_graph_edge(graph, revCurrent, revPrevious, edges);
-          revPrevious = revCurrent;
-        }
-      }
-*/
     }
-  }
-/*
-  if(rc->)
-    for (isrc = 0; isrc < table_size; isrc++) {
-      src = xbt_dynar_get_as(rc->index_network_elm, isrc, sg_routing_edge_t);
-
-      previous = new_xbt_graph_node(graph, src->name, nodes);
-      revPrevious = new_xbt_graph_node(graph, src->name, nodes);
-
-      for (idst = isrc + 1; idst < table_size; idst++) {
-        dst = xbt_dynar_get_as(rc->index_network_elm, idst, sg_routing_edge_t);
-
-        s_surf_parsing_link_up_down_t info;
-
-        if (src->rc_type != SURF_NETWORK_ELEMENT_ROUTER) {        // No specific link for router
-          info =
-            xbt_dynar_get_as(rc->link_up_down_list, src->id,
-                             s_surf_parsing_link_up_down_t);
-
-          if (info.link_up) {     // link up
-            char *link_name = ((surf_resource_t) info.link_up)->name;
-            current = new_xbt_graph_node(graph, link_name, nodes);
-            new_xbt_graph_edge(graph, previous, current, edges);
-            previous = current;
-          } else if (info.link_down) {    // link down
-            char *link_name = ((surf_resource_t) info.link_down)->name;
-            revCurrent = new_xbt_graph_node(graph, link_name, nodes);
-            new_xbt_graph_edge(graph, revCurrent, revPrevious, edges);
-            revPrevious = revCurrent;
-          }
-        }
-
 
-
-        if (((as_cluster_t) rc)->backbone) {
-          char *link_name =
-            ((surf_resource_t) ((as_cluster_t) rc)->backbone)->name;
-
-          current = new_xbt_graph_node(graph, link_name, nodes);
-          new_xbt_graph_edge(graph, previous, current, edges);
-          previous = current;
-
-          revCurrent = new_xbt_graph_node(graph, link_name, nodes);
-          new_xbt_graph_edge(graph, revCurrent, revPrevious, edges);
-          revPrevious = revCurrent;
-        }
-
-        if (dst->rc_type != SURF_NETWORK_ELEMENT_ROUTER) {        // No specific link for router
-          info =
-            xbt_dynar_get_as(rc->link_up_down_list, dst->id,
-                             s_surf_parsing_link_up_down_t);
-
-          if (info.link_up) {     // link up
-            char *link_name = ((surf_resource_t) info.link_up)->name;
-            current = new_xbt_graph_node(graph, link_name, nodes);
-            new_xbt_graph_edge(graph, previous, current, edges);
-            previous = current;
-          } else if (info.link_down) {    // link down
-            char *link_name = ((surf_resource_t) info.link_down)->name;
-            revCurrent = new_xbt_graph_node(graph, link_name, nodes);
-            new_xbt_graph_edge(graph, revCurrent, revPrevious, edges);
-            revPrevious = revCurrent;
-          }
-        }
-
-      }
-    }
-*/
+  }
 }
 
 static void model_cluster_finalize(AS_t as)