X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f365d61a634d854a3244979c0524de3cf3a74f72..5972326eb1013c4071d7af0c8959d6fbf793ef78:/src/instr/instr_paje.c

diff --git a/src/instr/instr_paje.c b/src/instr/instr_paje.c
index b523297717..86eeadf1c6 100644
--- a/src/instr/instr_paje.c
+++ b/src/instr/instr_paje.c
@@ -16,20 +16,39 @@ static xbt_dict_t allContainers = NULL;     /* all created containers indexed by
 xbt_dict_t trivaNodeTypes = NULL;     /* all link types defined */
 xbt_dict_t trivaEdgeTypes = NULL;     /* all host types defined */
 
-void instr_paje_init (container_t root)
+void instr_paje_init (void)
 {
   allContainers = xbt_dict_new_homogeneous(NULL);
   trivaNodeTypes = xbt_dict_new_homogeneous(xbt_free);
   trivaEdgeTypes = xbt_dict_new_homogeneous(xbt_free);
+}
+
+void instr_paje_set_root (container_t root)
+{
   rootContainer = root;
 }
 
+void instr_paje_free (void)
+{
+  xbt_dict_free (&allContainers);
+  xbt_dict_free (&trivaNodeTypes);
+  xbt_dict_free (&trivaEdgeTypes);
+}
+
 static long long int new_type_id (void)
 {
   static long long int type_id = 0;
   return type_id++;
 }
 
+static void destroyValue (void *value)
+{
+  xbt_free(((val_t)value)->name);
+  xbt_free(((val_t)value)->color);
+  xbt_free(((val_t)value)->id);
+  xbt_free(value);
+}
+
 static val_t newValue (const char *valuename, const char *color, type_t father)
 {
   val_t ret = xbt_new0(s_val_t, 1);
@@ -283,11 +302,18 @@ static type_t recursiveGetType (const char *name, type_t root)
   xbt_dict_cursor_t cursor = NULL;
   type_t child;
   char *child_name;
+  type_t ret = NULL;
   xbt_dict_foreach(root->children, cursor, child_name, child) {
-    type_t ret = recursiveGetType(name, child);
-    if (ret) return ret;
+    type_t found = recursiveGetType(name, child);
+    if (found){
+      if (ret == NULL){
+        ret = found;
+      }else{
+        XBT_CRITICAL("[tracing] found two types with the same name");
+      }
+    }
   }
-  return NULL;
+  return ret;
 }
 
 type_t getType (const char *name, type_t father)
@@ -295,13 +321,19 @@ type_t getType (const char *name, type_t father)
   return recursiveGetType (name, father);
 }
 
-void destroyContainer (container_t container)
+void removeContainerFromParent (container_t child)
 {
-  //remove me from my father
-  if (container->father){
-    xbt_dict_remove(container->father->children, container->name);
+  container_t parent = child->father;
+  if (parent){
+    XBT_DEBUG("removeChildContainer (%s) FromContainer (%s) ",
+        child->name,
+        parent->name);
+    xbt_dict_remove (parent->children, child->name);
   }
+}
 
+void destroyContainer (container_t container)
+{
   XBT_DEBUG("destroy container %s", container->name);
 
   //obligation to dump previous events because they might
@@ -315,16 +347,20 @@ void destroyContainer (container_t container)
     new_pajeDestroyContainer(container);
   }
 
+  //remove it from allContainers data structure
+  xbt_dict_remove (allContainers, container->name);
+
   //free
   xbt_free (container->name);
   xbt_free (container->id);
-  xbt_free (container->children);
+  xbt_dict_free (&container->children);
   xbt_free (container);
   container = NULL;
 }
 
 static void recursiveDestroyContainer (container_t container)
 {
+  XBT_DEBUG("recursiveDestroyContainer %s", container->name);
   xbt_dict_cursor_t cursor = NULL;
   container_t child;
   char *child_name;
@@ -336,6 +372,7 @@ static void recursiveDestroyContainer (container_t container)
 
 static void recursiveDestroyType (type_t type)
 {
+  XBT_DEBUG("recursiveDestroyType %s", type->name);
   xbt_dict_cursor_t cursor = NULL;
   type_t child;
   char *child_name;
@@ -344,8 +381,14 @@ static void recursiveDestroyType (type_t type)
   }
   xbt_free (type->name);
   xbt_free (type->id);
-  xbt_free (type->children);
-  xbt_free (type->values);
+  xbt_free (type->color);
+  xbt_dict_free (&type->children);
+  val_t value;
+  char *value_name;
+  xbt_dict_foreach(type->values, cursor, value_name, value) {
+    destroyValue (value);
+  }
+  xbt_dict_free (&type->values);
   xbt_free (type);
   type = NULL;
 }