-static type_t newType (const char *typeNameBuff, const char *key, const char *color, e_entity_types kind, type_t father)
+simgrid::instr::Type::Type(const char* typeNameBuff, const char* key, const char* color, e_entity_types kind,
+ Type* 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_t, 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);
}
- xbt_dict_foreach(type->values, cursor, value_name, value) {
- XBT_DEBUG("free value %s, child of %s", value->name, value->father->name);
- xbt_free(value->name);
- xbt_free(value->color);
- xbt_free(value->id);
- xbt_free(value);
- //PJ_value_free (value);
+ xbt_dict_foreach (type->values, cursor, value_name, val) {
+ XBT_DEBUG("free value %s, child of %s", val->name, val->father->name);
+ xbt_free(val);
{
XBT_DEBUG("recursiveDestroyType %s", type->name);
xbt_dict_cursor_t cursor = nullptr;
{
XBT_DEBUG("recursiveDestroyType %s", type->name);
xbt_dict_cursor_t cursor = nullptr;
char *child_name;
xbt_dict_foreach(type->children, cursor, child_name, child) {
recursiveDestroyType (child);
char *child_name;
xbt_dict_foreach(type->children, cursor, child_name, child) {
recursiveDestroyType (child);
-void PJ_type_free_all ()
-{
- recursiveDestroyType (PJ_type_get_root());
- rootType = nullptr;
-}
-
-type_t PJ_type_get (const char *name, type_t father)
+simgrid::instr::Type* PJ_type_get(const char* name, simgrid::instr::Type* father)
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");
}
char *child_name;
xbt_dict_cursor_t cursor = nullptr;
xbt_dict_foreach(father->children, cursor, child_name, child) {
char *child_name;
xbt_dict_cursor_t cursor = nullptr;
xbt_dict_foreach(father->children, cursor, child_name, child) {
- type_t ret = nullptr;
-
- ret = newType (name, name, nullptr, TYPE_CONTAINER, father);
- if (father == nullptr){
+ simgrid::instr::Type* ret = new simgrid::instr::Type(name, name, nullptr, TYPE_CONTAINER, father);
+ if (father == nullptr) {
XBT_DEBUG("ContainerType %s(%s), child of %s(%s)", ret->name, ret->id, father->name, father->id);
DefineContainerEvent(ret);
}
return ret;
}
XBT_DEBUG("ContainerType %s(%s), child of %s(%s)", ret->name, ret->id, father->name, father->id);
DefineContainerEvent(ret);
}
return ret;
}
- type_t ret = newType (name, name, nullptr, TYPE_EVENT, father);
+ Type* ret = new 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;
}
-type_t PJ_type_variable_new (const char *name, const char *color, type_t father)
+simgrid::instr::Type* simgrid::instr::Type::variableNew(const char* name, const char* color,
+ simgrid::instr::Type* father)
- ret = newType (name, name, white, TYPE_VARIABLE, father);
+ char white[INSTR_DEFAULT_STR_SIZE] = "1 1 1";
+ ret = new Type (name, name, white, TYPE_VARIABLE, father);
- ret = newType (name, name, color, TYPE_VARIABLE, father);
+ ret = new 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);
return ret;
}
}
XBT_DEBUG("VariableType %s(%s), child of %s(%s)", ret->name, ret->id, father->name, father->id);
LogVariableTypeDefinition (ret);
return ret;
}
-type_t PJ_type_link_new (const char *name, type_t father, type_t source, type_t dest)
+simgrid::instr::Type* simgrid::instr::Type::linkNew(const char* name, Type* father, Type* source, Type* dest)
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 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);
return ret;
}
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);
return ret;
}
- ret = newType (name, name, nullptr, TYPE_STATE, father);
+ 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;