X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a7dc4456f42a853a6294c774ccc9397304732c6e..a93d9a4ceb57a26d8fa1c3904ce7904ff727f2e1:/src/instr/instr_paje_containers.c

diff --git a/src/instr/instr_paje_containers.c b/src/instr/instr_paje_containers.c
index b1898b0151..68464748a6 100644
--- a/src/instr/instr_paje_containers.c
+++ b/src/instr/instr_paje_containers.c
@@ -5,6 +5,9 @@
   * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "instr/instr_private.h"
+#include "xbt/lib.h"
+#include "surf/surf.h"
+#include "surf/surf_routing.h"
 
 #ifdef HAVE_TRACING
 
@@ -104,6 +107,7 @@ container_t PJ_container_new (const char *name, e_container_types kind, containe
       case INSTR_ROUTER:      snprintf (typename, INSTR_DEFAULT_STR_SIZE, "ROUTER");      break;
       case INSTR_SMPI:        snprintf (typename, INSTR_DEFAULT_STR_SIZE, "MPI");         break;
       case INSTR_MSG_PROCESS: snprintf (typename, INSTR_DEFAULT_STR_SIZE, "MSG_PROCESS"); break;
+      case INSTR_MSG_VM: snprintf (typename, INSTR_DEFAULT_STR_SIZE, "MSG_VM"); break;
       case INSTR_MSG_TASK:    snprintf (typename, INSTR_DEFAULT_STR_SIZE, "MSG_TASK");    break;
       default: THROWF (tracing_error, 0, "new container kind is unknown."); break;
     }
@@ -147,12 +151,7 @@ container_t PJ_container_get (const char *name)
 
 container_t PJ_container_get_or_null (const char *name)
 {
-  if (name == NULL) return NULL;
-  container_t ret = xbt_dict_get_or_null (allContainers, name);
-  if (ret == NULL){
-    return NULL;
-  }
-  return ret;
+  return name ? xbt_dict_get_or_null(allContainers, name) : NULL;
 }
 
 container_t PJ_container_get_root ()
@@ -188,8 +187,9 @@ void PJ_container_free (container_t container)
   TRACE_paje_dump_buffer(1);
 
   //trace my destruction
-  if (!TRACE_disable_destroy()){
+  if (!TRACE_disable_destroy() && container != PJ_container_get_root()){
     //do not trace the container destruction if user requests
+    //or if the container is root
     new_pajeDestroyContainer(container);
   }