[trace] fix SimDag tracing

[simgrid.git] / src / instr / instr_paje_containers.c

diff --git a/src/instr/instr_paje_containers.c b/src/instr/instr_paje_containers.c
index ea253ca..526db8a 100644 (file)
--- a/src/instr/instr_paje_containers.c
+++ b/src/instr/instr_paje_containers.c
@@ -54,6 +54,26 @@ container_t PJ_container_new (const char *name, e_container_types kind, containe
   new->name = xbt_strdup (name); // name of the container
   new->id = xbt_strdup (id_str); // id (or alias) of the container
   new->father = father;
+
+  //Search for network_element_t
+  switch (kind){
+    case INSTR_HOST:
+      new->net_elm = xbt_lib_get_or_null(host_lib,name,ROUTING_HOST_LEVEL);
+      if(!new->net_elm) xbt_die("Element '%s' not found",name);
+      break;
+    case INSTR_ROUTER:
+      new->net_elm = xbt_lib_get_or_null(as_router_lib,name,ROUTING_ASR_LEVEL);
+      if(!new->net_elm) xbt_die("Element '%s' not found",name);
+      break;
+    case INSTR_AS:
+      new->net_elm = xbt_lib_get_or_null(as_router_lib,name,ROUTING_ASR_LEVEL);
+      if(!new->net_elm) xbt_die("Element '%s' not found",name);
+      break;
+    default:
+      new->net_elm = NULL;
+      break;
+  }
+
   // level depends on level of father
   if (new->father){
     new->level = new->father->level+1;
@@ -68,7 +88,7 @@ container_t PJ_container_new (const char *name, e_container_types kind, containe
     char as_typename[INSTR_DEFAULT_STR_SIZE];
     snprintf (as_typename, INSTR_DEFAULT_STR_SIZE, "L%d", new->level);
     if (new->father){
-      new->type = PJ_type_get (as_typename, new->father->type);
+      new->type = PJ_type_get_or_null (as_typename, new->father->type);
       if (new->type == NULL){
         new->type = PJ_type_container_new (as_typename, new->father->type);
       }
@@ -87,7 +107,7 @@ container_t PJ_container_new (const char *name, e_container_types kind, containe
       case INSTR_MSG_TASK:    snprintf (typename, INSTR_DEFAULT_STR_SIZE, "MSG_TASK");    break;
       default: THROWF (tracing_error, 0, "new container kind is unknown."); break;
     }
-    type_t type = PJ_type_get (typename, new->father->type);
+    type_t type = PJ_type_get_or_null (typename, new->father->type);
     if (type == NULL){
       new->type = PJ_type_container_new (typename, new->father->type);
     }else{
@@ -104,12 +124,15 @@ container_t PJ_container_new (const char *name, e_container_types kind, containe
   if (xbt_dict_get_or_null(allContainers, new->name) != NULL){
     THROWF(tracing_error, 1, "container %s already present in allContainers data structure", new->name);
   }
+
   xbt_dict_set (allContainers, new->name, new, NULL);
+  XBT_DEBUG("Add container name '%s'",new->name);
 
   //register NODE types for triva configuration
   if (new->kind == INSTR_HOST || new->kind == INSTR_LINK || new->kind == INSTR_ROUTER) {
     xbt_dict_set (trivaNodeTypes, new->type->name, xbt_strdup("1"), NULL);
   }
+
   return new;
 }