X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4a18fb7c6c81b1f58a9f8111fcf0ade106c4746b..1e026cefc11f76f11079b81144aa8acf05e31f34:/src/instr/jedule/jedule_events.c diff --git a/src/instr/jedule/jedule_events.c b/src/instr/jedule/jedule_events.c index 8d235a0209..489cdc72f6 100644 --- a/src/instr/jedule/jedule_events.c +++ b/src/instr/jedule/jedule_events.c @@ -19,66 +19,66 @@ #ifdef HAVE_JEDULE void jed_event_add_resources(jed_event_t event, xbt_dynar_t host_selection) { - xbt_dynar_t resource_subset_list; - jed_res_subset_t res_set; - unsigned int i; + xbt_dynar_t resource_subset_list; + jed_res_subset_t res_set; + unsigned int i; - resource_subset_list = xbt_dynar_new(sizeof(jed_res_subset_t), NULL); + resource_subset_list = xbt_dynar_new(sizeof(jed_res_subset_t), NULL); - jed_simgrid_get_resource_selection_by_hosts(resource_subset_list, host_selection); - xbt_dynar_foreach(resource_subset_list, i, res_set) { - xbt_dynar_push(event->resource_subsets, &res_set); - } + jed_simgrid_get_resource_selection_by_hosts(resource_subset_list, host_selection); + xbt_dynar_foreach(resource_subset_list, i, res_set) { + xbt_dynar_push(event->resource_subsets, &res_set); + } - xbt_dynar_free(&resource_subset_list); + xbt_dynar_free(&resource_subset_list); } void jed_event_add_characteristic(jed_event_t event, char *characteristic) { - xbt_assert( characteristic != NULL ); - xbt_dynar_push(event->characteristics_list, &characteristic); + xbt_assert( characteristic != NULL ); + xbt_dynar_push(event->characteristics_list, &characteristic); } void jed_event_add_info(jed_event_t event, char *key, char *value) { - char *val_cp; + char *val_cp; - xbt_assert(key != NULL); - xbt_assert(value != NULL); + xbt_assert(key != NULL); + xbt_assert(value != NULL); - val_cp = strdup(value); - xbt_dict_set(event->info_hash, key, val_cp, NULL); + val_cp = strdup(value); + xbt_dict_set(event->info_hash, key, val_cp, NULL); } void create_jed_event(jed_event_t *event, char *name, double start_time, - double end_time, const char *type) { + double end_time, const char *type) { - *event = (jed_event_t) calloc(1, sizeof(s_jed_event_t)); - (*event)->name = xbt_strdup(name); + *event = xbt_new0(s_jed_event_t,1); + (*event)->name = xbt_strdup(name); - (*event)->start_time = start_time; - (*event)->end_time = end_time; + (*event)->start_time = start_time; + (*event)->end_time = end_time; - (*event)->type = xbt_strdup(type); + (*event)->type = xbt_strdup(type); - (*event)->resource_subsets = xbt_dynar_new(sizeof(jed_res_subset_t), NULL); - (*event)->characteristics_list = xbt_dynar_new(sizeof(char*), NULL); - (*event)->info_hash = xbt_dict_new_homogeneous(NULL); + (*event)->resource_subsets = xbt_dynar_new(sizeof(jed_res_subset_t), xbt_free_ref); + (*event)->characteristics_list = xbt_dynar_new(sizeof(char*), NULL); + (*event)->info_hash = xbt_dict_new_homogeneous(NULL); } void jed_event_free(jed_event_t event) { - free(event->name); - free(event->type); + free(event->name); + free(event->type); - xbt_dynar_free(&event->resource_subsets); + xbt_dynar_free(&event->resource_subsets); - xbt_dynar_free(&event->characteristics_list); - xbt_dict_free(&event->info_hash); + xbt_dynar_free(&event->characteristics_list); + xbt_dict_free(&event->info_hash); - free(event); + free(event); } #endif