A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[trace] save/restore previous state when pause/resume tracing
[simgrid.git]
/
src
/
instr
/
instr_paje_containers.c
diff --git
a/src/instr/instr_paje_containers.c
b/src/instr/instr_paje_containers.c
index
526db8a
..
64e0608
100644
(file)
--- a/
src/instr/instr_paje_containers.c
+++ b/
src/instr/instr_paje_containers.c
@@
-12,8
+12,8
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_paje_containers, instr, "Paje tracing eve
static container_t rootContainer = NULL; /* the root container */
static xbt_dict_t allContainers = NULL; /* all created containers indexed by name */
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)
{
long long int instr_new_paje_id (void)
{
@@
-147,12
+147,7
@@
container_t PJ_container_get (const char *name)
container_t PJ_container_get_or_null (const char *name)
{
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 ()
}
container_t PJ_container_get_root ()
@@
-188,8
+183,9
@@
void PJ_container_free (container_t container)
TRACE_paje_dump_buffer(1);
//trace my destruction
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
//do not trace the container destruction if user requests
+ //or if the container is root
new_pajeDestroyContainer(container);
}
new_pajeDestroyContainer(container);
}