X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/afb806d0615c22ac119575596b71691f4e2bc9d1..1750409d1aafcec7d8ea213624517fe6ab1fc67e:/src/instr/instr_paje_containers.cpp

diff --git a/src/instr/instr_paje_containers.cpp b/src/instr/instr_paje_containers.cpp
index f9606bd78b..66d593e34b 100644
--- a/src/instr/instr_paje_containers.cpp
+++ b/src/instr/instr_paje_containers.cpp
@@ -11,10 +11,10 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_paje_containers, instr, "Paje tracing event system (containers)");
 
-static container_t rootContainer = NULL;    /* the root container */
-static xbt_dict_t allContainers = NULL;     /* all created containers indexed by name */
-xbt_dict_t trivaNodeTypes = NULL;     /* all host types defined */
-xbt_dict_t trivaEdgeTypes = NULL;     /* all link types defined */
+static container_t rootContainer = nullptr;    /* the root container */
+static xbt_dict_t allContainers = nullptr;     /* all created containers indexed by name */
+xbt_dict_t trivaNodeTypes = nullptr;     /* all host types defined */
+xbt_dict_t trivaEdgeTypes = nullptr;     /* all link types defined */
 
 long long int instr_new_paje_id (void)
 {
@@ -24,7 +24,7 @@ long long int instr_new_paje_id (void)
 
 void PJ_container_alloc (void)
 {
-  allContainers = xbt_dict_new_homogeneous(NULL);
+  allContainers = xbt_dict_new_homogeneous(nullptr);
   trivaNodeTypes = xbt_dict_new_homogeneous(xbt_free_f);
   trivaEdgeTypes = xbt_dict_new_homogeneous(xbt_free_f);
 }
@@ -43,8 +43,8 @@ void PJ_container_set_root (container_t root)
 
 container_t PJ_container_new (const char *name, e_container_types kind, container_t father)
 {
-  if (name == NULL){
-    THROWF (tracing_error, 0, "can't create a container with a NULL name");
+  if (name == nullptr){
+    THROWF (tracing_error, 0, "can't create a container with a nullptr name");
   }
 
   static long long int container_id = 0;
@@ -60,19 +60,19 @@ container_t PJ_container_new (const char *name, e_container_types kind, containe
   //Search for network_element_t
   switch (kind){
     case INSTR_HOST:
-      newContainer->net_elm = sg_host->pimpl_netcard;
-      if(!newContainer->net_elm) xbt_die("Element '%s' not found",name);
+      newContainer->netcard = sg_host->pimpl_netcard;
+      if(!newContainer->netcard) xbt_die("Element '%s' not found",name);
       break;
     case INSTR_ROUTER:
-      newContainer->net_elm = (sg_netcard_t)xbt_lib_get_or_null(as_router_lib,name,ROUTING_ASR_LEVEL);
-      if(!newContainer->net_elm) xbt_die("Element '%s' not found",name);
+      newContainer->netcard = (sg_netcard_t)xbt_lib_get_or_null(as_router_lib,name,ROUTING_ASR_LEVEL);
+      if(!newContainer->netcard) xbt_die("Element '%s' not found",name);
       break;
     case INSTR_AS:
-      newContainer->net_elm = (sg_netcard_t)xbt_lib_get_or_null(as_router_lib,name,ROUTING_ASR_LEVEL);
-      if(!newContainer->net_elm) xbt_die("Element '%s' not found",name);
+      newContainer->netcard = (sg_netcard_t)xbt_lib_get_or_null(as_router_lib,name,ROUTING_ASR_LEVEL);
+      if(!newContainer->netcard) xbt_die("Element '%s' not found",name);
       break;
     default:
-      newContainer->net_elm = NULL;
+      newContainer->netcard = nullptr;
       break;
   }
 
@@ -91,11 +91,11 @@ container_t PJ_container_new (const char *name, e_container_types kind, containe
     snprintf (as_typename, INSTR_DEFAULT_STR_SIZE, "L%d", newContainer->level);
     if (newContainer->father){
       newContainer->type = PJ_type_get_or_null (as_typename, newContainer->father->type);
-      if (newContainer->type == NULL){
+      if (newContainer->type == nullptr){
         newContainer->type = PJ_type_container_new (as_typename, newContainer->father->type);
       }
     }else{
-      newContainer->type = PJ_type_container_new ("0", NULL);
+      newContainer->type = PJ_type_container_new ("0", nullptr);
     }
   }else{
     //otherwise, the name is its kind
@@ -111,38 +111,37 @@ container_t PJ_container_new (const char *name, e_container_types kind, containe
       default: THROWF (tracing_error, 0, "new container kind is unknown."); break;
     }
     type_t type = PJ_type_get_or_null (typeNameBuff, newContainer->father->type);
-    if (type == NULL){
+    if (type == nullptr){
       newContainer->type = PJ_type_container_new (typeNameBuff, newContainer->father->type);
     }else{
       newContainer->type = type;
     }
   }
-  newContainer->children = xbt_dict_new_homogeneous(NULL);
+  newContainer->children = xbt_dict_new_homogeneous(nullptr);
   if (newContainer->father){
-    xbt_dict_set(newContainer->father->children, newContainer->name, newContainer, NULL);
+    xbt_dict_set(newContainer->father->children, newContainer->name, newContainer, nullptr);
     new_pajeCreateContainer (newContainer);
   }
 
   //register all kinds by name
-  if (xbt_dict_get_or_null(allContainers, newContainer->name) != NULL){
+  if (xbt_dict_get_or_null(allContainers, newContainer->name) != nullptr){
     THROWF(tracing_error, 1, "container %s already present in allContainers data structure", newContainer->name);
   }
 
-  xbt_dict_set (allContainers, newContainer->name, newContainer, NULL);
+  xbt_dict_set (allContainers, newContainer->name, newContainer, nullptr);
   XBT_DEBUG("Add container name '%s'",newContainer->name);
 
   //register NODE types for triva configuration
   if (newContainer->kind == INSTR_HOST || newContainer->kind == INSTR_LINK || newContainer->kind == INSTR_ROUTER) {
-    xbt_dict_set (trivaNodeTypes, newContainer->type->name, xbt_strdup("1"), NULL);
+    xbt_dict_set (trivaNodeTypes, newContainer->type->name, xbt_strdup("1"), nullptr);
   }
-
   return newContainer;
 }
 
 container_t PJ_container_get (const char *name)
 {
   container_t ret = PJ_container_get_or_null (name);
-  if (ret == NULL){
+  if (ret == nullptr){
     THROWF(tracing_error, 1, "container with name %s not found", name);
   }
   return ret;
@@ -150,7 +149,7 @@ container_t PJ_container_get (const char *name)
 
 container_t PJ_container_get_or_null (const char *name)
 {
-  return (container_t)(name ? xbt_dict_get_or_null(allContainers, name) : NULL);
+  return (container_t)(name ? xbt_dict_get_or_null(allContainers, name) : nullptr);
 }
 
 container_t PJ_container_get_root ()
@@ -160,8 +159,8 @@ container_t PJ_container_get_root ()
 
 void PJ_container_remove_from_parent (container_t child)
 {
-  if (child == NULL){
-    THROWF (tracing_error, 0, "can't remove from parent with a NULL child");
+  if (child == nullptr){
+    THROWF (tracing_error, 0, "can't remove from parent with a nullptr child");
   }
 
   container_t parent = child->father;
@@ -175,8 +174,8 @@ void PJ_container_remove_from_parent (container_t child)
 
 void PJ_container_free (container_t container)
 {
-  if (container == NULL){
-    THROWF (tracing_error, 0, "trying to free a NULL container");
+  if (container == nullptr){
+    THROWF (tracing_error, 0, "trying to free a nullptr container");
   }
   XBT_DEBUG("destroy container %s", container->name);
 
@@ -200,16 +199,16 @@ void PJ_container_free (container_t container)
   xbt_free (container->id);
   xbt_dict_free (&container->children);
   xbt_free (container);
-  container = NULL;
+  container = nullptr;
 }
 
 static void recursiveDestroyContainer (container_t container)
 {
-  if (container == NULL){
-    THROWF (tracing_error, 0, "trying to recursively destroy a NULL container");
+  if (container == nullptr){
+    THROWF (tracing_error, 0, "trying to recursively destroy a nullptr container");
   }
   XBT_DEBUG("recursiveDestroyContainer %s", container->name);
-  xbt_dict_cursor_t cursor = NULL;
+  xbt_dict_cursor_t cursor = nullptr;
   container_t child;
   char *child_name;
   xbt_dict_foreach(container->children, cursor, child_name, child) {
@@ -221,11 +220,11 @@ static void recursiveDestroyContainer (container_t container)
 void PJ_container_free_all ()
 {
   container_t root = PJ_container_get_root();
-  if (root == NULL){
-    THROWF (tracing_error, 0, "trying to free all containers, but root is NULL");
+  if (root == nullptr){
+    THROWF (tracing_error, 0, "trying to free all containers, but root is nullptr");
   }
   recursiveDestroyContainer (root);
-  rootContainer = NULL;
+  rootContainer = nullptr;
 
   //checks
   if (!xbt_dict_is_empty(allContainers)){