X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e3397fde30788e5ba847cc9e1ad2d97425275aec..4be24d86416854b0f898f8058b88a4d22c8bcb8e:/src/instr/instr_paje_values.cpp

diff --git a/src/instr/instr_paje_values.cpp b/src/instr/instr_paje_values.cpp
index 2c4f8bd9db..a0b4a1adf0 100644
--- a/src/instr/instr_paje_values.cpp
+++ b/src/instr/instr_paje_values.cpp
@@ -10,65 +10,53 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_paje_values, instr, "Paje tracing event system (values)");
 
-val_t s_val::PJ_value_update (const char *name, const char *color, type_t father)
+simgrid::instr::Value::Value(const char* name, const char* color, simgrid::instr::Type* 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)");
   }
-  this->ret = xbt_new0(s_val, 1);
-  this->ret->name = xbt_strdup (name);
-  this->ret->father = father;
-  this->ret->color = xbt_strdup (color);
+  this->name_   = xbt_strdup(name);
+  this->father_ = father;
+  this->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);
+  this->id_ = bprintf("%lld", instr_new_paje_id());
 
-  xbt_dict_set (father->values, name, ret, nullptr);
-  XBT_DEBUG("new value %s, child of %s", ret->name, ret->father->name);
-  LogEntityValue(this->ret);
+  xbt_dict_set(father->values_, name, this, nullptr);
+  XBT_DEBUG("new value %s, child of %s", name_, father_->name_);
+  LogEntityValue(this);
 };
 
-val_t PJ_value_get_or_new (const char *name, const char *color, type_t father)
+simgrid::instr::Value::~Value()
+{
+  xbt_free(name_);
+  xbt_free(color_);
+  xbt_free(id_);
+}
+
+simgrid::instr::Value* simgrid::instr::Value::get_or_new(const char* name, const char* color,
+                                                         simgrid::instr::Type* father)
 {
-  val_t ret = 0;
+  Value* ret = 0;
   try {
-    ret = PJ_value_get(name, father);
+    ret = Value::get(name, father);
   }
   catch(xbt_ex& e) {
-    s_val rett(name, color, father);
-    ret = rett.ret;
+    ret = new Value(name, color, father);
   }
   return ret;
 }
 
-val_t PJ_value_get (const char *name, type_t father)
+simgrid::instr::Value* simgrid::instr::Value::get(const char* name, Type* father)
 {
   if (name == nullptr || father == nullptr){
     THROWF (tracing_error, 0, "can't get a value with a nullptr name (or a nullptr 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);
+  if (father->kind_ == TYPE_VARIABLE)
+    THROWF(tracing_error, 0, "variables can't have different values (%s)", father->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);
+    THROWF(tracing_error, 2, "value with name (%s) not found in father type (%s)", name, father->name_);
   }
   return ret;
 }