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
Add the faq to documentation because it is under version control
[simgrid.git]
/
src
/
instr
/
instr_paje.c
diff --git
a/src/instr/instr_paje.c
b/src/instr/instr_paje.c
index 8b300ed22c7ab3404b0d2c93bf9ca130937905aa..8d6cf31aec6448cd68f1de068c61c48bc0e49e07 100644
(file)
--- a/
src/instr/instr_paje.c
+++ b/
src/instr/instr_paje.c
@@
-18,18
+18,33
@@
xbt_dict_t trivaEdgeTypes = NULL; /* all host types defined */
void instr_paje_init (container_t root)
{
void instr_paje_init (container_t root)
{
- allContainers = xbt_dict_new
(
);
- trivaNodeTypes = xbt_dict_new
(
);
- trivaEdgeTypes = xbt_dict_new
(
);
+ allContainers = xbt_dict_new
_homogeneous(NULL
);
+ trivaNodeTypes = xbt_dict_new
_homogeneous(xbt_free
);
+ trivaEdgeTypes = xbt_dict_new
_homogeneous(xbt_free
);
rootContainer = root;
}
rootContainer = root;
}
+void instr_paje_free (void)
+{
+ xbt_dict_free (&allContainers);
+ xbt_dict_free (&trivaNodeTypes);
+ xbt_dict_free (&trivaEdgeTypes);
+}
+
static long long int new_type_id (void)
{
static long long int type_id = 0;
return type_id++;
}
static long long int new_type_id (void)
{
static long long int type_id = 0;
return type_id++;
}
+static void destroyValue (void *value)
+{
+ xbt_free(((val_t)value)->name);
+ xbt_free(((val_t)value)->color);
+ xbt_free(((val_t)value)->id);
+ xbt_free(value);
+}
+
static val_t newValue (const char *valuename, const char *color, type_t father)
{
val_t ret = xbt_new0(s_val_t, 1);
static val_t newValue (const char *valuename, const char *color, type_t father)
{
val_t ret = xbt_new0(s_val_t, 1);
@@
-70,8
+85,8
@@
static type_t newType (const char *typename, const char *key, const char *color,
ret->name = xbt_strdup (typename);
ret->father = father;
ret->kind = kind;
ret->name = xbt_strdup (typename);
ret->father = father;
ret->kind = kind;
- ret->children = xbt_dict_new
(
);
- ret->values = xbt_dict_new
(
);
+ ret->children = xbt_dict_new
_homogeneous(NULL
);
+ ret->values = xbt_dict_new
_homogeneous(NULL
);
ret->color = xbt_strdup (color);
char str_id[INSTR_DEFAULT_STR_SIZE];
ret->color = xbt_strdup (color);
char str_id[INSTR_DEFAULT_STR_SIZE];
@@
-215,7
+230,7
@@
container_t newContainer (const char *name, e_container_types kind, container_t
default: xbt_die ("Congratulations, you have found a bug on newContainer function of instr_routing.c"); break;
}
}
default: xbt_die ("Congratulations, you have found a bug on newContainer function of instr_routing.c"); break;
}
}
- new->children = xbt_dict_new
(
);
+ new->children = xbt_dict_new
_homogeneous(NULL
);
if (new->father){
xbt_dict_set(new->father->children, new->name, new, NULL);
new_pajeCreateContainer (new);
if (new->father){
xbt_dict_set(new->father->children, new->name, new, NULL);
new_pajeCreateContainer (new);
@@
-226,13
+241,14
@@
container_t newContainer (const char *name, e_container_types kind, container_t
xbt_dict_set (allContainers, new->name, new, NULL);
//register NODE types for triva configuration
xbt_dict_set (allContainers, new->name, new, NULL);
//register NODE types for triva configuration
- xbt_dict_set (trivaNodeTypes, new->type->name, xbt_strdup("1"),
xbt_free
);
+ xbt_dict_set (trivaNodeTypes, new->type->name, xbt_strdup("1"),
NULL
);
}
return new;
}
static container_t recursiveGetContainer (const char *name, container_t root)
{
}
return new;
}
static container_t recursiveGetContainer (const char *name, container_t root)
{
+ if (name == NULL || root == NULL) return NULL;
if (strcmp (root->name, name) == 0) return root;
xbt_dict_cursor_t cursor = NULL;
if (strcmp (root->name, name) == 0) return root;
xbt_dict_cursor_t cursor = NULL;
@@
-247,6
+263,7
@@
static container_t recursiveGetContainer (const char *name, container_t root)
container_t getContainer (const char *name)
{
container_t getContainer (const char *name)
{
+ if (name == NULL) return NULL;
return recursiveGetContainer(name, rootContainer);
}
return recursiveGetContainer(name, rootContainer);
}
@@
-295,11
+312,6
@@
type_t getType (const char *name, type_t father)
void destroyContainer (container_t container)
{
void destroyContainer (container_t container)
{
- //remove me from my father
- if (container->father){
- xbt_dict_remove(container->father->children, container->name);
- }
-
XBT_DEBUG("destroy container %s", container->name);
//obligation to dump previous events because they might
XBT_DEBUG("destroy container %s", container->name);
//obligation to dump previous events because they might
@@
-308,12
+320,15
@@
void destroyContainer (container_t container)
TRACE_paje_dump_buffer(1);
//trace my destruction
TRACE_paje_dump_buffer(1);
//trace my destruction
- new_pajeDestroyContainer(container);
+ if (!TRACE_disable_destroy()){
+ //do not trace the container destruction if user requests
+ new_pajeDestroyContainer(container);
+ }
//free
xbt_free (container->name);
xbt_free (container->id);
//free
xbt_free (container->name);
xbt_free (container->id);
- xbt_
free (
container->children);
+ xbt_
dict_free (&
container->children);
xbt_free (container);
container = NULL;
}
xbt_free (container);
container = NULL;
}
@@
-339,8
+354,14
@@
static void recursiveDestroyType (type_t type)
}
xbt_free (type->name);
xbt_free (type->id);
}
xbt_free (type->name);
xbt_free (type->id);
- xbt_free (type->children);
- xbt_free (type->values);
+ xbt_free (type->color);
+ xbt_dict_free (&type->children);
+ val_t value;
+ char *value_name;
+ xbt_dict_foreach(type->values, cursor, value_name, value) {
+ destroyValue (value);
+ }
+ xbt_dict_free (&type->values);
xbt_free (type);
type = NULL;
}
xbt_free (type);
type = NULL;
}