- name a destructor by its name
- inline a useless recursive function: by doing the job in the destructor
/* destroy all data structures of tracing (and free) */
PJ_container_free_all();
/* destroy all data structures of tracing (and free) */
PJ_container_free_all();
- recursiveDestroyType (PJ_type_get_root());
+ delete PJ_type_get_root();
rootType = nullptr;
/* close the trace files */
rootType = nullptr;
/* close the trace files */
-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;
{
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_DEBUG("free value %s, child of %s", val->name_, val->father_->name_);
- xbt_dict_free(&type->values_);
- xbt_free(type->name_);
- xbt_free(type->id_);
- xbt_free(type->color_);
- xbt_dict_free(&type->children_);
- delete type;
-}
-
-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;
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;
+ 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)
}
simgrid::instr::Type* PJ_type_get(const char* name, simgrid::instr::Type* father)
xbt_dict_t children_;
xbt_dict_t values_; // valid for all types except variable and container
Type(const char* typeNameBuff, const char* key, const char* color, e_entity_types kind, Type* father);
xbt_dict_t children_;
xbt_dict_t values_; // valid for all types except variable and container
Type(const char* typeNameBuff, const char* key, const char* color, e_entity_types kind, Type* father);
static Type* getOrNull(const char* name, Type* father);
static Type* containerNew(const char* name, Type* father);
static Type* eventNew(const char* name, Type* father);
static Type* getOrNull(const char* name, Type* father);
static Type* containerNew(const char* name, Type* father);
static Type* eventNew(const char* name, Type* father);
XBT_PRIVATE void PJ_type_release ();
XBT_PUBLIC(simgrid::instr::Type*) PJ_type_get_root();
XBT_PUBLIC(simgrid::instr::Type*) PJ_type_get(const char* name, simgrid::instr::Type* father);
XBT_PRIVATE void PJ_type_release ();
XBT_PUBLIC(simgrid::instr::Type*) PJ_type_get_root();
XBT_PUBLIC(simgrid::instr::Type*) PJ_type_get(const char* name, simgrid::instr::Type* father);
-XBT_PRIVATE XBT_PRIVATE void PJ_type_free(simgrid::instr::Type* type);
-XBT_PRIVATE void recursiveDestroyType(simgrid::instr::Type* type);
-
XBT_PRIVATE void TRACE_TI_start();
XBT_PRIVATE void TRACE_TI_end();
XBT_PRIVATE void TRACE_TI_start();
XBT_PRIVATE void TRACE_TI_end();