X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3eb2083c05f047dcdb72bcccd697687ca3ee6aac..585eeb393ae78877bab30573f224a2171074a6ca:/src/instr/instr_paje_types.cpp

diff --git a/src/instr/instr_paje_types.cpp b/src/instr/instr_paje_types.cpp
index 68ab4440a4..711a8a6e1c 100644
--- a/src/instr/instr_paje_types.cpp
+++ b/src/instr/instr_paje_types.cpp
@@ -1,197 +1,143 @@
-/* Copyright (c) 2012, 2014-2015. The SimGrid Team.
+/* Copyright (c) 2012, 2014-2017. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* 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 = NULL;        /* the root type */
+static simgrid::instr::Type* rootType = nullptr; /* the root type */
 
-void PJ_type_alloc ()
-{
-}
-
-void PJ_type_release ()
-{
-  rootType = NULL;
-}
-
-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 == NULL || key == NULL){
-    THROWF(tracing_error, 0, "can't create a new type with name or key equal NULL");
+  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_t, 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->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);
-    XBT_DEBUG("new type %s, child of %s", typeNameBuff, father->name);
-  }
-  return ret;
-}
+  this->id_ = std::to_string(instr_new_paje_id());
 
-void PJ_type_free (type_t type)
-{
-  val_t value;
-  char *value_name;
-  xbt_dict_cursor_t cursor = NULL;
-  xbt_dict_foreach(type->values, cursor, value_name, value) {
-    PJ_value_free (value);
+  if (father != nullptr){
+    father->children_.insert({key, 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 = NULL;
 }
 
-static void recursiveDestroyType (type_t type)
+simgrid::instr::Type::~Type()
 {
-  XBT_DEBUG("recursiveDestroyType %s", type->name);
-  xbt_dict_cursor_t cursor = NULL;
-  type_t child;
-  char *child_name;
-  xbt_dict_foreach(type->children, cursor, child_name, child) {
-    recursiveDestroyType (child);
+  for (auto elm : values_) {
+    XBT_DEBUG("free value %s, child of %s", elm.second->getCname(), elm.second->father_->getCname());
+    delete elm.second;
+  }
+  for (auto elm : children_) {
+    delete elm.second;
   }
-  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)
+simgrid::instr::Type* simgrid::instr::Type::getChild(std::string name)
 {
-  type_t ret = PJ_type_get_or_null (name, father);
-  if (ret == NULL){
-    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 == NULL || father == NULL){
-    THROWF (tracing_error, 0, "can't get type with a NULL name or from a NULL father");
-  }
+  xbt_assert(not name.empty(), "can't get type with a nullptr name");
 
-  type_t ret = NULL, child;
-  char *child_name;
-  xbt_dict_cursor_t cursor = NULL;
-  xbt_dict_foreach(father->children, cursor, child_name, child) {
-    if (strcmp (child->name, name) == 0){
-      if (ret != NULL){
+  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 == 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;
-
-  ret = newType (name, name, NULL, TYPE_CONTAINER, father);
-  if (father == NULL){
+  simgrid::instr::Type* ret = new simgrid::instr::Type(name, name, "", 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);
+  } else {
+    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 == 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);
-  XBT_DEBUG("EventType %s(%s), child of %s(%s)", ret->name, ret->id, father->name, father->id);
-  new_pajeDefineEventType(ret);
+  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 == 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* ret = nullptr;
 
-  char white[INSTR_DEFAULT_STR_SIZE] = "1 1 1";
-  if (!color){
-    ret = newType (name, name, white, TYPE_VARIABLE, father);
+  if (color.empty()) {
+    char white[INSTR_DEFAULT_STR_SIZE] = "1 1 1";
+    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);
-  new_pajeDefineVariableType (ret);
+  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 == 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;
-
   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);
-  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);
+  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 == 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;
-
-  ret = newType (name, name, NULL, TYPE_STATE, father);
-  XBT_DEBUG("StateType %s(%s), child of %s(%s)", ret->name, ret->id, father->name, father->id);
-  new_pajeDefineStateType(ret);
+  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;
 }