X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c7b463c9c17665403d001fc59cb649551e93d950..6d29c09ea1d296d6a387aedf84b1c0c7084fbbea:/src/instr/jedule/jedule_events.c diff --git a/src/instr/jedule/jedule_events.c b/src/instr/jedule/jedule_events.c index e5175e9c0d..12572e325a 100644 --- a/src/instr/jedule/jedule_events.c +++ b/src/instr/jedule/jedule_events.c @@ -1,9 +1,8 @@ -/* - * jedule_events.c - * - * Created on: Nov 30, 2010 - * Author: sascha - */ +/* Copyright (c) 2010-2014. The SimGrid Team. + * All rights reserved. */ + +/* This program is free software; you can redistribute it and/or modify it + * under the terms of the license (GNU LGPL) which comes with this package. */ #include #include @@ -13,8 +12,8 @@ #include "xbt/dynar.h" #include "xbt/asserts.h" -#include "instr/jedule/jedule_events.h" -#include "instr/jedule/jedule_platform.h" +#include "simgrid/jedule/jedule_events.h" +#include "simgrid/jedule/jedule_platform.h" #ifdef HAVE_JEDULE @@ -53,7 +52,7 @@ void jed_event_add_info(jed_event_t event, char *key, char *value) { void create_jed_event(jed_event_t *event, char *name, double start_time, double end_time, const char *type) { - *event = (jed_event_t) calloc(1, sizeof(s_jed_event_t)); + *event = xbt_new0(s_jed_event_t,1); (*event)->name = xbt_strdup(name); (*event)->start_time = start_time; @@ -61,7 +60,7 @@ void create_jed_event(jed_event_t *event, char *name, double start_time, (*event)->type = xbt_strdup(type); - (*event)->resource_subsets = xbt_dynar_new(sizeof(jed_res_subset_t), 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);