X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c5418e2f161ecfa4af596fb3d25e8ac696935af3..107e9725115bed5e10ca15de9bc5899b67784fc5:/src/instr/instr_paje_types.cpp

diff --git a/src/instr/instr_paje_types.cpp b/src/instr/instr_paje_types.cpp
index c5ccbfa4c1..87c7f2030a 100644
--- a/src/instr/instr_paje_types.cpp
+++ b/src/instr/instr_paje_types.cpp
@@ -4,180 +4,130 @@
 /* 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* rootType = nullptr;        /* the root type */
+static simgrid::instr::Type* rootType = nullptr; /* the root type */
 
-void PJ_type_release ()
-{
-  rootType = nullptr;
-}
-
-Type* PJ_type_get_root()
-{
-  return rootType;
-}
+namespace simgrid {
+namespace instr {
 
-Type::Type (const char *typeNameBuff, const char *key, const char *color, e_entity_types kind, Type* father)
+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 (typeNameBuff == nullptr || key == nullptr){
-    THROWF(tracing_error, 0, "can't create a new type with name or key equal nullptr");
+  if (name.empty() || alias.empty()) {
+    THROWF(tracing_error, 0, "can't create a new type with no name or alias");
   }
 
-  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());
-  this->id = xbt_strdup (str_id);
+  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);
-  }
-}
-
-void PJ_type_free(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);
+    father->children_.insert({alias, this});
+    XBT_DEBUG("new type %s, child of %s", name_.c_str(), father->getCname());
   }
-  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* type)
+Type::~Type()
 {
-  XBT_DEBUG("recursiveDestroyType %s", type->name);
-  xbt_dict_cursor_t cursor = nullptr;
-  Type* child;
-  char *child_name;
-  xbt_dict_foreach(type->children, cursor, child_name, child) {
-    recursiveDestroyType (child);
-  }
-  PJ_type_free(type);
+  for (auto elm : values_)
+    delete elm.second;
+  for (auto elm : children_)
+    delete elm.second;
 }
 
-Type* PJ_type_get(const char* name, Type* father)
+Type* Type::byName(std::string name)
 {
-  Type* ret = Type::getOrNull (name, father);
-  if (ret == nullptr){
-    THROWF (tracing_error, 2, "type with name (%s) not found in father type (%s)", name, father->name);
-  }
-  return ret;
-}
-
-Type* Type::getOrNull(const char* name, Type* father)
-{
-  if (name == nullptr || father == nullptr){
-    THROWF (tracing_error, 0, "can't get type with a nullptr name or from a nullptr father");
-  }
-
   Type* ret = nullptr;
-  Type* 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){
+  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;
       }
     }
   }
+  if (ret == nullptr)
+    THROWF(tracing_error, 2, "type with name (%s) not found in father type (%s)", name.c_str(), getCname());
   return ret;
 }
 
-Type* Type::containerNew(const char* name, Type* father)
+Type* Type::createRootType()
 {
-  if (name == nullptr){
-    THROWF (tracing_error, 0, "can't create a container type with a nullptr name");
-  }
-
-  Type* ret = new Type (name, name, nullptr, 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);
-  }
+  simgrid::instr::Type* ret = new simgrid::instr::Type("0", "0", "", TYPE_CONTAINER, nullptr);
+  rootType                  = ret;
   return ret;
 }
 
-Type* Type::eventNew(const char* name, Type* father)
+Type* Type::getRootType()
 {
-  if (name == nullptr){
-    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);
-  LogDefineEventType(ret);
-  return ret;
+  return rootType;
 }
 
-Type* Type::variableNew(const char* name, const char* color, Type* father)
+Type* Type::getOrCreateContainerType(std::string name)
 {
-  if (name == nullptr){
-    THROWF (tracing_error, 0, "can't create a variable type with a nullptr name");
-  }
-
-  Type* ret = nullptr;
+  auto it = children_.find(name);
+  if (it == children_.end()) {
+    Type* ret = new simgrid::instr::Type(name, name, "", TYPE_CONTAINER, this);
+    XBT_DEBUG("ContainerType %s(%s), child of %s(%s)", ret->getCname(), ret->getId(), getCname(), getId());
+    ret->logContainerTypeDefinition();
+    return ret;
+  } else
+    return it->second;
+}
 
-  if (not color) {
-    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);
+Type* Type::getOrCreateEventType(std::string name)
+{
+  auto it = children_.find(name);
+  if (it == children_.end()) {
+    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;
+  } else {
+    return it->second;
   }
-  XBT_DEBUG("VariableType %s(%s), child of %s(%s)", ret->name, ret->id, father->name, father->id);
-  LogVariableTypeDefinition (ret);
-  return ret;
 }
 
-Type* Type::linkNew(const char* name, Type* father, Type* source, Type* dest)
+Type* Type::getOrCreateVariableType(std::string name, std::string color)
 {
-  if (name == nullptr){
-    THROWF (tracing_error, 0, "can't create a link type with a nullptr name");
-  }
+  auto it = children_.find(name);
+  if (it == children_.end()) {
+    Type* ret = new Type(name, name, color.empty() ? "1 1 1" : color, TYPE_VARIABLE, this);
 
-  Type* ret = nullptr;
+    XBT_DEBUG("VariableType %s(%s), child of %s(%s)", ret->getCname(), ret->getId(), getCname(), getId());
+    ret->logVariableTypeDefinition();
 
-  char key[INSTR_DEFAULT_STR_SIZE];
-  snprintf (key, INSTR_DEFAULT_STR_SIZE, "%s-%s-%s", name, source->id, dest->id);
-  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;
+    return ret;
+  } else
+    return it->second;
 }
 
-Type* Type::stateNew(const char* name, Type* father)
+Type* Type::getOrCreateLinkType(std::string name, Type* source, Type* dest)
 {
-  if (name == nullptr){
-    THROWF (tracing_error, 0, "can't create a state type with a nullptr name");
-  }
-
-  Type* ret = nullptr;
+  std::string alias = name + "-" + source->id_ + "-" + dest->id_;
+  auto it           = children_.find(alias);
+  if (it == children_.end()) {
+    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;
+  } else
+    return it->second;
+}
 
-  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;
+Type* Type::getOrCreateStateType(std::string name)
+{
+  auto it = children_.find(name);
+  if (it == children_.end()) {
+    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;
+  } else
+    return it->second;
+}
+}
 }