give s_val PJ_value as a constructor

[simgrid.git] / src / instr / instr_paje_values.cpp

diff --git a/src/instr/instr_paje_values.cpp b/src/instr/instr_paje_values.cpp
index f07a640..2c4f8bd 100644 (file)
--- a/src/instr/instr_paje_values.cpp
+++ b/src/instr/instr_paje_values.cpp
@@ -10,26 +10,40 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_paje_values, instr, "Paje tracing event system (values)");
 
-val_t PJ_value_new (const char *name, const char *color, type_t father)
+val_t s_val::PJ_value_update (const char *name, const char *color, type_t father)
 {
+  this->ret = xbt_new0(s_val, 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());
+  this->ret->id = xbt_strdup (str_id);
+
+  xbt_dict_set (father->values, name, ret, nullptr);
+  XBT_DEBUG("new value %s, child of %s", this->ret->name, this->ret->father->name);
+  LogEntityValue(this->ret);
+  return this->ret;
+}
+
+s_val::s_val(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(s_val, 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);
-  DefineEntityValueEvent(ret);
-  return ret;
-}
+  LogEntityValue(this->ret);
+};
 
 val_t PJ_value_get_or_new (const char *name, const char *color, type_t father)
 {
@@ -38,7 +52,8 @@ val_t PJ_value_get_or_new (const char *name, const char *color, type_t father)
     ret = PJ_value_get(name, father);
   }
   catch(xbt_ex& e) {
-    ret = PJ_value_new(name, color, father);
+    s_val rett(name, color, father);
+    ret = rett.ret;
   }
   return ret;
 }
@@ -57,12 +72,3 @@ val_t PJ_value_get (const char *name, type_t father)
   }
   return ret;
 }
-
-void PJ_value_free (val_t value)
-{
-  XBT_DEBUG("free value %s, child of %s", value->name, value->father->name);
-  xbt_free(((val_t)value)->name);
-  xbt_free(((val_t)value)->color);
-  xbt_free(((val_t)value)->id);
-  xbt_free(value);
-}