/* 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)");
return rootType;
}
-simgrid::instr::Type::Type(const char* typeNameBuff, const char* key, const char* color, e_entity_types kind,
- Type* father)
- : kind_(kind), father_(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");
}
- this->name_ = xbt_strdup(typeNameBuff);
- this->children_ = xbt_dict_new_homogeneous(nullptr);
- this->values_ = xbt_dict_new_homogeneous(nullptr);
- this->color_ = xbt_strdup(color);
-
- this->id_ = bprintf("%lld", instr_new_paje_id());
+ this->id_ = std::to_string(instr_new_paje_id());
if (father != nullptr){
- xbt_dict_set(father->children_, key, this, 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());
}
}
simgrid::instr::Type::~Type()
{
- simgrid::instr::Value* val;
- char *value_name;
- xbt_dict_cursor_t cursor = nullptr;
- xbt_dict_foreach (values_, cursor, value_name, val) {
- XBT_DEBUG("free value %s, child of %s", val->name_, val->father_->name_);
- delete 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(&values_);
- simgrid::instr::Type* child;
- char *child_name;
- xbt_dict_foreach (children_, cursor, child_name, child) {
- delete child;
+ for (auto elm : children_) {
+ delete elm.second;
}
- xbt_dict_free(&children_);
- xbt_free(name_);
- xbt_free(id_);
- xbt_free(color_);
}
-simgrid::instr::Type* simgrid::instr::Type::getChild(const char* name)
+simgrid::instr::Type* simgrid::instr::Type::getChild(std::string 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_);
+ THROWF(tracing_error, 2, "type with name (%s) not found in father type (%s)", name.c_str(), getCname());
return ret;
}
-simgrid::instr::Type* simgrid::instr::Type::getChildOrNull(const char* name)
+simgrid::instr::Type* simgrid::instr::Type::getChildOrNull(std::string name)
{
- xbt_assert(name != nullptr, "can't get type with a nullptr name");
+ xbt_assert(not name.empty(), "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;
- xbt_dict_foreach (children_, cursor, child_name, child) {
- if (strcmp(child->name_, name) == 0) {
+ 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;
+ ret = elm.second;
}
}
}
THROWF (tracing_error, 0, "can't create a container type with a nullptr name");
}
- simgrid::instr::Type* ret = new simgrid::instr::Type(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_);
+ XBT_DEBUG("ContainerType %s(%s), child of %s(%s)", ret->getCname(), ret->getId(), father->getCname(),
+ father->getId());
LogContainerTypeDefinition(ret);
}
return ret;
THROWF (tracing_error, 0, "can't create an event type with a nullptr name");
}
- 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_);
+ 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;
}
-simgrid::instr::Type* simgrid::instr::Type::variableNew(const char* name, const char* color,
+simgrid::instr::Type* simgrid::instr::Type::variableNew(const char* name, std::string color,
simgrid::instr::Type* father)
{
if (name == nullptr){
Type* ret = nullptr;
- if (not color) {
+ if (color.empty()) {
char white[INSTR_DEFAULT_STR_SIZE] = "1 1 1";
ret = new Type (name, name, white, TYPE_VARIABLE, father);
}else{
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;
}
}
char key[INSTR_DEFAULT_STR_SIZE];
- snprintf(key, INSTR_DEFAULT_STR_SIZE, "%s-%s-%s", name, source->id_, dest->id_);
- 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_);
+ 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;
}
THROWF (tracing_error, 0, "can't create a state type with a nullptr name");
}
- 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_);
+ 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;
}
