Merge branch 'master' into actor-priority

[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 2c66f14..380f1c6 100644 (file)
--- a/src/instr/instr_paje_values.cpp
+++ b/src/instr/instr_paje_values.cpp
@@ -5,13 +5,14 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include <xbt/ex.hpp>
-
 #include "src/instr/instr_private.hpp"
 
 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)
-    : name_(name), color_(color), father_(father)
+namespace simgrid {
+namespace instr {
+
+Value::Value(std::string name, std::string color, 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)");
@@ -19,14 +20,18 @@ simgrid::instr::Value::Value(std::string name, std::string color, simgrid::instr
   this->id_    = std::to_string(instr_new_paje_id());
 
   father->values_.insert({name, this});
-  XBT_DEBUG("new value %s, child of %s", name_.c_str(), father_->name_);
+  XBT_DEBUG("new value %s, child of %s", name_.c_str(), father_->getCname());
   print();
 };
 
-simgrid::instr::Value* simgrid::instr::Value::byNameOrCreate(std::string name, std::string color,
-                                                             simgrid::instr::Type* father)
+Value::~Value()
 {
-  Value* ret = 0;
+  XBT_DEBUG("free value %s, child of %s", getCname(), father_->getCname());
+}
+
+Value* Value::byNameOrCreate(std::string name, std::string color, Type* father)
+{
+  Value* ret = nullptr;
   try {
     ret = Value::byName(name, father);
   } catch (xbt_ex& e) {
@@ -35,17 +40,19 @@ simgrid::instr::Value* simgrid::instr::Value::byNameOrCreate(std::string name, s
   return ret;
 }
 
-simgrid::instr::Value* simgrid::instr::Value::byName(std::string name, Type* father)
+Value* Value::byName(std::string name, Type* father)
 {
   if (name.empty() || father == nullptr) {
     THROWF(tracing_error, 0, "can't get a value with no name (or a nullptr father)");
   }
 
-  if (father->kind_ == TYPE_VARIABLE)
-    THROWF(tracing_error, 0, "variables can't have different values (%s)", father->name_);
+  if (father->getKind() == TYPE_VARIABLE)
+    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->name_);
+    THROWF(tracing_error, 2, "value with name (%s) not found in father type (%s)", name.c_str(), father->getCname());
   }
   return ret->second;
 }
+}
+}