X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f9436b840852218b39dce22d6057b6f223168daa..26de68319e3690dfd6537d61fd9b7dbb536ce140:/src/instr/instr_paje_types.cpp

diff --git a/src/instr/instr_paje_types.cpp b/src/instr/instr_paje_types.cpp
index acb89e3c47..e8b59fa77a 100644
--- a/src/instr/instr_paje_types.cpp
+++ b/src/instr/instr_paje_types.cpp
@@ -1,4 +1,4 @@
-/* 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
@@ -8,106 +8,76 @@
 
 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_alloc ()
-{
-}
-
-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(const char* typeNameBuff, const char* key, const char* color, e_entity_types kind,
+                           Type* father)
+    : 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");
   }
 
-  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(nullptr);
-  ret->values = xbt_dict_new_homogeneous(nullptr);
-  ret->color = xbt_strdup (color);
+  this->name_     = xbt_strdup(typeNameBuff);
+  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());
-  ret->id = xbt_strdup (str_id);
+  this->id_ = bprintf("%lld", 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);
+    xbt_dict_set(father->children_, key, this, nullptr);
+    XBT_DEBUG("new type %s, child of %s", typeNameBuff, father->name_);
   }
-  return ret;
 }
 
-void PJ_type_free (type_t type)
+simgrid::instr::Type::~Type()
 {
-  val_t value;
+  simgrid::instr::Value* val;
   char *value_name;
   xbt_dict_cursor_t cursor = nullptr;
-  xbt_dict_foreach(type->values, cursor, value_name, value) {
-    PJ_value_free (value);
+  xbt_dict_foreach (values_, cursor, value_name, val) {
+    XBT_DEBUG("free value %s, child of %s", val->name_, val->father_->name_);
+    delete val;
   }
-  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;
-}
-
-static void recursiveDestroyType (type_t type)
-{
-  XBT_DEBUG("recursiveDestroyType %s", type->name);
-  xbt_dict_cursor_t cursor = nullptr;
-  type_t child;
+  xbt_dict_free(&values_);
+  simgrid::instr::Type* child;
   char *child_name;
-  xbt_dict_foreach(type->children, cursor, child_name, child) {
-    recursiveDestroyType (child);
+  xbt_dict_foreach (children_, cursor, child_name, child) {
+    delete child;
   }
-  PJ_type_free(type);
+  xbt_dict_free(&children_);
+  xbt_free(name_);
+  xbt_free(id_);
+  xbt_free(color_);
 }
 
-void PJ_type_free_all ()
+simgrid::instr::Type* simgrid::instr::Type::getChild(const char* name)
 {
-  recursiveDestroyType (PJ_type_get_root());
-  rootType = nullptr;
-}
-
-type_t PJ_type_get (const char *name, type_t father)
-{
-  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, this->name_);
   return ret;
 }
 
-type_t PJ_type_get_or_null (const char *name, type_t father)
+simgrid::instr::Type* simgrid::instr::Type::getChildOrNull(const char* 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(name != nullptr, "can't get type with a nullptr name");
 
-  type_t ret = nullptr;
-  type_t child;
+  simgrid::instr::Type* ret = nullptr;
+  simgrid::instr::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){
+  xbt_dict_foreach (children_, cursor, child_name, child) {
+    if (strcmp(child->name_, name) == 0) {
+      if (ret != nullptr) {
         THROWF (tracing_error, 0, "there are two children types with the same name?");
-      }else{
+      } else {
         ret = child;
       }
     }
@@ -115,84 +85,77 @@ type_t PJ_type_get_or_null (const char *name, type_t father)
   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 = nullptr;
-
-  ret = newType (name, name, nullptr, TYPE_CONTAINER, father);
-  if (father == nullptr){
+  simgrid::instr::Type* ret = new simgrid::instr::Type(name, name, nullptr, 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 DefineContainerEvent(ret);
+  } else {
+    XBT_DEBUG("ContainerType %s(%s), child of %s(%s)", ret->name_, ret->id_, father->name_, father->id_);
+    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);
-  new DefineEventTypeEvent(ret);
+  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;
 }
 
-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, const char* 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;
 
-  char white[INSTR_DEFAULT_STR_SIZE] = "1 1 1";
   if (not color) {
-    ret = newType (name, name, white, TYPE_VARIABLE, father);
+    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 DefineVariableTypeEvent (ret);
+  XBT_DEBUG("VariableType %s(%s), child of %s(%s)", ret->name_, ret->id_, father->name_, father->id_);
+  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);
-  new DefineLinkTypeEvent(ret, source, dest);
+  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_);
+  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);
-  new DefineStateTypeEvent(ret);
+  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_);
+  LogStateTypeDefinition(ret);
   return ret;
 }