X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8043ee1afeda012d6eccef4cfe31faa3f784aa41..85d7d7b422da4ba7451be14ffa4889e165e73038:/src/instr/instr_routing.c

diff --git a/src/instr/instr_routing.c b/src/instr/instr_routing.c
index 037c934816..20ff7eace4 100644
--- a/src/instr/instr_routing.c
+++ b/src/instr/instr_routing.c
@@ -14,247 +14,128 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_routing, instr, "Tracing platform hierarc
 
 extern xbt_dict_t defined_types; /* from instr_interface.c */
 
-typedef enum {
-  INSTR_HOST,
-  INSTR_LINK,
-  INSTR_ROUTER,
-  INSTR_AS,
-} e_container_types;
-
-typedef struct s_container *container_t;
-typedef struct s_container {
-  char *name;     /* Unique name of this container */
-  char *id;       /* Unique id of this container */
-  char *type;     /* Type of this container */
-  char *typename; /* Type name of this container */
-  int level;      /* Level in the hierarchy, root level is 0 */
-  e_container_types kind; /* This container is of what kind */
-  struct s_container *father;
-  xbt_dict_t children;
-}s_container_t;
-
-static container_t rootContainer = NULL;    /* the root container */
+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 xbt_dict_t allContainers = NULL;     /* all created containers indexed by name */
-xbt_dict_t hosts_types = NULL;
-xbt_dict_t links_types = NULL;
-
-static void instr_routing_parse_start_AS (void);
-static void instr_routing_parse_end_AS (void);
-static void instr_routing_parse_start_link (void);
-static void instr_routing_parse_end_link (void);
-static void instr_routing_parse_start_host (void);
-static void instr_routing_parse_end_host (void);
-static void instr_routing_parse_start_router (void);
-static void instr_routing_parse_end_router (void);
-static void instr_routing_parse_end_platform (void);
-static char *instr_AS_type (int level);
-
-static char *instr_AS_type (int level)
-{
-  char *ret = xbt_new (char, INSTR_DEFAULT_STR_SIZE);
-  if (level == 0){
-    snprintf (ret, INSTR_DEFAULT_STR_SIZE, "0");
-  }else{
-    snprintf (ret, INSTR_DEFAULT_STR_SIZE, "L%d", level);
-  }
-  return ret;
-}
 
-static void newContainerType (const char *type, const char *parentType, const char *name)
+static container_t findChild (container_t root, container_t a1)
 {
-  char *defined = xbt_dict_get_or_null (defined_types, type);
-  if (!defined){
-    pajeDefineContainerType(type, parentType, name);
-    xbt_dict_set(defined_types, type, xbt_strdup("1"), xbt_free);
-  }
-}
-
+  if (root == a1) return root;
 
-static void newVariableType (const char *type, const char *parentType, const char *name, const char *color)
-{
-  char *defined = xbt_dict_get_or_null (defined_types, type);
-  if (!defined){
-    if (color){
-      pajeDefineVariableTypeWithColor(type, parentType, name, color);
-    }else{
-      pajeDefineVariableType(type, parentType, name);
-    }
-    xbt_dict_set(defined_types, type, xbt_strdup("1"), xbt_free);
+  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;
   }
+  return NULL;
 }
 
-static void newLinkType (const char *type, const char *parentType, const char *sourceType, const char *destType, const char *name)
+static container_t findCommonFather (container_t root, container_t a1, container_t a2)
 {
-  char *defined = xbt_dict_get_or_null (defined_types, type);
-  if (!defined){
-    pajeDefineLinkType(type, parentType, sourceType, destType, name);
-    xbt_dict_set(defined_types, type, xbt_strdup("1"), xbt_free);
-  }
-}
+  if (a1->father == a2->father) return a1->father;
 
-void instr_routing_define_callbacks ()
-{
-  if (!TRACE_is_active())
-    return;
-  surfxml_add_callback(STag_surfxml_AS_cb_list, &instr_routing_parse_start_AS);
-  surfxml_add_callback(ETag_surfxml_AS_cb_list, &instr_routing_parse_end_AS);
-  surfxml_add_callback(STag_surfxml_link_cb_list, &instr_routing_parse_start_link);
-  surfxml_add_callback(ETag_surfxml_link_cb_list, &instr_routing_parse_end_link);
-  surfxml_add_callback(STag_surfxml_host_cb_list, &instr_routing_parse_start_host);
-  surfxml_add_callback(ETag_surfxml_host_cb_list, &instr_routing_parse_end_host);
-  surfxml_add_callback(STag_surfxml_router_cb_list, &instr_routing_parse_start_router);
-  surfxml_add_callback(ETag_surfxml_router_cb_list, &instr_routing_parse_end_router);
-  surfxml_add_callback(ETag_surfxml_platform_cb_list, &instr_routing_parse_end_platform);
-}
-
-static long long int newContainedId ()
-{
-  static long long counter = 0;
-  return counter++;
-}
-
-static container_t newContainer (const char *name, const char *type, e_container_types kind)
-{
-  long long int counter = newContainedId();
-  char id_str[INSTR_DEFAULT_STR_SIZE];
-  snprintf (id_str, INSTR_DEFAULT_STR_SIZE, "%lld", counter);
-
-  container_t newContainer = xbt_new0(s_container_t, 1);
-  newContainer->name = xbt_strdup (name);
-  newContainer->id = xbt_strdup (id_str);
-  newContainer->father = xbt_dynar_get_ptr(currentContainer, xbt_dynar_length(currentContainer)-1);
-  newContainer->level = newContainer->father->level+1;
-  newContainer->type = xbt_strdup (type);
-  switch (kind){
-    case INSTR_HOST: newContainer->typename = xbt_strdup ("HOST"); break;
-    case INSTR_LINK: newContainer->typename = xbt_strdup ("LINK"); break;
-    case INSTR_ROUTER: newContainer->typename = xbt_strdup ("ROUTER"); break;
-    case INSTR_AS: newContainer->typename = xbt_strdup ("AS"); break;
-    default: xbt_die ("Congratulations, you have found a bug on newContainer function of instr_routing.c"); break;
-  }
-  newContainer->kind = kind;
-  newContainer->children = xbt_dict_new();
-  xbt_dict_set(newContainer->father->children, newContainer->name, newContainer, NULL);
-
-  newContainerType (newContainer->type, newContainer->father->type, newContainer->typename);
-  pajeCreateContainer (0, newContainer->id, newContainer->type, newContainer->father->id, newContainer->name);
-
-  return newContainer;
-}
-
-static void recursiveDestroyContainer (container_t container)
-{
   xbt_dict_cursor_t cursor = NULL;
   container_t child;
   char *child_name;
-  xbt_dict_foreach(container->children, cursor, child_name, child) {
-    recursiveDestroyContainer (child);
+  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;
   }
-
-  pajeDestroyContainer(SIMIX_get_clock(), container->type, container->id);
-
-  xbt_free (container->name);
-  xbt_free (container->id);
-  xbt_free (container->type);
-  xbt_free (container->children);
-  xbt_free (container);
-  container = NULL;
+  return NULL;
 }
 
-static void linkContainers (container_t container, const char *a1, const char *a2)
+static void linkContainers (container_t father, container_t src, container_t dst, xbt_dict_t filter)
 {
   //ignore loopback
-  if (strcmp (a1, "__loopback__") == 0 || strcmp (a2, "__loopback__") == 0)
+  if (strcmp (src->name, "__loopback__") == 0 || strcmp (dst->name, "__loopback__") == 0)
     return;
 
-  char *a1_id = ((container_t)xbt_dict_get (allContainers, a1))->id;
-  char *a1_type = ((container_t)xbt_dict_get (allContainers, a1))->type;
-  char *a1_typename = ((container_t)xbt_dict_get (allContainers, a1))->typename;
-
-  char *a2_id = ((container_t)xbt_dict_get (allContainers, a2))->id;
-  char *a2_type = ((container_t)xbt_dict_get (allContainers, a2))->type;
-  char *a2_typename = ((container_t)xbt_dict_get (allContainers, a2))->typename;
+  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];
+    snprintf (aux1, INSTR_DEFAULT_STR_SIZE, "%s%s", src->name, dst->name);
+    snprintf (aux2, INSTR_DEFAULT_STR_SIZE, "%s%s", dst->name, src->name);
+    if (xbt_dict_get_or_null (filter, aux1)) return;
+    if (xbt_dict_get_or_null (filter, aux2)) return;
+
+    //ok, not found, register it
+    xbt_dict_set (filter, aux1, xbt_strdup ("1"), xbt_free);
+    xbt_dict_set (filter, aux2, xbt_strdup ("1"), xbt_free);
+  }
 
   //declare type
-  char new_link_type[INSTR_DEFAULT_STR_SIZE], new_link_typename[INSTR_DEFAULT_STR_SIZE];
-  snprintf (new_link_type, INSTR_DEFAULT_STR_SIZE, "%s-%s", a1_type, a2_type);
-  snprintf (new_link_typename, INSTR_DEFAULT_STR_SIZE, "%s-%s", a1_typename, a2_typename);
-  newLinkType (new_link_type, container->type, a1_type, a2_type, new_link_typename);
+  char link_typename[INSTR_DEFAULT_STR_SIZE];
+  snprintf (link_typename, INSTR_DEFAULT_STR_SIZE, "%s-%s", src->type->name, dst->type->name);
+  type_t link_type = getLinkType (link_typename, father->type, src->type, dst->type);
+
+  //register EDGE types for triva configuration
+  xbt_dict_set (trivaEdgeTypes, link_type->name, xbt_strdup("1"), xbt_free);
 
   //create the link
   static long long counter = 0;
   char key[INSTR_DEFAULT_STR_SIZE];
   snprintf (key, INSTR_DEFAULT_STR_SIZE, "%lld", counter++);
-  pajeStartLink(SIMIX_get_clock(), new_link_type, container->id, "G", a1_id, key);
-  pajeEndLink(SIMIX_get_clock(), new_link_type, container->id, "G", a2_id, key);
+  new_pajeStartLink(SIMIX_get_clock(), father, link_type, src, "G", key);
+  new_pajeEndLink(SIMIX_get_clock(), father, link_type, dst, "G", key);
 }
 
-static void recursiveGraphExtraction (container_t container)
+static void recursiveGraphExtraction (routing_component_t rc, container_t container, xbt_dict_t filter)
 {
-  if (xbt_dict_length(container->children)){
+  if (xbt_dict_length (rc->routing_sons)){
     xbt_dict_cursor_t cursor = NULL;
-    container_t child;
+    routing_component_t rc_son;
     char *child_name;
     //bottom-up recursion
-    xbt_dict_foreach(container->children, cursor, child_name, child) {
-      recursiveGraphExtraction (child);
+    xbt_dict_foreach(rc->routing_sons, cursor, child_name, rc_son) {
+      container_t child_container = xbt_dict_get (container->children, rc_son->name);
+      recursiveGraphExtraction (rc_son, child_container, filter);
     }
+  }
 
-    //let's get routes
-    xbt_dict_cursor_t cursor1 = NULL, cursor2 = NULL;
-    container_t child1, child2;
-    const char *child_name1, *child_name2;
-
-    xbt_dict_foreach(container->children, cursor1, child_name1, child1) {
-      xbt_dict_foreach(container->children, cursor2, child_name2, child2) {
-        if ((child1->kind == INSTR_HOST || child1->kind == INSTR_ROUTER) &&
-            (child2->kind == INSTR_HOST  || child2->kind == INSTR_ROUTER)){
-
-          //getting route
-          xbt_dynar_t route;
-          xbt_ex_t exception;
-          TRY {
-            route = global_routing->get_route (child_name1, child_name2);
-          }CATCH(exception) {
-            //no route between them, that's possible
-            continue;
-          }
-
-          //link the route members
-          unsigned int cpt;
-          void *link;
-          char *previous_entity_name = (char*)child_name1;
-          xbt_dynar_foreach (route, cpt, link) {
-            char *link_name = ((link_CM02_t)link)->lmm_resource.generic_resource.name;
-            linkContainers (container, previous_entity_name, link_name);
-            previous_entity_name = link_name;
-          }
-          linkContainers (container, previous_entity_name, child_name2);
-        }else if (child1->kind == INSTR_AS &&
-                  child2->kind == INSTR_AS &&
-                  strcmp(child_name1, child_name2) != 0){
-
-          //getting route
-          routing_component_t root = global_routing->root;
-          route_extended_t route;
-          xbt_ex_t exception;
-          TRY {
-            route = root->get_route (root, child_name1, child_name2);
-          }CATCH(exception) {
-            //no route between them, that's possible
-            continue;
-          }
-          unsigned int cpt;
-          void *link;
-          char *previous_entity_name = route->src_gateway;
-          xbt_dynar_foreach (route->generic_route.link_list, cpt, link) {
-            char *link_name = ((link_CM02_t)link)->lmm_resource.generic_resource.name;
-            linkContainers (container, previous_entity_name, link_name);
-            previous_entity_name = link_name;
-          }
-          linkContainers (container, previous_entity_name, route->dst_gateway);
+  //let's get routes
+  xbt_dict_cursor_t cursor1 = NULL, cursor2 = NULL;
+  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){
+
+        xbt_dynar_t route = global_routing->get_route (child1_name, child2_name);
+        unsigned int cpt;
+        void *link;
+        container_t previous = child1;
+        xbt_dynar_foreach (route, cpt, link) {
+          char *link_name = ((link_CM02_t)link)->lmm_resource.generic_resource.name;
+          container_t current = getContainerByName(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_extended_t route = rc->get_route (rc, child1_name, child2_name);
+        unsigned int cpt;
+        void *link;
+        container_t previous = getContainerByName(route->src_gateway);
+        xbt_dynar_foreach (route->generic_route.link_list, cpt, link) {
+          char *link_name = ((link_CM02_t)link)->lmm_resource.generic_resource.name;
+          container_t current = getContainerByName(link_name);
+          linkContainers (container, previous, current, filter);
+          previous = current;
+        }
+        container_t last = getContainerByName(route->dst_gateway);
+        linkContainers (container, previous, last, filter);
       }
     }
   }
@@ -265,46 +146,29 @@ static void recursiveGraphExtraction (container_t container)
  */
 static void instr_routing_parse_start_AS ()
 {
-  if (rootContainer == NULL){
-    rootContainer = xbt_new0(s_container_t, 1);
-    rootContainer->name = xbt_strdup ("0");
-    rootContainer->id = xbt_strdup (rootContainer->name);
-    rootContainer->type = xbt_strdup ("0");
-    rootContainer->typename = xbt_strdup ("0");
-    rootContainer->level = 0;
-    rootContainer->father = NULL;
-    rootContainer->children = xbt_dict_new();
-    rootContainer->kind = INSTR_AS;
-
-    currentContainer = xbt_dynar_new (sizeof(s_container_t), NULL);
-    xbt_dynar_push (currentContainer, rootContainer);
-
-    allContainers = xbt_dict_new ();
-    hosts_types = xbt_dict_new ();
-    links_types = xbt_dict_new ();
-  }
+  if (getRootContainer() == NULL){
+    container_t root = newContainer (A_surfxml_AS_id, INSTR_AS, NULL);
+    instr_paje_init (root);
+
+    currentContainer = xbt_dynar_new (sizeof(container_t), NULL);
+    xbt_dynar_push (currentContainer, &root);
+
+    if (TRACE_smpi_is_enabled()) {
+      if (!TRACE_smpi_is_grouped()){
+        container_t father = *(container_t*)xbt_dynar_get_ptr(currentContainer, xbt_dynar_length(currentContainer)-1);
+        type_t mpi = getContainerType("MPI", father->type);
+        getStateType ("MPI_STATE", mpi);
+        getLinkType ("MPI_LINK", getRootType(), mpi, mpi);
+      }
+    }
 
-  long long int counter = newContainedId();
-  char id_str[INSTR_DEFAULT_STR_SIZE];
-  snprintf (id_str, INSTR_DEFAULT_STR_SIZE, "%lld", counter);
-
-  container_t newContainer = xbt_new0(s_container_t, 1);
-  newContainer->name = xbt_strdup (A_surfxml_AS_id);
-  newContainer->id = xbt_strdup (id_str);
-  newContainer->father = xbt_dynar_get_ptr(currentContainer, xbt_dynar_length(currentContainer)-1);
-  newContainer->level = newContainer->father->level+1;
-  newContainer->type = instr_AS_type (newContainer->level);
-  newContainer->typename = instr_AS_type (newContainer->level);
-  newContainer->children = xbt_dict_new();
-  newContainer->kind = INSTR_AS;
-  xbt_dict_set(newContainer->father->children, newContainer->name, newContainer, NULL);
-
-  //trace
-  newContainerType (newContainer->type, newContainer->father->type, newContainer->type);
-  pajeCreateContainer (0, newContainer->id, newContainer->type, newContainer->father->id, newContainer->name);
+    return;
+  }
+  container_t father = *(container_t*)xbt_dynar_get_ptr(currentContainer, xbt_dynar_length(currentContainer)-1);
+  container_t new = newContainer (A_surfxml_AS_id, INSTR_AS, father);
 
   //push
-  xbt_dynar_push (currentContainer, newContainer);
+  xbt_dynar_push (currentContainer, &new);
 }
 
 static void instr_routing_parse_end_AS ()
@@ -314,32 +178,40 @@ static void instr_routing_parse_end_AS ()
 
 static void instr_routing_parse_start_link ()
 {
-  container_t father = xbt_dynar_get_ptr(currentContainer, xbt_dynar_length(currentContainer)-1);
-  char type[INSTR_DEFAULT_STR_SIZE];
-  snprintf (type, INSTR_DEFAULT_STR_SIZE, "LINK-%s", father->type);
-  container_t new = newContainer (A_surfxml_link_id, type, INSTR_LINK);
-
-  //bandwidth and latency
-  char bandwidth_type[INSTR_DEFAULT_STR_SIZE], latency_type[INSTR_DEFAULT_STR_SIZE];
-  snprintf (bandwidth_type, INSTR_DEFAULT_STR_SIZE, "bandwidth-%s", type);
-  snprintf (latency_type, INSTR_DEFAULT_STR_SIZE, "latency-%s", type);
-  newVariableType (bandwidth_type, type, "bandwidth", NULL);
-  newVariableType (latency_type, type, "latency", NULL);
-  pajeSetVariable(0, bandwidth_type, new->id, A_surfxml_link_bandwidth);
-  pajeSetVariable(0, latency_type, new->id, A_surfxml_link_latency);
-
-  if (TRACE_uncategorized()){
-    //bandwidth_used
-    char bandwidth_used_type[INSTR_DEFAULT_STR_SIZE];
-    snprintf (bandwidth_used_type, INSTR_DEFAULT_STR_SIZE, "bandwidth_used-%s", type);
-    newVariableType (bandwidth_used_type, type, "bandwidth_used", "0.5 0.5 0.5");
+  container_t father = *(container_t*)xbt_dynar_get_ptr(currentContainer, xbt_dynar_length(currentContainer)-1);
+  const char *link_id = A_surfxml_link_id;
+
+  double bandwidth_value = atof(A_surfxml_link_bandwidth);
+  double latency_value = atof(A_surfxml_link_latency);
+  xbt_dynar_t links_to_create = xbt_dynar_new (sizeof(char*), &xbt_free_ref);
+
+  if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FULLDUPLEX){
+    char *up = bprintf("%s_UP", link_id);
+    char *down = bprintf("%s_DOWN", link_id);
+    xbt_dynar_push_as (links_to_create, char*, xbt_strdup(up));
+    xbt_dynar_push_as (links_to_create, char*, xbt_strdup(down));
+    free (up);
+    free (down);
+  }else{
+    xbt_dynar_push_as (links_to_create, char*, strdup(link_id));
   }
 
-  //register created link on the dictionary
-  xbt_dict_set (allContainers, A_surfxml_link_id, new, NULL);
+  char *link_name = NULL;
+  unsigned int i;
+  xbt_dynar_foreach (links_to_create, i, link_name){
 
-  //register this link type
-  xbt_dict_set (links_types, type, xbt_strdup("1"), xbt_free);
+    container_t new = newContainer (link_name, INSTR_LINK, father);
+
+    type_t bandwidth = getVariableType ("bandwidth", NULL, new->type);
+    type_t latency = getVariableType ("latency", NULL, new->type);
+    new_pajeSetVariable (0, new, bandwidth, bandwidth_value);
+    new_pajeSetVariable (0, new, latency, latency_value);
+    if (TRACE_uncategorized()){
+      getVariableType ("bandwidth_used", "0.5 0.5 0.5", new->type);
+    }
+  }
+
+  xbt_dynar_free (&links_to_create);
 }
 
 static void instr_routing_parse_end_link ()
@@ -348,29 +220,43 @@ static void instr_routing_parse_end_link ()
 
 static void instr_routing_parse_start_host ()
 {
-  container_t father = xbt_dynar_get_ptr(currentContainer, xbt_dynar_length(currentContainer)-1);
-  char type[INSTR_DEFAULT_STR_SIZE];
-  snprintf (type, INSTR_DEFAULT_STR_SIZE, "HOST-%s", father->type);
-  container_t new = newContainer (A_surfxml_host_id, type, INSTR_HOST);
-
-  //power
-  char power_type[INSTR_DEFAULT_STR_SIZE];
-  snprintf (power_type, INSTR_DEFAULT_STR_SIZE, "power-%s", type);
-  newVariableType (power_type, type, "power", NULL);
-  pajeSetVariable(0, power_type, new->id, A_surfxml_host_power);
+  container_t father = *(container_t*)xbt_dynar_get_ptr(currentContainer, xbt_dynar_length(currentContainer)-1);
+  container_t new = newContainer (A_surfxml_host_id, INSTR_HOST, father);
 
+  type_t power = getVariableType ("power", NULL, new->type);
+  new_pajeSetVariable (0, new, power, atof(A_surfxml_host_power));
   if (TRACE_uncategorized()){
-    //power_used
-    char power_used_type[INSTR_DEFAULT_STR_SIZE];
-    snprintf (power_used_type, INSTR_DEFAULT_STR_SIZE, "power_used-%s", type);
-    newVariableType (power_used_type, type, "power_used", "0.5 0.5 0.5");
+    getVariableType ("power_used", "0.5 0.5 0.5", new->type);
+  }
+
+  if (TRACE_smpi_is_enabled()) {
+    if (TRACE_smpi_is_grouped()){
+      type_t mpi = getContainerType("MPI", new->type);
+      getStateType ("MPI_STATE", mpi);
+      getLinkType ("MPI_LINK", getRootType(), mpi, mpi);
+    }
   }
 
-  //register created host on the dictionary
-  xbt_dict_set (allContainers, A_surfxml_host_id, new, NULL);
+  if (TRACE_msg_process_is_enabled()) {
+    type_t msg_process = getContainerType("MSG_PROCESS", new->type);
+    type_t state = getStateType ("MSG_PROCESS_STATE", msg_process);
+    getValue ("executing", "0 1 0", state);
+    getValue ("suspend", "1 0 1", state);
+    getValue ("sleep", "1 1 0", state);
+    getValue ("receive", "1 0 0", state);
+    getValue ("send", "0 0 1", state);
+    getValue ("task_execute", "0 1 1", state);
+    getLinkType ("MSG_PROCESS_LINK", getRootType(), msg_process, msg_process);
+    getLinkType ("MSG_PROCESS_TASK_LINK", getRootType(), msg_process, msg_process);
+  }
 
-  //register this link type
-  xbt_dict_set (hosts_types, type, xbt_strdup("1"), xbt_free);
+  if (TRACE_msg_task_is_enabled()) {
+    type_t msg_task = getContainerType ("MSG_TASK", new->type);
+    type_t state = getStateType ("MSG_TASK_STATE", msg_task);
+    getValue ("MSG_task_execute", "0 1 0", state);
+    getValue ("created", "1 1 0", state);
+    getLinkType ("MSG_TASK_LINK", getRootType(), msg_task, msg_task);
+  }
 }
 
 static void instr_routing_parse_end_host ()
@@ -379,13 +265,8 @@ static void instr_routing_parse_end_host ()
 
 static void instr_routing_parse_start_router ()
 {
-  container_t father = xbt_dynar_get_ptr(currentContainer, xbt_dynar_length(currentContainer)-1);
-  char type[INSTR_DEFAULT_STR_SIZE];
-  snprintf (type, INSTR_DEFAULT_STR_SIZE, "ROUTER-%s", father->type);
-  container_t new = newContainer (A_surfxml_router_id, type, INSTR_ROUTER);
-
-  //register created host on the dictionary
-  xbt_dict_set (allContainers, A_surfxml_router_id, new, NULL);
+  container_t father = *(container_t*)xbt_dynar_get_ptr(currentContainer, xbt_dynar_length(currentContainer)-1);
+  newContainer (A_surfxml_router_id, INSTR_ROUTER, father);
 }
 
 static void instr_routing_parse_end_router ()
@@ -394,40 +275,98 @@ static void instr_routing_parse_end_router ()
 
 static void instr_routing_parse_end_platform ()
 {
+  xbt_dynar_free(&currentContainer);
   currentContainer = NULL;
-  recursiveGraphExtraction (rootContainer);
+  xbt_dict_t filter = xbt_dict_new ();
+  recursiveGraphExtraction (global_routing->root, getRootContainer(), filter);
+  xbt_dict_free(&filter);
+  platform_created = 1;
+  TRACE_paje_dump_buffer(1);
+}
+
+void instr_routing_define_callbacks ()
+{
+  if (!TRACE_is_active())
+    return;
+  surfxml_add_callback(STag_surfxml_AS_cb_list, &instr_routing_parse_start_AS);
+  surfxml_add_callback(ETag_surfxml_AS_cb_list, &instr_routing_parse_end_AS);
+  surfxml_add_callback(STag_surfxml_link_cb_list, &instr_routing_parse_start_link);
+  surfxml_add_callback(ETag_surfxml_link_cb_list, &instr_routing_parse_end_link);
+  surfxml_add_callback(STag_surfxml_host_cb_list, &instr_routing_parse_start_host);
+  surfxml_add_callback(ETag_surfxml_host_cb_list, &instr_routing_parse_end_host);
+  surfxml_add_callback(STag_surfxml_router_cb_list, &instr_routing_parse_start_router);
+  surfxml_add_callback(ETag_surfxml_router_cb_list, &instr_routing_parse_end_router);
+  surfxml_add_callback(ETag_surfxml_platform_cb_list, &instr_routing_parse_end_platform);
 }
 
 /*
- * Support functions
+ * user categories support
  */
-int instr_link_is_traced (const char *name)
+static void recursiveNewUserVariableType (const char *new_typename, const char *color, type_t root)
+{
+  if (!strcmp (root->name, "HOST")){
+    char tnstr[INSTR_DEFAULT_STR_SIZE];
+    snprintf (tnstr, INSTR_DEFAULT_STR_SIZE, "p%s", new_typename);
+    getVariableType(tnstr, color, root);
+  }
+  if (!strcmp (root->name, "LINK")){
+    char tnstr[INSTR_DEFAULT_STR_SIZE];
+    snprintf (tnstr, INSTR_DEFAULT_STR_SIZE, "b%s", new_typename);
+    getVariableType(tnstr, color, root);
+  }
+  xbt_dict_cursor_t cursor = NULL;
+  type_t child_type;
+  char *name;
+  xbt_dict_foreach(root->children, cursor, name, child_type) {
+    recursiveNewUserVariableType (new_typename, color, child_type);
+  }
+}
+
+void instr_new_user_variable_type (const char *new_typename, const char *color)
+{
+  recursiveNewUserVariableType (new_typename, color, getRootType());
+}
+
+static void recursiveNewUserLinkVariableType (const char *new_typename, const char *color, type_t root)
 {
-  if (((container_t)xbt_dict_get_or_null (allContainers, name))){
-    return 1;
-  } else {
-    return 0;
+  if (!strcmp (root->name, "LINK")){
+    getVariableType(new_typename, color, root);
+  }
+  xbt_dict_cursor_t cursor = NULL;
+  type_t child_type;
+  char *name;
+  xbt_dict_foreach(root->children, cursor, name, child_type) {
+    recursiveNewUserLinkVariableType (new_typename, color, child_type);
   }
 }
 
-char *instr_link_type (const char *name)
+void instr_new_user_link_variable_type  (const char *new_typename, const char *color)
 {
-  return ((container_t)xbt_dict_get (allContainers, name))->type;
+  recursiveNewUserLinkVariableType (new_typename, color, getRootType());
 }
 
-char *instr_host_type (const char *name)
+
+static void recursiveNewUserHostVariableType (const char *new_typename, const char *color, type_t root)
 {
-  return ((container_t)xbt_dict_get (allContainers, name))->type;
+  if (!strcmp (root->name, "HOST")){
+    getVariableType(new_typename, color, root);
+  }
+  xbt_dict_cursor_t cursor = NULL;
+  type_t child_type;
+  char *name;
+  xbt_dict_foreach(root->children, cursor, name, child_type) {
+    recursiveNewUserHostVariableType (new_typename, color, child_type);
+  }
 }
 
-char *instr_id (const char *name)
+void instr_new_user_host_variable_type  (const char *new_typename, const char *color)
 {
-  return ((container_t)xbt_dict_get (allContainers, name))->id;
+  recursiveNewUserHostVariableType (new_typename, color, getRootType());
 }
 
-void instr_destroy_platform ()
+int instr_platform_traced ()
 {
-  if (rootContainer) recursiveDestroyContainer (rootContainer);
+  return platform_created;
 }
 
 #endif /* HAVE_TRACING */