X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4604ddad802d0245e7b97daa20a646f81e56aecc..7eed757b0efb54a58b781ea4a8c963f0b6321b92:/src/instr/instr_paje_values.cpp

diff --git a/src/instr/instr_paje_values.cpp b/src/instr/instr_paje_values.cpp
index 587a076821..f46eed5dd2 100644
--- a/src/instr/instr_paje_values.cpp
+++ b/src/instr/instr_paje_values.cpp
@@ -10,40 +10,46 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_paje_values, instr, "Paje tracing event system (values)");
 
-val_t paje_value :: PJ_value_new (const char *name, const char *color, type_t father)
+value::value(const char* name, const char* color, type_t father)
 {
   if (name == nullptr || father == nullptr){
     THROWF (tracing_error, 0, "can't create a value with a nullptr name (or a nullptr father)");
   }
-
-  val_t ret = xbt_new0(s_val_t, 1);
-  ret->name = xbt_strdup (name);
-  ret->father = father;
-  ret->color = xbt_strdup (color);
+  this->ret         = xbt_new0(value, 1);
+  this->ret->name = xbt_strdup (name);
+  this->ret->father = father;
+  this->ret->color = xbt_strdup (color);
 
   char str_id[INSTR_DEFAULT_STR_SIZE];
   snprintf (str_id, INSTR_DEFAULT_STR_SIZE, "%lld", instr_new_paje_id());
-  ret->id = xbt_strdup (str_id);
+  this->ret->id = xbt_strdup (str_id);
 
   xbt_dict_set (father->values, name, ret, nullptr);
   XBT_DEBUG("new value %s, child of %s", ret->name, ret->father->name);
-  LogEntityValue(ret);
-  return ret;
+  LogEntityValue(this->ret);
+};
+
+value::~value()
+{
+  xbt_free(name);
+  xbt_free(color);
+  xbt_free(id);
 }
 
-val_t paje_value :: PJ_value_get_or_new (const char *name, const char *color, type_t father)
-{ paje_value pj_value;
-  val_t ret = 0;
+value* value::get_or_new(const char* name, const char* color, type_t father)
+{
+  value* ret = 0;
   try {
-    ret = pj_value.PJ_value_get(name, father);
+    ret = value::get(name, father);
   }
   catch(xbt_ex& e) {
-    ret = pj_value.PJ_value_new(name, color, father);
+    value rett(name, color, father);
+    ret = rett.ret;
   }
   return ret;
 }
 
-val_t paje_value::PJ_value_get (const char *name, type_t father)
+value* value::get(const char* name, type_t father)
 {
   if (name == nullptr || father == nullptr){
     THROWF (tracing_error, 0, "can't get a value with a nullptr name (or a nullptr father)");
@@ -51,7 +57,7 @@ val_t paje_value::PJ_value_get (const char *name, type_t father)
 
   if (father->kind == TYPE_VARIABLE)
     THROWF(tracing_error, 0, "variables can't have different values (%s)", father->name);
-  val_t ret = (val_t)xbt_dict_get_or_null (father->values, name);
+  value* ret = (value*)xbt_dict_get_or_null(father->values, name);
   if (ret == nullptr) {
     THROWF(tracing_error, 2, "value with name (%s) not found in father type (%s)", name, father->name);
   }