more stringification/privatization

[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 f6cff86..4d77238 100644 (file)
--- a/src/instr/instr_paje_values.cpp
+++ b/src/instr/instr_paje_values.cpp
@@ -10,17 +10,16 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_paje_values, instr, "Paje tracing event system (values)");
 
-simgrid::instr::Value::Value(std::string name, std::string color, simgrid::instr::Type* father) : father_(father)
+simgrid::instr::Value::Value(std::string name, std::string color, simgrid::instr::Type* father)
+    : name_(name), color_(color), father_(father)
 {
   if (name.empty() || father == nullptr) {
     THROWF(tracing_error, 0, "can't create a value with no name (or a nullptr father)");
   }
-  this->name_  = name;
-  this->color_ = color;
   this->id_    = std::to_string(instr_new_paje_id());
 
-  xbt_dict_set(father->values_, name.c_str(), this, nullptr);
-  XBT_DEBUG("new value %s, child of %s", name_.c_str(), father_->name_);
+  father->values_.insert({name, this});
+  XBT_DEBUG("new value %s, child of %s", name_.c_str(), father_->getCname());
   print();
 };
 
@@ -30,8 +29,7 @@ simgrid::instr::Value* simgrid::instr::Value::byNameOrCreate(std::string name, s
   Value* ret = 0;
   try {
     ret = Value::byName(name, father);
-  }
-  catch(xbt_ex& e) {
+  } catch (xbt_ex& e) {
     ret = new Value(name, color, father);
   }
   return ret;
@@ -44,10 +42,10 @@ simgrid::instr::Value* simgrid::instr::Value::byName(std::string name, Type* fat
   }
 
   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.c_str());
-  if (ret == nullptr) {
-    THROWF(tracing_error, 2, "value with name (%s) not found in father type (%s)", name.c_str(), father->name_);
+    THROWF(tracing_error, 0, "variables can't have different values (%s)", father->getCname());
+  auto ret = father->values_.find(name);
+  if (ret == father->values_.end()) {
+    THROWF(tracing_error, 2, "value with name (%s) not found in father type (%s)", name.c_str(), father->getCname());
   }
-  return ret;
+  return ret->second;
 }