X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8f3e7df6480d8da4db694b9ba382fa8c416ed916..1dc68fca3f3bd110ddaaf88fb90a8bbb83a584b2:/src/instr/instr_paje.c

diff --git a/src/instr/instr_paje.c b/src/instr/instr_paje.c
index a54c304e98..74cb8813be 100644
--- a/src/instr/instr_paje.c
+++ b/src/instr/instr_paje.c
@@ -24,6 +24,12 @@ void instr_paje_init (container_t root)
   rootContainer = root;
 }
 
+static long long int new_type_id (void)
+{
+  static long long int type_id = 0;
+  return type_id++;
+}
+
 static val_t newValue (const char *valuename, const char *color, type_t father)
 {
   val_t ret = xbt_new0(s_val_t, 1);
@@ -31,13 +37,12 @@ static val_t newValue (const char *valuename, const char *color, type_t father)
   ret->father = father;
   ret->color = xbt_strdup (color);
 
-  static long long int type_id = 0;
   char str_id[INSTR_DEFAULT_STR_SIZE];
-  snprintf (str_id, INSTR_DEFAULT_STR_SIZE, "v%lld", type_id++);
+  snprintf (str_id, INSTR_DEFAULT_STR_SIZE, "%lld", new_type_id());
   ret->id = xbt_strdup (str_id);
 
   xbt_dict_set (father->values, valuename, ret, NULL);
-  DEBUG2("new value %s, child of %s", ret->name, ret->father->name);
+  XBT_DEBUG("new value %s, child of %s", ret->name, ret->father->name);
   return ret;
 }
 
@@ -48,7 +53,7 @@ val_t getValue (const char *valuename, const char *color, type_t father)
   val_t ret = (val_t)xbt_dict_get_or_null (father->values, valuename);
   if (ret == NULL){
     ret = newValue (valuename, color, father);
-    DEBUG4("EntityValue %s(%s), child of %s(%s)", ret->name, ret->id, father->name, father->id);
+    XBT_DEBUG("EntityValue %s(%s), child of %s(%s)", ret->name, ret->id, father->name, father->id);
     new_pajeDefineEntityValue(ret);
   }
   return ret;
@@ -69,14 +74,13 @@ static type_t newType (const char *typename, const char *key, const char *color,
   ret->values = xbt_dict_new ();
   ret->color = xbt_strdup (color);
 
-  static long long int type_id = 0;
   char str_id[INSTR_DEFAULT_STR_SIZE];
-  snprintf (str_id, INSTR_DEFAULT_STR_SIZE, "%lld", type_id++);
+  snprintf (str_id, INSTR_DEFAULT_STR_SIZE, "%lld", new_type_id());
   ret->id = xbt_strdup (str_id);
 
   if (father != NULL){
     xbt_dict_set (father->children, key, ret, NULL);
-    DEBUG2("new type %s, child of %s", typename, father->name);
+    XBT_DEBUG("new type %s, child of %s", typename, father->name);
   }
   return ret;
 }
@@ -114,7 +118,7 @@ type_t getEventType (const char *typename, const char *color, type_t father)
     }else{
       ret = newType (typename, typename, color, TYPE_EVENT, father);
     }
-    DEBUG4("EventType %s(%s), child of %s(%s)", ret->name, ret->id, father->name, father->id);
+    XBT_DEBUG("EventType %s(%s), child of %s(%s)", ret->name, ret->id, father->name, father->id);
     new_pajeDefineEventType(ret);
   }
   return ret;
@@ -130,7 +134,7 @@ type_t getVariableType (const char *typename, const char *color, type_t father)
     }else{
       ret = newType (typename, typename, color, TYPE_VARIABLE, father);
     }
-    DEBUG4("VariableType %s(%s), child of %s(%s)", ret->name, ret->id, father->name, father->id);
+    XBT_DEBUG("VariableType %s(%s), child of %s(%s)", ret->name, ret->id, father->name, father->id);
     new_pajeDefineVariableType (ret);
   }
   return ret;
@@ -154,7 +158,7 @@ type_t getLinkType (const char *typename, type_t father, type_t source, type_t d
   type_t ret = xbt_dict_get_or_null (father->children, key);
   if (ret == NULL){
     ret = newType (typename, key, NULL, TYPE_LINK, father);
-    DEBUG8("LinkType %s(%s), child of %s(%s)  %s(%s)->%s(%s)", ret->name, ret->id, father->name, father->id, source->name, source->id, dest->name, dest->id);
+    XBT_DEBUG("LinkType %s(%s), child of %s(%s)  %s(%s)->%s(%s)", ret->name, ret->id, father->name, father->id, source->name, source->id, dest->name, dest->id);
     new_pajeDefineLinkType(ret, source, dest);
   }
   return ret;
@@ -165,7 +169,7 @@ type_t getStateType (const char *typename, type_t father)
   type_t ret = xbt_dict_get_or_null (father->children, typename);
   if (ret == NULL){
     ret = newType (typename, typename, NULL, TYPE_STATE, father);
-    DEBUG4("StateType %s(%s), child of %s(%s)", ret->name, ret->id, father->name, father->id);
+    XBT_DEBUG("StateType %s(%s), child of %s(%s)", ret->name, ret->id, father->name, father->id);
     new_pajeDefineStateType(ret);
   }
   return ret;
@@ -184,7 +188,7 @@ container_t newContainer (const char *name, e_container_types kind, container_t
   // level depends on level of father
   if (new->father){
     new->level = new->father->level+1;
-    DEBUG2("new container %s, child of %s", name, father->name);
+    XBT_DEBUG("new container %s, child of %s", name, father->name);
   }else{
     new->level = 0;
   }
@@ -287,7 +291,7 @@ void destroyContainer (container_t container)
     xbt_dict_remove(container->father->children, container->name);
   }
 
-  DEBUG1("destroy container %s", container->name);
+  XBT_DEBUG("destroy container %s", container->name);
 
   //obligation to dump previous events because they might
   //reference the container that is about to be destroyed
@@ -327,6 +331,7 @@ 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);
   type = NULL;
 }