X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/56fd6af5b42030d3b9e5ef6fc5f3632961a9db90..eca09d65271990fdae84e1d7da71916740a9c50b:/src/instr/instr_paje_containers.c diff --git a/src/instr/instr_paje_containers.c b/src/instr/instr_paje_containers.c index 18129e8a31..3a7ce52fc2 100644 --- a/src/instr/instr_paje_containers.c +++ b/src/instr/instr_paje_containers.c @@ -1,10 +1,13 @@ -/* Copyright (c) 2010. The SimGrid Team. +/* Copyright (c) 2010, 2012-2014. 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 "xbt/lib.h" +#include "surf/surf.h" +#include "surf/surf_routing.h" #ifdef HAVE_TRACING @@ -24,8 +27,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) @@ -226,7 +229,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"); } }