- 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);
if (father != nullptr){
xbt_dict_set(father->children_, key, this, 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_);
- 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_);
- xbt_dict_foreach (type->children_, cursor, child_name, child) {
- recursiveDestroyType (child);
+ xbt_dict_foreach (children_, cursor, child_name, child) {
+ delete child;
- simgrid::instr::Type* ret = simgrid::instr::Type::getOrNull(name, father);
- if (ret == nullptr){
- THROWF(tracing_error, 2, "type with name (%s) not found in father type (%s)", name, father->name_);
- }
+ simgrid::instr::Type* ret = this->getChildOrNull(name);
+ if (ret == nullptr)
+ THROWF(tracing_error, 2, "type with name (%s) not found in father type (%s)", name, this->name_);
- if (name == nullptr || father == nullptr){
- THROWF (tracing_error, 0, "can't get type with a nullptr name or from a nullptr father");
- }
+ xbt_assert(name != nullptr, "can't get type with a nullptr name");
simgrid::instr::Type* ret = nullptr;
simgrid::instr::Type* child;
char *child_name;
xbt_dict_cursor_t cursor = nullptr;
simgrid::instr::Type* ret = nullptr;
simgrid::instr::Type* child;
char *child_name;
xbt_dict_cursor_t cursor = nullptr;
- xbt_dict_foreach (father->children_, cursor, child_name, child) {
+ xbt_dict_foreach (children_, cursor, child_name, child) {
rootType = ret;
} else {
XBT_DEBUG("ContainerType %s(%s), child of %s(%s)", ret->name_, ret->id_, father->name_, father->id_);
rootType = ret;
} else {
XBT_DEBUG("ContainerType %s(%s), child of %s(%s)", ret->name_, ret->id_, father->name_, father->id_);
char key[INSTR_DEFAULT_STR_SIZE];
snprintf(key, INSTR_DEFAULT_STR_SIZE, "%s-%s-%s", name, source->id_, dest->id_);
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);
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);
- 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;
XBT_DEBUG("StateType %s(%s), child of %s(%s)", ret->name_, ret->id_, father->name_, father->id_);
LogStateTypeDefinition(ret);
return ret;