/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-#include "src/instr/instr_private.h"
+#include "src/instr/instr_private.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_paje_types, instr, "Paje tracing event system (types)");
-static type_t rootType = nullptr; /* the root type */
+static simgrid::instr::Type* rootType = nullptr; /* the root type */
-void PJ_type_release ()
-{
- rootType = nullptr;
-}
-
-type_t PJ_type_get_root ()
+simgrid::instr::Type* PJ_type_get_root()
{
return rootType;
}
-static type_t newType (const char *typeNameBuff, const char *key, const char *color, e_entity_types kind, type_t father)
+simgrid::instr::Type::Type(std::string name, const char* key, std::string color, e_entity_types kind, Type* father)
+ : name_(name), color_(color), kind_(kind), father_(father)
{
- if (typeNameBuff == nullptr || key == nullptr){
+ if (name.empty() || 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);
-
- 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);
+ this->id_ = std::to_string(instr_new_paje_id());
if (father != nullptr){
- xbt_dict_set (father->children, key, ret, nullptr);
- XBT_DEBUG("new type %s, child of %s", typeNameBuff, father->name);
+ father->children_.insert({key, this});
+ XBT_DEBUG("new type %s, child of %s", name_.c_str(), father->getCname());
}
- return ret;
}
-void PJ_type_free (type_t type)
+simgrid::instr::Type::~Type()
{
- value* val;
- char *value_name;
- 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);
- xbt_free(val);
+ for (auto elm : values_) {
+ XBT_DEBUG("free value %s, child of %s", elm.second->getCname(), elm.second->father_->getCname());
+ delete elm.second;
}
- 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 (type_t type)
-{
- XBT_DEBUG("recursiveDestroyType %s", type->name);
- xbt_dict_cursor_t cursor = nullptr;
- type_t child;
- char *child_name;
- xbt_dict_foreach(type->children, cursor, child_name, child) {
- recursiveDestroyType (child);
+ for (auto elm : children_) {
+ delete elm.second;
}
- PJ_type_free(type);
}
-type_t PJ_type_get (const char *name, type_t father)
+simgrid::instr::Type* simgrid::instr::Type::getChild(std::string name)
{
- type_t ret = PJ_type_get_or_null (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.c_str(), getCname());
return ret;
}
-type_t PJ_type_get_or_null (const char *name, type_t father)
+simgrid::instr::Type* simgrid::instr::Type::getChildOrNull(std::string 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(not name.empty(), "can't get type with a nullptr name");
- type_t ret = nullptr;
- type_t child;
- char *child_name;
- xbt_dict_cursor_t cursor = nullptr;
- xbt_dict_foreach(father->children, cursor, child_name, child) {
- if (strcmp (child->name, name) == 0){
- if (ret != nullptr){
+ simgrid::instr::Type* ret = nullptr;
+ for (auto elm : children_) {
+ if (elm.second->name_ == name) {
+ if (ret != nullptr) {
THROWF (tracing_error, 0, "there are two children types with the same name?");
- }else{
- ret = child;
+ } else {
+ ret = elm.second;
}
}
}
return ret;
}
-type_t PJ_type_container_new (const char *name, type_t father)
+simgrid::instr::Type* simgrid::instr::Type::containerNew(const char* name, simgrid::instr::Type* father)
{
if (name == nullptr){
THROWF (tracing_error, 0, "can't create a container type with a nullptr name");
}
- type_t ret = newType(name, name, nullptr, TYPE_CONTAINER, father);
+ simgrid::instr::Type* ret = new simgrid::instr::Type(name, name, "", TYPE_CONTAINER, father);
if (father == nullptr) {
rootType = ret;
} else {
- XBT_DEBUG("ContainerType %s(%s), child of %s(%s)", ret->name, ret->id, father->name, father->id);
- DefineContainerEvent(ret);
+ XBT_DEBUG("ContainerType %s(%s), child of %s(%s)", ret->getCname(), ret->getId(), father->getCname(),
+ father->getId());
+ LogContainerTypeDefinition(ret);
}
return ret;
}
-type_t PJ_type_event_new (const char *name, type_t father)
+simgrid::instr::Type* simgrid::instr::Type::eventNew(const char* name, simgrid::instr::Type* father)
{
if (name == nullptr){
THROWF (tracing_error, 0, "can't create an event type with a nullptr name");
}
- 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);
+ Type* ret = new Type(name, name, "", TYPE_EVENT, father);
+ XBT_DEBUG("EventType %s(%s), child of %s(%s)", ret->getCname(), ret->getId(), father->getCname(), father->getId());
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, std::string color,
+ simgrid::instr::Type* father)
{
if (name == nullptr){
THROWF (tracing_error, 0, "can't create a variable type with a nullptr name");
}
- type_t ret = nullptr;
+ Type* ret = nullptr;
- if (not color) {
+ if (color.empty()) {
char white[INSTR_DEFAULT_STR_SIZE] = "1 1 1";
- ret = newType (name, name, white, TYPE_VARIABLE, father);
+ ret = new Type (name, name, white, TYPE_VARIABLE, father);
}else{
- 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);
+ XBT_DEBUG("VariableType %s(%s), child of %s(%s)", ret->getCname(), ret->getId(), father->getCname(), father->getId());
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)
{
if (name == nullptr){
THROWF (tracing_error, 0, "can't create a link type with a nullptr name");
}
- 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, 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);
+ snprintf(key, INSTR_DEFAULT_STR_SIZE, "%s-%s-%s", name, source->getId(), dest->getId());
+ Type* ret = new Type(name, key, "", TYPE_LINK, father);
+ XBT_DEBUG("LinkType %s(%s), child of %s(%s) %s(%s)->%s(%s)", ret->getCname(), ret->getId(), father->getCname(),
+ father->getId(), source->getCname(), source->getId(), dest->getCname(), dest->getId());
LogLinkTypeDefinition(ret, source, dest);
return ret;
}
-type_t PJ_type_state_new (const char *name, type_t father)
+simgrid::instr::Type* simgrid::instr::Type::stateNew(const char* name, Type* father)
{
if (name == nullptr){
THROWF (tracing_error, 0, "can't create a state type with a nullptr name");
}
- type_t ret = nullptr;
-
- 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);
+ Type* ret = new Type(name, name, "", TYPE_STATE, father);
+ XBT_DEBUG("StateType %s(%s), child of %s(%s)", ret->getCname(), ret->getId(), father->getCname(), father->getId());
LogStateTypeDefinition(ret);
return ret;
}
