X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6e9085979401423afcde6d001562b6ffd23021e8..485a5ec02aa2f8c667ab99f1d556e1851a99cc07:/src/surf/cpu.c diff --git a/src/surf/cpu.c b/src/surf/cpu.c index 8e5f51fba7..dc1165f80e 100644 --- a/src/surf/cpu.c +++ b/src/surf/cpu.c @@ -67,9 +67,6 @@ static cpu_Cas01_t cpu_new(char *name, double power_peak, xbt_dict_set(surf_model_resource_set(surf_cpu_model), name, cpu, surf_resource_free); -#ifdef HAVE_TRACING - TRACE_surf_host_declaration(name, cpu->core * cpu->power_scale * cpu->power_peak); -#endif return cpu; } @@ -142,7 +139,6 @@ static void add_traces_cpu(void) static void cpu_define_callbacks(const char *file) { - surf_parse_reset_parser(); surfxml_add_callback(STag_surfxml_host_cb_list, parse_cpu_init); surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_traces_cpu); } @@ -165,7 +161,7 @@ static int cpu_action_unref(surf_action_t action) if (action->category) xbt_free(action->category); #endif - free(action); + surf_action_free(&action); return 1; } return 0; @@ -217,6 +213,7 @@ static void cpu_update_actions_state(double now, double delta) lmm_variable_getvalue (action->variable), now - delta, delta); + TRACE_last_timestamp_to_dump = now-delta; #endif double_update(&(action->generic_action.remains), lmm_variable_getvalue(action->variable) * delta);