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

diff --git a/src/instr/instr_routing.c b/src/instr/instr_routing.c
index 553ecead18..fa8b22c352 100644
--- a/src/instr/instr_routing.c
+++ b/src/instr/instr_routing.c
@@ -18,39 +18,57 @@ 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 const char *instr_node_name (xbt_node_t node)
+{
+  void *data = xbt_graph_node_get_data(node);
+  char *str = (char*)data;
+  return str;
+}
+
+
 static container_t lowestCommonAncestor (container_t a1, container_t a2)
 {
   //this is only an optimization (since most of a1 and a2 share the same parent)
   if (a1->father == a2->father) return a1->father;
 
   //create an array with all ancestors of a1
-  xbt_dynar_t ancestors = xbt_dynar_new(sizeof(container_t), NULL);
+  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, container_t, p);
+    xbt_dynar_push_as (ancestors_a1, container_t, p);
     p = p->father;
   }
 
-  //find the lowest ancestor of a2 in the previously created array
+  //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){
-    int cpt;
-    unsigned int cursor;
-    xbt_dynar_foreach (ancestors, cursor, cpt){
-      container_t pp = *(container_t*)xbt_dynar_get_ptr(ancestors, cursor);
-      if (p == pp){
-        return p;
-      }
-    }
+    xbt_dynar_push_as (ancestors_a2, container_t, p);
     p = p->father;
   }
 
-  //not common ancestor found, return NULL
-  return NULL;
+  //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--;
+  }
+  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)
@@ -77,7 +95,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);
@@ -112,58 +133,52 @@ static void recursiveGraphExtraction (AS_t rc, container_t container, xbt_dict_t
   container_t child1, child2;
   const char *child1_name, *child2_name;
   xbt_dict_foreach(container->children, cursor1, child1_name, child1) {
-    if (child1->kind == INSTR_LINK) continue;
-    xbt_dict_foreach(container->children, cursor2, child2_name, child2) {
-      if (child2->kind == INSTR_LINK) continue;
+    //if child1 is not a link, a smpi node, a msg process or a msg task
+    if (child1->kind == INSTR_LINK || child1->kind == INSTR_SMPI || child1->kind == INSTR_MSG_PROCESS || child1->kind == INSTR_MSG_TASK) continue;
 
-      if ((child1->kind == INSTR_HOST || child1->kind == INSTR_ROUTER) &&
-          (child2->kind == INSTR_HOST  || child2->kind == INSTR_ROUTER) &&
-          strcmp (child1_name, child2_name) != 0){
+    xbt_dict_foreach(container->children, cursor2, child2_name, child2) {
+      //if child2 is not a link, a smpi node, a msg process or a msg task
+      if (child2->kind == INSTR_LINK || child2->kind == INSTR_SMPI || child2->kind == INSTR_MSG_PROCESS || child2->kind == INSTR_MSG_TASK) continue;
 
-        xbt_dynar_t route = NULL;
-        xbt_ex_t e;
+      //if child1 is not child2
+      if (strcmp (child1_name, child2_name) == 0) continue;
 
-        TRY {
-          routing_get_route_and_latency(child1_name, child2_name, &route, NULL);
-        } CATCH(e) {
-          xbt_ex_free(e);
-        }
-        if (route == NULL) continue;
+      //get the route
+      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->net_elm, child2->net_elm,
+                                route, NULL);
 
-        if (TRACE_onelink_only()){
-          if (xbt_dynar_length (route) > 1) continue;
-        }
-        container_t previous = child1;
-        int i;
-        for (i = 0; i < xbt_dynar_length(route); i++){
-          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);
-          previous = current;
-        }
-        linkContainers(container, previous, child2, filter);
-
-      }else if (child1->kind == INSTR_AS &&
-                child2->kind == INSTR_AS &&
-                strcmp(child1_name, child2_name) != 0){
-
-        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);
-        unsigned int cpt;
-        void *link;
-        container_t previous = PJ_container_get(route->src_gateway);
-        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);
-          previous = current;
-        }
-        container_t last = PJ_container_get(route->dst_gateway);
-        linkContainers (container, previous, last, filter);
+      //user might want to extract a graph using routes with only one link
+      //see --cfg=tracing/onelink_only:1 or --help-tracing for details
+      if (TRACE_onelink_only() && xbt_dynar_length (route->link_list) > 1){
         generic_free_route(route);
+        continue;
+      }
+
+      //traverse the route connecting the containers
+      unsigned int cpt;
+      void *link;
+      container_t current, previous;
+      if (route->src_gateway){
+        previous = PJ_container_get(route->src_gateway->name);
+      }else{
+        previous = child1;
+      }
+
+      xbt_dynar_foreach (route->link_list, cpt, link) {
+        char *link_name = ((link_CM02_t)link)->lmm_resource.generic_resource.name;
+        current = PJ_container_get(link_name);
+        linkContainers(previous, current, filter);
+        previous = current;
       }
+      if (route->dst_gateway){
+        current = PJ_container_get(route->dst_gateway->name);
+      }else{
+        current = child2;
+      }
+      linkContainers(previous, current, filter);
+      generic_free_route(route);
     }
   }
 }
@@ -405,21 +420,25 @@ static xbt_node_t new_xbt_graph_node (xbt_graph_t graph, const char *name, xbt_d
 static xbt_edge_t new_xbt_graph_edge (xbt_graph_t graph, xbt_node_t s, xbt_node_t d, xbt_dict_t edges)
 {
   xbt_edge_t ret;
-  char *name;
 
-  const char *sn = TRACE_node_name (s);
-  const char *dn = TRACE_node_name (d);
+  const char *sn = instr_node_name (s);
+  const char *dn = instr_node_name (d);
+  int len = strlen(sn)+strlen(dn)+1;
+  char *name = (char*)malloc(len * sizeof(char));
 
-  name = bprintf ("%s%s", sn, dn);
-  ret = xbt_dict_get_or_null (edges, name);
-  if (ret) return ret;
-  free (name);
-  name = bprintf ("%s%s", dn, sn);
+
+  snprintf (name, len, "%s%s", sn, dn);
   ret = xbt_dict_get_or_null (edges, name);
-  if (ret) return ret;
+  if (ret == NULL){
+    snprintf (name, len, "%s%s", dn, sn);
+    ret = xbt_dict_get_or_null (edges, name);
+  }
 
-  ret = xbt_graph_new_edge(graph, s, d, NULL);
-  xbt_dict_set (edges, name, ret, NULL);
+  if (ret == NULL){
+    ret = xbt_graph_new_edge(graph, s, d, NULL);
+    xbt_dict_set (edges, name, ret, NULL);
+  }
+  free (name);
   return ret;
 }
 
@@ -442,53 +461,50 @@ static void recursiveXBTGraphExtraction (xbt_graph_t graph, xbt_dict_t nodes, xb
   container_t child1, child2;
   const char *child1_name, *child2_name;
   xbt_dict_foreach(container->children, cursor1, child1_name, child1) {
-    if (child1->kind == INSTR_LINK) continue;
-    xbt_dict_foreach(container->children, cursor2, child2_name, child2) {
-      if (child2->kind == INSTR_LINK) continue;
-
-      if ((child1->kind == INSTR_HOST || child1->kind == INSTR_ROUTER) &&
-          (child2->kind == INSTR_HOST  || child2->kind == INSTR_ROUTER) &&
-          strcmp (child1_name, child2_name) != 0){
+    //if child1 is not a link, a smpi node, a msg process or a msg task
+    if (child1->kind == INSTR_LINK || child1->kind == INSTR_SMPI || child1->kind == INSTR_MSG_PROCESS || child1->kind == INSTR_MSG_TASK) continue;
 
-        // 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);
-        if (TRACE_onelink_only()){
-          if (xbt_dynar_length (route) > 1) continue;
-        }
-        unsigned int cpt;
-        void *link;
-        xbt_node_t current, previous = new_xbt_graph_node(graph, child1_name, nodes);
-        xbt_dynar_foreach (route, cpt, link) {
-          char *link_name = ((link_CM02_t)link)->lmm_resource.generic_resource.name;
-          current = new_xbt_graph_node(graph, link_name, nodes);
-          new_xbt_graph_edge (graph, previous, current, edges);
-          //previous -> current
-          previous = current;
-        }
-        current = new_xbt_graph_node(graph, child2_name, nodes);
-        new_xbt_graph_edge (graph, previous, current, edges);
+    xbt_dict_foreach(container->children, cursor2, child2_name, child2) {
+      //if child2 is not a link, a smpi node, a msg process or a msg task
+      if (child2->kind == INSTR_LINK || child2->kind == INSTR_SMPI || child2->kind == INSTR_MSG_PROCESS || child2->kind == INSTR_MSG_TASK) continue;
+
+      //if child1 is not child2
+      if (strcmp (child1_name, child2_name) == 0) continue;
+
+      //get the route
+      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->net_elm, child2->net_elm,
+                                route, NULL);
+
+      //user might want to extract a graph using routes with only one link
+      //see --cfg=tracing/onelink_only:1 or --help-tracing for details
+      if (TRACE_onelink_only() && xbt_dynar_length (route->link_list) > 1) continue;
+
+      //traverse the route connecting the containers
+      unsigned int cpt;
+      void *link;
+      xbt_node_t current, previous;
+      if (route->src_gateway){
+        previous = new_xbt_graph_node(graph, route->src_gateway->name, nodes);
+      }else{
+        previous = new_xbt_graph_node(graph, child1_name, nodes);
+      }
 
-      }else if (child1->kind == INSTR_AS &&
-                child2->kind == INSTR_AS &&
-                strcmp(child1_name, child2_name) != 0){
-
-        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);
-        unsigned int cpt;
-        void *link;
-        xbt_node_t current, previous = new_xbt_graph_node(graph, route->src_gateway, 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);
+      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);
         new_xbt_graph_edge (graph, previous, current, edges);
-        generic_free_route(route);
+        //previous -> current
+        previous = current;
+      }
+      if (route->dst_gateway){
+        current = new_xbt_graph_node(graph, route->dst_gateway->name, nodes);
+      }else{
+        current = new_xbt_graph_node(graph, child2_name, nodes);
       }
+      new_xbt_graph_edge (graph, previous, current, edges);
+      generic_free_route(route);
     }
   }
 
@@ -500,6 +516,8 @@ xbt_graph_t instr_routing_platform_graph (void)
   xbt_dict_t nodes = xbt_dict_new_homogeneous(NULL);
   xbt_dict_t edges = xbt_dict_new_homogeneous(NULL);
   recursiveXBTGraphExtraction (ret, nodes, edges, global_routing->root, PJ_container_get_root());
+  xbt_dict_free (&nodes);
+  xbt_dict_free (&edges);
   return ret;
 }
 
@@ -525,11 +543,11 @@ void instr_routing_platform_graph_export_graphviz (xbt_graph_t g, const char *fi
           "  node [width=.3, height=.3, style=filled, color=skyblue]\n\n");
 
   xbt_dynar_foreach(g->nodes, cursor, node) {
-    fprintf(file, "  \"%s\";\n", TRACE_node_name(node));
+    fprintf(file, "  \"%s\";\n", instr_node_name(node));
   }
   xbt_dynar_foreach(g->edges, cursor, edge) {
-    const char *src_s = TRACE_node_name (edge->src);
-    const char *dst_s = TRACE_node_name (edge->dst);
+    const char *src_s = instr_node_name (edge->src);
+    const char *dst_s = instr_node_name (edge->dst);
     if (g->directed)
       fprintf(file, "  \"%s\" -> \"%s\";\n", src_s, dst_s);
     else