instr: fix a new/free mismatch, and small cleanups

[simgrid.git] / src / instr / instr_paje_types.cpp

diff --git a/src/instr/instr_paje_types.cpp b/src/instr/instr_paje_types.cpp
index 6fd9444..cdccdcf 100644 (file)
--- a/src/instr/instr_paje_types.cpp
+++ b/src/instr/instr_paje_types.cpp
@@ -33,9 +33,7 @@ simgrid::instr::Type::Type(const char* typeNameBuff, const char* key, const char
   this->values_   = xbt_dict_new_homogeneous(nullptr);
   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->id_ = xbt_strdup(str_id);
+  this->id_ = bprintf("%lld", instr_new_paje_id());
 
   if (father != nullptr){
     xbt_dict_set(father->children_, key, this, nullptr);
@@ -43,34 +41,25 @@ simgrid::instr::Type::Type(const char* typeNameBuff, const char* key, const char
   }
 }
 
-void PJ_type_free(simgrid::instr::Type* type)
+simgrid::instr::Type::~Type()
 {
   simgrid::instr::Value* val;
   char *value_name;
   xbt_dict_cursor_t cursor = nullptr;
-  xbt_dict_foreach (type->values_, cursor, value_name, val) {
+  xbt_dict_foreach (values_, cursor, value_name, val) {
     XBT_DEBUG("free value %s, child of %s", val->name_, val->father_->name_);
-    xbt_free(val);
+    delete val;
   }
-  xbt_dict_free(&type->values_);
-  xbt_free(type->name_);
-  xbt_free(type->id_);
-  xbt_free(type->color_);
-  xbt_dict_free(&type->children_);
-  xbt_free (type);
-  type = nullptr;
-}
-
-void recursiveDestroyType(simgrid::instr::Type* type)
-{
-  XBT_DEBUG("recursiveDestroyType %s", type->name_);
-  xbt_dict_cursor_t cursor = nullptr;
+  xbt_dict_free(&values_);
   simgrid::instr::Type* child;
   char *child_name;
-  xbt_dict_foreach (type->children_, cursor, child_name, child) {
-    recursiveDestroyType (child);
+  xbt_dict_foreach (children_, cursor, child_name, child) {
+    delete child;
   }
-  PJ_type_free(type);
+  xbt_dict_free(&children_);
+  xbt_free(name_);
+  xbt_free(id_);
+  xbt_free(color_);
 }
 
 simgrid::instr::Type* PJ_type_get(const char* name, simgrid::instr::Type* father)
@@ -115,7 +104,7 @@ simgrid::instr::Type* simgrid::instr::Type::containerNew(const char* name, simgr
     rootType = ret;
   } else {
     XBT_DEBUG("ContainerType %s(%s), child of %s(%s)", ret->name_, ret->id_, father->name_, father->id_);
-    DefineContainerEvent(ret);
+    LogContainerTypeDefinition(ret);
   }
   return ret;
 }
@@ -158,11 +147,9 @@ simgrid::instr::Type* simgrid::instr::Type::linkNew(const char* name, Type* fath
     THROWF (tracing_error, 0, "can't create a link type with a nullptr name");
   }
 
-  Type* ret = nullptr;
-
   char key[INSTR_DEFAULT_STR_SIZE];
   snprintf(key, INSTR_DEFAULT_STR_SIZE, "%s-%s-%s", name, source->id_, dest->id_);
-  ret = new Type (name, key, nullptr, TYPE_LINK, father);
+  Type* ret = new Type(name, key, nullptr, TYPE_LINK, father);
   XBT_DEBUG("LinkType %s(%s), child of %s(%s)  %s(%s)->%s(%s)", ret->name_, ret->id_, father->name_, father->id_,
             source->name_, source->id_, dest->name_, dest->id_);
   LogLinkTypeDefinition(ret, source, dest);
@@ -175,9 +162,7 @@ simgrid::instr::Type* simgrid::instr::Type::stateNew(const char* name, Type* fat
     THROWF (tracing_error, 0, "can't create a state type with a nullptr name");
   }
 
-  Type* ret = nullptr;
-
-  ret = new Type (name, name, nullptr, TYPE_STATE, father);
+  Type* ret = new Type(name, name, nullptr, TYPE_STATE, father);
   XBT_DEBUG("StateType %s(%s), child of %s(%s)", ret->name_, ret->id_, father->name_, father->id_);
   LogStateTypeDefinition(ret);
   return ret;