* 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
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 link types defined */
-xbt_dict_t trivaEdgeTypes = NULL; /* all host types defined */
+xbt_dict_t trivaNodeTypes = NULL; /* all host types defined */
+xbt_dict_t trivaEdgeTypes = NULL; /* all link types defined */
long long int instr_new_paje_id (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 ()
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);
}
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");
}
}