return rootType;
}
-simgrid::instr::Type::Type(std::string name, const char* key, std::string color, e_entity_types kind, Type* father)
+namespace simgrid {
+namespace instr {
+
+Type::Type(std::string name, std::string alias, std::string color, e_entity_types kind, Type* father)
: name_(name), color_(color), kind_(kind), father_(father)
{
- if (name.empty() || key == nullptr) {
+ if (name.empty() || alias.empty()) {
THROWF(tracing_error, 0, "can't create a new type with name or key equal nullptr");
}
- this->id_ = std::to_string(instr_new_paje_id());
+ id_ = std::to_string(instr_new_paje_id());
if (father != nullptr){
- father->children_.insert({key, this});
+ father->children_.insert({alias, this});
XBT_DEBUG("new type %s, child of %s", name_.c_str(), father->getCname());
}
}
-simgrid::instr::Type::~Type()
+Type::~Type()
{
for (auto elm : values_) {
XBT_DEBUG("free value %s, child of %s", elm.second->getCname(), elm.second->father_->getCname());
}
}
-simgrid::instr::Type* simgrid::instr::Type::getChild(std::string name)
+Type* Type::byName(std::string name)
{
- simgrid::instr::Type* ret = this->getChildOrNull(name);
+ 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;
}
-simgrid::instr::Type* simgrid::instr::Type::getChildOrNull(std::string name)
+Type* Type::getChildOrNull(std::string name)
{
xbt_assert(not name.empty(), "can't get type with a nullptr name");
- simgrid::instr::Type* ret = nullptr;
+ Type* ret = nullptr;
for (auto elm : children_) {
if (elm.second->name_ == name) {
if (ret != nullptr) {
return ret;
}
-simgrid::instr::Type* simgrid::instr::Type::containerNew(const char* name, simgrid::instr::Type* father)
+Type* Type::containerNew(const char* name, Type* father)
{
if (name == nullptr){
THROWF (tracing_error, 0, "can't create a container type with a nullptr name");
} else {
XBT_DEBUG("ContainerType %s(%s), child of %s(%s)", ret->getCname(), ret->getId(), father->getCname(),
father->getId());
- LogContainerTypeDefinition(ret);
+ ret->logContainerTypeDefinition();
}
return ret;
}
-simgrid::instr::Type* simgrid::instr::Type::eventNew(const char* name, simgrid::instr::Type* father)
+Type* Type::addEventType(std::string name)
{
- if (name == nullptr){
- THROWF (tracing_error, 0, "can't create an event type with a nullptr name");
+ if (name.empty()) {
+ THROWF(tracing_error, 0, "can't create an event type with no name");
}
- 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);
+ Type* ret = new Type(name, name, "", TYPE_EVENT, this);
+ XBT_DEBUG("EventType %s(%s), child of %s(%s)", ret->getCname(), ret->getId(), getCname(), getId());
+ ret->logDefineEventType();
return ret;
}
-simgrid::instr::Type* simgrid::instr::Type::variableNew(const char* name, std::string color,
- simgrid::instr::Type* father)
+Type* Type::addVariableType(std::string name, std::string color)
{
- if (name == nullptr){
- THROWF (tracing_error, 0, "can't create a variable type with a nullptr name");
- }
+ if (name.empty())
+ THROWF(tracing_error, 0, "can't create a variable type with no name");
- Type* ret = nullptr;
+ Type* ret = new Type(name, name, color.empty() ? "1 1 1" : color, TYPE_VARIABLE, this);
+
+ XBT_DEBUG("VariableType %s(%s), child of %s(%s)", ret->getCname(), ret->getId(), getCname(), getId());
+ ret->logVariableTypeDefinition();
- 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->getCname(), ret->getId(), father->getCname(), father->getId());
- LogVariableTypeDefinition (ret);
return ret;
}
-simgrid::instr::Type* simgrid::instr::Type::linkNew(const char* name, Type* father, Type* source, Type* dest)
+Type* Type::addLinkType(std::string name, Type* source, Type* dest)
{
- if (name == nullptr){
- THROWF (tracing_error, 0, "can't create a link type with a nullptr name");
+ if (name.empty()) {
+ THROWF(tracing_error, 0, "can't create a link type with no name");
}
- char key[INSTR_DEFAULT_STR_SIZE];
- 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);
+ std::string alias = name + "-" + source->id_ + "-" + dest->id_;
+ Type* ret = new Type(name, alias, "", TYPE_LINK, this);
+ XBT_DEBUG("LinkType %s(%s), child of %s(%s) %s(%s)->%s(%s)", ret->getCname(), ret->getId(), getCname(), getId(),
+ source->getCname(), source->getId(), dest->getCname(), dest->getId());
+ ret->logLinkTypeDefinition(source, dest);
return ret;
}
-simgrid::instr::Type* simgrid::instr::Type::stateNew(const char* name, Type* father)
+Type* Type::addStateType(std::string name)
{
- if (name == nullptr){
- THROWF (tracing_error, 0, "can't create a state type with a nullptr name");
- }
-
- 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);
+ Type* ret = new Type(name, name, "", TYPE_STATE, this);
+ XBT_DEBUG("StateType %s(%s), child of %s(%s)", ret->getCname(), ret->getId(), getCname(), getId());
+ ret->logStateTypeDefinition();
return ret;
}
+}
+}
