X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0c13871d73e933c1847faf8debea7b7745a3ff44..6a6c1a432ee6568c58d74d31746544e6afabdf6f:/src/instr/instr_paje_containers.c

diff --git a/src/instr/instr_paje_containers.c b/src/instr/instr_paje_containers.c
index 68464748a6..8566b30035 100644
--- a/src/instr/instr_paje_containers.c
+++ b/src/instr/instr_paje_containers.c
@@ -1,16 +1,14 @@
-/* Copyright (c) 2010. The SimGrid Team.
+/* Copyright (c) 2010, 2012-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
-  * under the terms of the license (GNU LGPL) which comes with this package. */
+ * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "instr/instr_private.h"
+#include "src/instr/instr_private.h"
 #include "xbt/lib.h"
 #include "surf/surf.h"
 #include "surf/surf_routing.h"
 
-#ifdef HAVE_TRACING
-
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_paje_containers, instr, "Paje tracing event system (containers)");
 
 static container_t rootContainer = NULL;    /* the root container */
@@ -27,8 +25,8 @@ long long int instr_new_paje_id (void)
 void PJ_container_alloc (void)
 {
   allContainers = xbt_dict_new_homogeneous(NULL);
-  trivaNodeTypes = xbt_dict_new_homogeneous(xbt_free);
-  trivaEdgeTypes = xbt_dict_new_homogeneous(xbt_free);
+  trivaNodeTypes = xbt_dict_new_homogeneous(xbt_free_f);
+  trivaEdgeTypes = xbt_dict_new_homogeneous(xbt_free_f);
 }
 
 void PJ_container_release (void)
@@ -57,11 +55,12 @@ container_t PJ_container_new (const char *name, e_container_types kind, containe
   new->name = xbt_strdup (name); // name of the container
   new->id = xbt_strdup (id_str); // id (or alias) of the container
   new->father = father;
+  sg_host_t sg_host = sg_host_by_name(name);
 
   //Search for network_element_t
   switch (kind){
     case INSTR_HOST:
-      new->net_elm = xbt_lib_get_or_null(host_lib,name,ROUTING_HOST_LEVEL);
+      new->net_elm = sg_host_edge(sg_host);
       if(!new->net_elm) xbt_die("Element '%s' not found",name);
       break;
     case INSTR_ROUTER:
@@ -229,9 +228,7 @@ void PJ_container_free_all ()
   rootContainer = NULL;
 
   //checks
-  if (xbt_dict_length(allContainers) != 0){
+  if (!xbt_dict_is_empty(allContainers)){
     THROWF(tracing_error, 0, "some containers still present even after destroying all of them");
   }
 }
-
-#endif /* HAVE_TRACING */