-static type_t newType (const char *typeNameBuff, const char *key, const char *color, e_entity_types kind, type_t father)
+s_type::s_type (const char *typeNameBuff, const char *key, const char *color, e_entity_types kind, type_t father)
{
if (typeNameBuff == nullptr || key == nullptr){
THROWF(tracing_error, 0, "can't create a new type with name or key equal nullptr");
}
{
if (typeNameBuff == nullptr || key == nullptr){
THROWF(tracing_error, 0, "can't create a new type with name or key equal nullptr");
}
- type_t ret = xbt_new0(s_type, 1);
- ret->name = xbt_strdup (typeNameBuff);
- ret->father = father;
- ret->kind = kind;
- ret->children = xbt_dict_new_homogeneous(nullptr);
- ret->values = xbt_dict_new_homogeneous(nullptr);
- ret->color = xbt_strdup (color);
+ 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());
char str_id[INSTR_DEFAULT_STR_SIZE];
snprintf (str_id, INSTR_DEFAULT_STR_SIZE, "%lld", instr_new_paje_id());
- xbt_dict_set (father->children, key, ret, nullptr);
+ xbt_dict_set (father->children, key, this, nullptr);
XBT_DEBUG("new type %s, child of %s", typeNameBuff, father->name);
}
XBT_DEBUG("new type %s, child of %s", typeNameBuff, father->name);
}
if (ret == nullptr){
THROWF (tracing_error, 2, "type with name (%s) not found in father type (%s)", name, father->name);
}
return ret;
}
if (ret == nullptr){
THROWF (tracing_error, 2, "type with name (%s) not found in father type (%s)", name, father->name);
}
return ret;
}
{
if (name == nullptr || father == nullptr){
THROWF (tracing_error, 0, "can't get type with a nullptr name or from a nullptr father");
{
if (name == nullptr || father == nullptr){
THROWF (tracing_error, 0, "can't get type with a nullptr name or from a nullptr father");
- type_t ret = newType(name, name, nullptr, TYPE_CONTAINER, father);
+ type_t ret = new s_type (name, name, nullptr, TYPE_CONTAINER, father);
- type_t ret = newType (name, name, nullptr, TYPE_EVENT, father);
+ type_t ret = new s_type (name, name, nullptr, TYPE_EVENT, father);
XBT_DEBUG("EventType %s(%s), child of %s(%s)", ret->name, ret->id, father->name, father->id);
LogDefineEventType(ret);
return ret;
XBT_DEBUG("EventType %s(%s), child of %s(%s)", ret->name, ret->id, father->name, father->id);
LogDefineEventType(ret);
return ret;
- ret = newType (name, name, white, TYPE_VARIABLE, father);
+ ret = new s_type (name, name, white, TYPE_VARIABLE, father);
- ret = newType (name, name, color, TYPE_VARIABLE, father);
+ ret = new s_type (name, name, color, TYPE_VARIABLE, father);
}
XBT_DEBUG("VariableType %s(%s), child of %s(%s)", ret->name, ret->id, father->name, father->id);
LogVariableTypeDefinition (ret);
}
XBT_DEBUG("VariableType %s(%s), child of %s(%s)", ret->name, ret->id, father->name, father->id);
LogVariableTypeDefinition (ret);
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 = newType (name, key, nullptr, TYPE_LINK, father);
+ ret = new s_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);
- ret = newType (name, name, nullptr, TYPE_STATE, father);
+ ret = new s_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;