X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9f6cbb176d4301cae36a945dfa57e6b6a9cbafef..d5b29830df70e823202e384a7655e4371193ecd7:/src/instr/instr_paje_types.cpp

diff --git a/src/instr/instr_paje_types.cpp b/src/instr/instr_paje_types.cpp
index 68ab4440a4..50df5282eb 100644
--- a/src/instr/instr_paje_types.cpp
+++ b/src/instr/instr_paje_types.cpp
@@ -8,7 +8,7 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_paje_types, instr, "Paje tracing event system (types)");
 
-static type_t rootType = NULL;        /* the root type */
+static type_t rootType = nullptr;        /* the root type */
 
 void PJ_type_alloc ()
 {
@@ -16,9 +16,10 @@ void PJ_type_alloc ()
 
 void PJ_type_release ()
 {
-  rootType = NULL;
+  rootType = nullptr;
 }
 
+
 type_t PJ_type_get_root ()
 {
   return rootType;
@@ -26,24 +27,24 @@ type_t PJ_type_get_root ()
 
 static type_t newType (const char *typeNameBuff, const char *key, const char *color, e_entity_types kind, type_t father)
 {
-  if (typeNameBuff == NULL || key == NULL){
-    THROWF(tracing_error, 0, "can't create a new type with name or key equal NULL");
+  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(NULL);
-  ret->values = xbt_dict_new_homogeneous(NULL);
+  ret->children = xbt_dict_new_homogeneous(nullptr);
+  ret->values = xbt_dict_new_homogeneous(nullptr);
   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);
+  if (father != nullptr){
+    xbt_dict_set (father->children, key, ret, nullptr);
     XBT_DEBUG("new type %s, child of %s", typeNameBuff, father->name);
   }
   return ret;
@@ -53,7 +54,7 @@ void PJ_type_free (type_t type)
 {
   val_t value;
   char *value_name;
-  xbt_dict_cursor_t cursor = NULL;
+  xbt_dict_cursor_t cursor = nullptr;
   xbt_dict_foreach(type->values, cursor, value_name, value) {
     PJ_value_free (value);
   }
@@ -63,13 +64,13 @@ void PJ_type_free (type_t type)
   xbt_free (type->color);
   xbt_dict_free (&type->children);
   xbt_free (type);
-  type = NULL;
+  type = nullptr;
 }
 
 static void recursiveDestroyType (type_t type)
 {
   XBT_DEBUG("recursiveDestroyType %s", type->name);
-  xbt_dict_cursor_t cursor = NULL;
+  xbt_dict_cursor_t cursor = nullptr;
   type_t child;
   char *child_name;
   xbt_dict_foreach(type->children, cursor, child_name, child) {
@@ -78,16 +79,16 @@ static void recursiveDestroyType (type_t type)
   PJ_type_free(type);
 }
 
-void PJ_type_free_all (void)
+void PJ_type_free_all ()
 {
   recursiveDestroyType (PJ_type_get_root());
-  rootType = NULL;
+  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 == NULL){
+  if (ret == nullptr){
     THROWF (tracing_error, 2, "type with name (%s) not found in father type (%s)", name, father->name);
   }
   return ret;
@@ -95,16 +96,17 @@ type_t PJ_type_get (const char *name, type_t father)
 
 type_t PJ_type_get_or_null (const char *name, type_t father)
 {
-  if (name == NULL || father == NULL){
-    THROWF (tracing_error, 0, "can't get type with a NULL name or from a NULL 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 = NULL, child;
+  type_t ret = nullptr;
+  type_t child;
   char *child_name;
-  xbt_dict_cursor_t cursor = NULL;
+  xbt_dict_cursor_t cursor = nullptr;
   xbt_dict_foreach(father->children, cursor, child_name, child) {
     if (strcmp (child->name, name) == 0){
-      if (ret != NULL){
+      if (ret != nullptr){
         THROWF (tracing_error, 0, "there are two children types with the same name?");
       }else{
         ret = child;
@@ -116,82 +118,82 @@ type_t PJ_type_get_or_null (const char *name, type_t father)
 
 type_t PJ_type_container_new (const char *name, type_t 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;
+  type_t ret = nullptr;
 
-  ret = newType (name, name, NULL, TYPE_CONTAINER, father);
-  if (father == NULL){
+  ret = newType (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_pajeDefineContainerType (ret);
+    DefineContainerEvent(ret);
   }
   return ret;
 }
 
 type_t PJ_type_event_new (const char *name, type_t 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);
+  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_pajeDefineEventType(ret);
+  LogDefineEventType(ret);
   return ret;
 }
 
 type_t PJ_type_variable_new (const char *name, const char *color, type_t 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_t ret = nullptr;
 
   char white[INSTR_DEFAULT_STR_SIZE] = "1 1 1";
-  if (!color){
+  if (not color) {
     ret = newType (name, name, white, TYPE_VARIABLE, father);
   }else{
     ret = newType (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);
+  LogVariableTypeDefinition (ret);
   return ret;
 }
 
 type_t PJ_type_link_new (const char *name, type_t father, type_t source, type_t 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;
+  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, NULL, TYPE_LINK, father);
+  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_pajeDefineLinkType(ret, source, dest);
+  LogLinkTypeDefinition(ret, source, dest);
   return ret;
 }
 
 type_t PJ_type_state_new (const char *name, type_t 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;
+  type_t ret = nullptr;
 
-  ret = newType (name, name, NULL, TYPE_STATE, father);
+  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_pajeDefineStateType(ret);
+  LogStateTypeDefinition(ret);
   return ret;
 }