Sort include lists according to clang-format.

[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 84152ec..5a4d269 100644 (file)
--- a/src/instr/instr_paje_values.cpp
+++ b/src/instr/instr_paje_values.cpp
@@ -1,4 +1,4 @@
-/* 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
@@ -6,62 +6,56 @@
 
 #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)");
 
-value::value(const char* name, const char* color, type_t father)
+simgrid::instr::Value::Value(const char* name, const char* color, simgrid::instr::Type* father) : father_(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(value, 1);
-  this->ret->name = xbt_strdup (name);
-  this->ret->father = father;
-  this->ret->color = xbt_strdup (color);
+  this->name_   = xbt_strdup(name);
+  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);
 };
 
-value::~value()
+simgrid::instr::Value::~Value()
 {
-  /* FIXME: this should be cleanable
-  xbt_free(name);
-  xbt_free(color);
-  xbt_free(id);
-  */
+  xbt_free(name_);
+  xbt_free(color_);
+  xbt_free(id_);
 }
 
-value* value::get_or_new(const char* name, const char* color, type_t father)
+simgrid::instr::Value* simgrid::instr::Value::get_or_new(const char* name, const char* color,
+                                                         simgrid::instr::Type* father)
 {
-  value* ret = 0;
+  Value* ret = 0;
   try {
-    ret = value::get(name, father);
+    ret = Value::get(name, father);
   }
   catch(xbt_ex& e) {
-    value rett(name, color, father);
-    ret = rett.ret;
+    ret = new Value(name, color, father);
   }
   return ret;
 }
 
-value* 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);
-  value* ret = (value*)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;
 }