-/* 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
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)
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;
}
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 ()
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");
}
}