X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/32eeb3976a16c5e5d2b2a9c00f4386cebbb75550..c7edbf695cf8cae1e5bbca502b505d349510eebb:/src/instr/instr_paje_types.cpp

diff --git a/src/instr/instr_paje_types.cpp b/src/instr/instr_paje_types.cpp
index 12b7eeb46c..2dae9593c0 100644
--- a/src/instr/instr_paje_types.cpp
+++ b/src/instr/instr_paje_types.cpp
@@ -8,19 +8,20 @@
 
 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_release ()
 {
   rootType = nullptr;
 }
 
-type_t PJ_type_get_root ()
+simgrid::instr::Type* PJ_type_get_root()
 {
   return rootType;
 }
 
-s_type::s_type (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)
 {
   if (typeNameBuff == nullptr || key == nullptr){
     THROWF(tracing_error, 0, "can't create a new type with name or key equal nullptr");
@@ -43,9 +44,9 @@ s_type::s_type (const char *typeNameBuff, const char *key, const char *color, e_
   }
 }
 
-void PJ_type_free (type_t type)
+void PJ_type_free(simgrid::instr::Type* type)
 {
-  value* val;
+  simgrid::instr::Value* val;
   char *value_name;
   xbt_dict_cursor_t cursor = nullptr;
   xbt_dict_foreach (type->values, cursor, value_name, val) {
@@ -61,11 +62,11 @@ void PJ_type_free (type_t type)
   type = nullptr;
 }
 
-void recursiveDestroyType (type_t type)
+void recursiveDestroyType(simgrid::instr::Type* type)
 {
   XBT_DEBUG("recursiveDestroyType %s", type->name);
   xbt_dict_cursor_t cursor = nullptr;
-  type_t child;
+  simgrid::instr::Type* child;
   char *child_name;
   xbt_dict_foreach(type->children, cursor, child_name, child) {
     recursiveDestroyType (child);
@@ -73,23 +74,23 @@ void recursiveDestroyType (type_t type)
   PJ_type_free(type);
 }
 
-type_t PJ_type_get (const char *name, type_t father)
+simgrid::instr::Type* PJ_type_get(const char* name, simgrid::instr::Type* father)
 {
-  type_t ret = s_type::s_type_get_or_null (name, father);
+  simgrid::instr::Type* ret = simgrid::instr::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_t s_type::s_type_get_or_null (const char *name, type_t father)
+simgrid::instr::Type* simgrid::instr::Type::getOrNull(const char* name, simgrid::instr::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_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) {
@@ -104,13 +105,13 @@ type_t s_type::s_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 = new s_type (name, name, nullptr, TYPE_CONTAINER, father);
+  simgrid::instr::Type* ret = new simgrid::instr::Type(name, name, nullptr, TYPE_CONTAINER, father);
   if (father == nullptr) {
     rootType = ret;
   } else {
@@ -120,63 +121,64 @@ type_t PJ_type_container_new (const char *name, type_t father)
   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 = new s_type (name, name, nullptr, TYPE_EVENT, father);
+  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;
 
   if (not color) {
     char white[INSTR_DEFAULT_STR_SIZE] = "1 1 1";
-    ret = new s_type (name, name, white, TYPE_VARIABLE, father);
+    ret = new Type (name, name, white, TYPE_VARIABLE, father);
   }else{
-    ret = new s_type (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);
   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;
+  Type* ret = nullptr;
 
   char key[INSTR_DEFAULT_STR_SIZE];
   snprintf (key, INSTR_DEFAULT_STR_SIZE, "%s-%s-%s", name, source->id, dest->id);
-  ret = new s_type (name, key, nullptr, TYPE_LINK, father);
+  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;
+  Type* ret = nullptr;
 
-  ret = new s_type (name, name, nullptr, TYPE_STATE, father);
+  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;