From: schnorr <Lucas.Schnorr@imag.fr>
Date: Tue, 6 Mar 2012 12:27:02 +0000 (+0100)
Subject: [trace] fix the graph extraction tracing of complex AS hierarchies
X-Git-Tag: v3_7~315^2~23
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/fb47192844897233f23f85dbd9776bf7dc8c5f83

[trace] fix the graph extraction tracing of complex AS hierarchies

details:
- now it is harder to configure simgrid traces for the graph visualization
by hand, but since simgrid tracing creates them automatically with
parameters for that extent, it should be okay.
- these complex link names are exposed in the graph configuration
generated with --cfg=triva/uncategorized:uncat.plist and
--cfg=triva/categorized:cat.plist
---

diff --git a/src/instr/instr_routing.c b/src/instr/instr_routing.c
index c979c77725..0802395057 100644
--- a/src/instr/instr_routing.c
+++ b/src/instr/instr_routing.c
@@ -87,7 +87,10 @@ static void linkContainers (container_t src, container_t dst, xbt_dict_t filter)
 
   //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);