XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_paje_types, instr, "Paje tracing event system (types)");
-static type_t rootType = NULL; /* the root type */
-
-void PJ_type_alloc ()
-{
-}
+static type_t rootType = nullptr; /* the root type */
void PJ_type_release ()
{
- rootType = NULL;
+ rootType = nullptr;
}
type_t PJ_type_get_root ()
static type_t newType (const char *typeNameBuff, const char *key, const char *color, e_entity_types kind, type_t father)
{
- if (typeNameBuff == NULL || key == NULL){
- THROWF(tracing_error, 0, "can't create a new type with name or key equal NULL");
+ 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);
+ 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(NULL);
- ret->values = xbt_dict_new_homogeneous(NULL);
+ ret->children = xbt_dict_new_homogeneous(nullptr);
+ ret->values = xbt_dict_new_homogeneous(nullptr);
ret->color = xbt_strdup (color);
char str_id[INSTR_DEFAULT_STR_SIZE];
snprintf (str_id, INSTR_DEFAULT_STR_SIZE, "%lld", instr_new_paje_id());
ret->id = xbt_strdup (str_id);
- if (father != NULL){
- xbt_dict_set (father->children, key, ret, NULL);
+ if (father != nullptr){
+ xbt_dict_set (father->children, key, ret, nullptr);
XBT_DEBUG("new type %s, child of %s", typeNameBuff, father->name);
}
return ret;
void PJ_type_free (type_t type)
{
- val_t value;
+ value* val;
char *value_name;
- xbt_dict_cursor_t cursor = NULL;
- xbt_dict_foreach(type->values, cursor, value_name, value) {
- PJ_value_free (value);
+ xbt_dict_cursor_t cursor = nullptr;
+ xbt_dict_foreach (type->values, cursor, value_name, val) {
+ XBT_DEBUG("free value %s, child of %s", val->name, val->father->name);
+ delete val;
}
xbt_dict_free (&type->values);
xbt_free (type->name);
xbt_free (type->color);
xbt_dict_free (&type->children);
xbt_free (type);
- type = NULL;
+ type = nullptr;
}
-static void recursiveDestroyType (type_t type)
+void recursiveDestroyType (type_t type)
{
XBT_DEBUG("recursiveDestroyType %s", type->name);
- xbt_dict_cursor_t cursor = NULL;
+ xbt_dict_cursor_t cursor = nullptr;
type_t child;
char *child_name;
xbt_dict_foreach(type->children, cursor, child_name, child) {
PJ_type_free(type);
}
-void PJ_type_free_all (void)
-{
- recursiveDestroyType (PJ_type_get_root());
- rootType = NULL;
-}
-
type_t PJ_type_get (const char *name, type_t father)
{
type_t ret = PJ_type_get_or_null (name, father);
- if (ret == NULL){
+ if (ret == nullptr){
THROWF (tracing_error, 2, "type with name (%s) not found in father type (%s)", name, father->name);
}
return ret;
type_t PJ_type_get_or_null (const char *name, type_t father)
{
- if (name == NULL || father == NULL){
- THROWF (tracing_error, 0, "can't get type with a NULL name or from a NULL 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 = NULL;
+ type_t ret = nullptr;
type_t child;
char *child_name;
- xbt_dict_cursor_t cursor = NULL;
+ xbt_dict_cursor_t cursor = nullptr;
xbt_dict_foreach(father->children, cursor, child_name, child) {
if (strcmp (child->name, name) == 0){
- if (ret != NULL){
+ if (ret != nullptr){
THROWF (tracing_error, 0, "there are two children types with the same name?");
}else{
ret = child;
type_t PJ_type_container_new (const char *name, type_t father)
{
- if (name == NULL){
- THROWF (tracing_error, 0, "can't create a container type with a NULL name");
+ if (name == nullptr){
+ THROWF (tracing_error, 0, "can't create a container type with a nullptr name");
}
- type_t ret = NULL;
+ type_t ret = nullptr;
- ret = newType (name, name, NULL, TYPE_CONTAINER, father);
- if (father == NULL){
+ ret = newType (name, name, nullptr, TYPE_CONTAINER, father);
+ if (father == nullptr){
rootType = ret;
}
if(father){
XBT_DEBUG("ContainerType %s(%s), child of %s(%s)", ret->name, ret->id, father->name, father->id);
- new_pajeDefineContainerType (ret);
+ DefineContainerEvent(ret);
}
return ret;
}
type_t PJ_type_event_new (const char *name, type_t father)
{
- if (name == NULL){
- THROWF (tracing_error, 0, "can't create an event type with a NULL name");
+ if (name == nullptr){
+ THROWF (tracing_error, 0, "can't create an event type with a nullptr name");
}
- type_t ret = newType (name, name, NULL, TYPE_EVENT, father);
+ type_t ret = newType (name, name, nullptr, TYPE_EVENT, father);
XBT_DEBUG("EventType %s(%s), child of %s(%s)", ret->name, ret->id, father->name, father->id);
- new_pajeDefineEventType(ret);
+ LogDefineEventType(ret);
return ret;
}
type_t PJ_type_variable_new (const char *name, const char *color, type_t father)
{
- if (name == NULL){
- THROWF (tracing_error, 0, "can't create a variable type with a NULL name");
+ if (name == nullptr){
+ THROWF (tracing_error, 0, "can't create a variable type with a nullptr name");
}
- type_t ret = NULL;
+ type_t ret = nullptr;
char white[INSTR_DEFAULT_STR_SIZE] = "1 1 1";
- if (!color){
+ if (not color) {
ret = newType (name, name, white, TYPE_VARIABLE, father);
}else{
ret = newType (name, name, color, TYPE_VARIABLE, father);
}
XBT_DEBUG("VariableType %s(%s), child of %s(%s)", ret->name, ret->id, father->name, father->id);
- new_pajeDefineVariableType (ret);
+ LogVariableTypeDefinition (ret);
return ret;
}
type_t PJ_type_link_new (const char *name, type_t father, type_t source, type_t dest)
{
- if (name == NULL){
- THROWF (tracing_error, 0, "can't create a link type with a NULL name");
+ if (name == nullptr){
+ THROWF (tracing_error, 0, "can't create a link type with a nullptr name");
}
- type_t ret = NULL;
+ type_t ret = nullptr;
char key[INSTR_DEFAULT_STR_SIZE];
snprintf (key, INSTR_DEFAULT_STR_SIZE, "%s-%s-%s", name, source->id, dest->id);
- ret = newType (name, key, NULL, TYPE_LINK, father);
+ ret = newType (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);
- new_pajeDefineLinkType(ret, source, dest);
+ LogLinkTypeDefinition(ret, source, dest);
return ret;
}
type_t PJ_type_state_new (const char *name, type_t father)
{
- if (name == NULL){
- THROWF (tracing_error, 0, "can't create a state type with a NULL name");
+ if (name == nullptr){
+ THROWF (tracing_error, 0, "can't create a state type with a nullptr name");
}
- type_t ret = NULL;
+ type_t ret = nullptr;
- ret = newType (name, name, NULL, TYPE_STATE, father);
+ ret = newType (name, name, nullptr, TYPE_STATE, father);
XBT_DEBUG("StateType %s(%s), child of %s(%s)", ret->name, ret->id, father->name, father->id);
- new_pajeDefineStateType(ret);
+ LogStateTypeDefinition(ret);
return ret;
}
