simgrid::instr::Type::Type(const char* typeNameBuff, const char* key, const char* color, e_entity_types kind,
Type* father)
+ : kind_(kind), father_(father)
{
if (typeNameBuff == nullptr || key == nullptr){
THROWF(tracing_error, 0, "can't create a new type with name or key equal nullptr");
}
this->name_ = xbt_strdup(typeNameBuff);
- this->father_ = father;
- this->kind_ = kind;
this->children_ = xbt_dict_new_homogeneous(nullptr);
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);
xbt_free(type->id_);
xbt_free(type->color_);
xbt_dict_free(&type->children_);
- xbt_free (type);
- type = nullptr;
+ delete type;
}
void recursiveDestroyType(simgrid::instr::Type* type)
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;
}
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);
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;