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

diff --git a/src/instr/instr_paje_values.cpp b/src/instr/instr_paje_values.cpp
index 066d77f3c5..380f1c6a76 100644
--- a/src/instr/instr_paje_values.cpp
+++ b/src/instr/instr_paje_values.cpp
@@ -1,68 +1,58 @@
-/* Copyright (c) 2012-2015. The SimGrid Team.
+/* Copyright (c) 2012-2017. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include <xbt/ex.hpp>
-
-#include "src/instr/instr_private.h"
+#include "src/instr/instr_private.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_paje_values, instr, "Paje tracing event system (values)");
 
-simgrid::instr::Value::Value(const char* name, const char* color, simgrid::instr::Type* father)
+namespace simgrid {
+namespace instr {
+
+Value::Value(std::string name, std::string color, Type* father) : name_(name), color_(color), father_(father)
 {
-  if (name == nullptr || father == nullptr){
-    THROWF (tracing_error, 0, "can't create a value with a nullptr name (or a nullptr father)");
+  if (name.empty() || father == nullptr) {
+    THROWF(tracing_error, 0, "can't create a value with no name (or a nullptr father)");
   }
-  this->ret_          = xbt_new0(Value, 1);
-  this->ret_->name_   = xbt_strdup(name);
-  this->ret_->father_ = father;
-  this->ret_->color_  = xbt_strdup(color);
+  this->id_    = std::to_string(instr_new_paje_id());
 
-  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", ret_->name_, ret_->father_->name_);
-  LogEntityValue(this->ret_);
+  father->values_.insert({name, this});
+  XBT_DEBUG("new value %s, child of %s", name_.c_str(), father_->getCname());
+  print();
 };
 
-simgrid::instr::Value::~Value()
+Value::~Value()
 {
-  /* FIXME: this should be cleanable
-  xbt_free(name);
-  xbt_free(color);
-  xbt_free(id);
-  */
+  XBT_DEBUG("free value %s, child of %s", getCname(), father_->getCname());
 }
 
-simgrid::instr::Value* simgrid::instr::Value::get_or_new(const char* name, const char* color,
-                                                         simgrid::instr::Type* father)
+Value* Value::byNameOrCreate(std::string name, std::string color, Type* father)
 {
-  Value* ret = 0;
+  Value* ret = nullptr;
   try {
-    ret = Value::get(name, father);
-  }
-  catch(xbt_ex& e) {
-    Value rett(name, color, father);
-    ret = rett.ret_;
+    ret = Value::byName(name, father);
+  } catch (xbt_ex& e) {
+    ret = new Value(name, color, father);
   }
   return ret;
 }
 
-simgrid::instr::Value* simgrid::instr::Value::get(const char* name, Type* father)
+Value* Value::byName(std::string 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 (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_);
-  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_);
+  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->getCname());
   }
-  return ret;
+  return ret->second;
+}
+}
 }