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)
{
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);
}