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
Merge branch 'master' into MC_LTL
[simgrid.git]
/
src
/
instr
/
jedule
/
jedule_platform.c
diff --git
a/src/instr/jedule/jedule_platform.c
b/src/instr/jedule/jedule_platform.c
index
d6b488b
..
54fdb74
100644
(file)
--- a/
src/instr/jedule/jedule_platform.c
+++ b/
src/instr/jedule/jedule_platform.c
@@
-91,7
+91,7
@@
void jed_simgrid_add_resources(jed_simgrid_container_t parent,
parent->is_lowest = 1;
xbt_dynar_free(&parent->container_children);
parent->container_children = NULL;
parent->is_lowest = 1;
xbt_dynar_free(&parent->container_children);
parent->container_children = NULL;
- parent->name2id = xbt_dict_new
(
);
+ parent->name2id = xbt_dict_new
_homogeneous(xbt_free
);
parent->last_id = 0;
parent->resource_list = xbt_dynar_new(sizeof(char *), NULL);
parent->last_id = 0;
parent->resource_list = xbt_dynar_new(sizeof(char *), NULL);
@@
-100,7
+100,7
@@
void jed_simgrid_add_resources(jed_simgrid_container_t parent,
xbt_dynar_foreach(host_names, iter, host_name) {
buf = bprintf("%d", parent->last_id);
(parent->last_id)++;
xbt_dynar_foreach(host_names, iter, host_name) {
buf = bprintf("%d", parent->last_id);
(parent->last_id)++;
- xbt_dict_set(parent->name2id, host_name, buf,
xbt_free
);
+ xbt_dict_set(parent->name2id, host_name, buf,
NULL
);
xbt_dict_set(host2_simgrid_parent_container, host_name, parent, NULL);
xbt_dynar_push(parent->resource_list, &host_name);
}
xbt_dict_set(host2_simgrid_parent_container, host_name, parent, NULL);
xbt_dynar_push(parent->resource_list, &host_name);
}
@@
-204,7
+204,7
@@
void jed_simgrid_get_resource_selection_by_hosts(xbt_dynar_t subset_list,
unsigned int iter;
xbt_dict_t parent2hostgroup; // group hosts by parent
unsigned int iter;
xbt_dict_t parent2hostgroup; // group hosts by parent
- parent2hostgroup = xbt_dict_new
(
);
+ parent2hostgroup = xbt_dict_new
_homogeneous(NULL
);
xbt_assert( host_names != NULL );
xbt_assert( host_names != NULL );
@@
-262,9
+262,9
@@
void jedule_add_meta_info(jedule_t jedule, char *key, char *value) {
void jed_create_jedule(jedule_t *jedule) {
*jedule = (jedule_t)calloc(1,sizeof(s_jedule_t));
void jed_create_jedule(jedule_t *jedule) {
*jedule = (jedule_t)calloc(1,sizeof(s_jedule_t));
- host2_simgrid_parent_container = xbt_dict_new
(
);
- container_name2container = xbt_dict_new
(
);
- (*jedule)->jedule_meta_info = xbt_dict_new
(
);
+ host2_simgrid_parent_container = xbt_dict_new
_homogeneous(NULL
);
+ container_name2container = xbt_dict_new
_homogeneous(NULL
);
+ (*jedule)->jedule_meta_info = xbt_dict_new
_homogeneous(NULL
);
}
void jed_free_jedule(jedule_t jedule) {
}
void jed_free_jedule(jedule_t jedule) {