X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e81c5b4392336470e1cbc17e64bfed196991e041..dbb6a5398ebdb917f1de3acc0d16cd83cd23de71:/src/instr/instr_routing.c

diff --git a/src/instr/instr_routing.c b/src/instr/instr_routing.c
index 084d25275f..472183fa3a 100644
--- a/src/instr/instr_routing.c
+++ b/src/instr/instr_routing.c
@@ -18,42 +18,60 @@ extern xbt_dict_t defined_types; /* from instr_interface.c */
 static int platform_created = 0;            /* indicate whether the platform file has been traced */
 static xbt_dynar_t currentContainer = NULL; /* push and pop, used only in creation */
 
-static container_t findChild (container_t root, container_t a1)
+static container_t lowestCommonAncestor (container_t a1, container_t a2)
 {
-  if (root == a1) return root;
+  //this is only an optimization (since most of a1 and a2 share the same parent)
+  if (a1->father == a2->father) return a1->father;
 
-  xbt_dict_cursor_t cursor = NULL;
-  container_t child;
-  char *child_name;
-  xbt_dict_foreach(root->children, cursor, child_name, child) {
-    if (findChild (child, a1)) return child;
+  //create an array with all ancestors of a1
+  xbt_dynar_t ancestors_a1 = xbt_dynar_new(sizeof(container_t), NULL);
+  container_t p;
+  p = a1->father;
+  while (p){
+    xbt_dynar_push_as (ancestors_a1, container_t, p);
+    p = p->father;
   }
-  return NULL;
-}
 
-static container_t findCommonFather (container_t root, container_t a1, container_t a2)
-{
-  if (a1->father == a2->father) return a1->father;
+  //create an array with all ancestors of a2
+  xbt_dynar_t ancestors_a2 = xbt_dynar_new(sizeof(container_t), NULL);
+  p = a2->father;
+  while (p){
+    xbt_dynar_push_as (ancestors_a2, container_t, p);
+    p = p->father;
+  }
 
-  xbt_dict_cursor_t cursor = NULL;
-  container_t child;
-  char *child_name;
-  container_t a1_try = NULL;
-  container_t a2_try = NULL;
-  xbt_dict_foreach(root->children, cursor, child_name, child) {
-    a1_try = findChild (child, a1);
-    a2_try = findChild (child, a2);
-    if (a1_try && a2_try) return child;
+  //find the lowest ancestor
+  p = NULL;
+  int i = xbt_dynar_length (ancestors_a1) - 1;
+  int j = xbt_dynar_length (ancestors_a2) - 1;
+  while (i >= 0 && j >= 0){
+    container_t a1p = *(container_t*)xbt_dynar_get_ptr (ancestors_a1, i);
+    container_t a2p = *(container_t*)xbt_dynar_get_ptr (ancestors_a2, j);
+    if (a1p == a2p){
+      p = a1p;
+    }else{
+      break;
+    }
+    i--;
+    j--;
   }
-  return NULL;
+  xbt_dynar_free (&ancestors_a1);
+  xbt_dynar_free (&ancestors_a2);
+  return p;
 }
 
-static void linkContainers (container_t father, container_t src, container_t dst, xbt_dict_t filter)
+static void linkContainers (container_t src, container_t dst, xbt_dict_t filter)
 {
   //ignore loopback
   if (strcmp (src->name, "__loopback__") == 0 || strcmp (dst->name, "__loopback__") == 0)
     return;
 
+  //find common father
+  container_t father = lowestCommonAncestor (src, dst);
+  if (!father){
+    xbt_die ("common father unknown, this is a tracing problem");
+  }
+
   if (filter != NULL){
     //check if we already register this pair (we only need one direction)
     char aux1[INSTR_DEFAULT_STR_SIZE], aux2[INSTR_DEFAULT_STR_SIZE];
@@ -69,7 +87,10 @@ static void linkContainers (container_t father, container_t src, container_t dst
 
   //declare type
   char link_typename[INSTR_DEFAULT_STR_SIZE];
-  snprintf (link_typename, INSTR_DEFAULT_STR_SIZE, "%s-%s", src->type->name, dst->type->name);
+  snprintf (link_typename, INSTR_DEFAULT_STR_SIZE, "%s-%s%s-%s%s",
+            father->type->name,
+            src->type->name, src->type->id,
+            dst->type->name, dst->type->id);
   type_t link_type = PJ_type_get_or_null (link_typename, father->type);
   if (link_type == NULL){
     link_type = PJ_type_link_new (link_typename, father->type, src->type, dst->type);
@@ -116,7 +137,9 @@ static void recursiveGraphExtraction (AS_t rc, container_t container, xbt_dict_t
         xbt_ex_t e;
 
         TRY {
-          routing_get_route_and_latency(child1_name, child2_name, &route, NULL);
+          routing_get_route_and_latency((network_element_t)(child1->net_elm),
+                                        (network_element_t)(child2->net_elm),
+                                        &route, NULL);
         } CATCH(e) {
           xbt_ex_free(e);
         }
@@ -131,10 +154,10 @@ static void recursiveGraphExtraction (AS_t rc, container_t container, xbt_dict_t
           link_CM02_t *link = ((link_CM02_t*)xbt_dynar_get_ptr (route, i));
           char *link_name = (*link)->lmm_resource.generic_resource.name;
           container_t current = PJ_container_get(link_name);
-          linkContainers(container, previous, current, filter);
+          linkContainers(previous, current, filter);
           previous = current;
         }
-        linkContainers(container, previous, child2, filter);
+        linkContainers(previous, child2, filter);
 
       }else if (child1->kind == INSTR_AS &&
                 child2->kind == INSTR_AS &&
@@ -142,18 +165,20 @@ static void recursiveGraphExtraction (AS_t rc, container_t container, xbt_dict_t
 
         route_t route = xbt_new0(s_route_t,1);
         route->link_list = xbt_dynar_new(global_routing->size_of_link,NULL);
-        rc->get_route_and_latency (rc, child1_name, child2_name, route,NULL);
+        rc->get_route_and_latency (rc,
+                                  (network_element_t)(child1->net_elm),
+                                  (network_element_t)(child2->net_elm), route,NULL);
         unsigned int cpt;
         void *link;
-        container_t previous = PJ_container_get(route->src_gateway);
+        container_t previous = PJ_container_get(route->src_gateway->name);
         xbt_dynar_foreach (route->link_list, cpt, link) {
           char *link_name = ((link_CM02_t)link)->lmm_resource.generic_resource.name;
           container_t current = PJ_container_get(link_name);
-          linkContainers (container, previous, current, filter);
+          linkContainers (previous, current, filter);
           previous = current;
         }
-        container_t last = PJ_container_get(route->dst_gateway);
-        linkContainers (container, previous, last, filter);
+        container_t last = PJ_container_get(route->dst_gateway->name);
+        linkContainers (previous, last, filter);
         generic_free_route(route);
       }
     }
@@ -444,7 +469,9 @@ static void recursiveXBTGraphExtraction (xbt_graph_t graph, xbt_dict_t nodes, xb
 
         // FIXME factorize route creation with else branch below (once possible)
         xbt_dynar_t route=NULL;
-        routing_get_route_and_latency (child1_name, child2_name,&route,NULL);
+        routing_get_route_and_latency ((network_element_t)(child1->net_elm),
+                                       (network_element_t)(child2->net_elm),
+                                       &route,NULL);
         if (TRACE_onelink_only()){
           if (xbt_dynar_length (route) > 1) continue;
         }
@@ -467,17 +494,19 @@ static void recursiveXBTGraphExtraction (xbt_graph_t graph, xbt_dict_t nodes, xb
 
         route_t route = xbt_new0(s_route_t,1);
         route->link_list = xbt_dynar_new(global_routing->size_of_link,NULL);
-        rc->get_route_and_latency (rc, child1_name, child2_name,route, NULL);
+        rc->get_route_and_latency (rc,
+                                   (network_element_t)(child1->net_elm),
+                                   (network_element_t)(child2->net_elm),route, NULL);
         unsigned int cpt;
         void *link;
-        xbt_node_t current, previous = new_xbt_graph_node(graph, route->src_gateway, nodes);
+        xbt_node_t current, previous = new_xbt_graph_node(graph, route->src_gateway->name, nodes);
         xbt_dynar_foreach (route->link_list, cpt, link) {
           char *link_name = ((link_CM02_t)link)->lmm_resource.generic_resource.name;
           current = new_xbt_graph_node(graph, link_name, nodes);
           //previous -> current
           previous = current;
         }
-        current = new_xbt_graph_node(graph, route->dst_gateway, nodes);
+        current = new_xbt_graph_node(graph, route->dst_gateway->name, nodes);
         new_xbt_graph_edge (graph, previous, current, edges);
         generic_free_route(route);
       }