X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6f7ca9bfeec30e5afa9faf3d091ec788580a689b..936c8368c87c5a08ecc141096aca846cbc10a194:/src/surf/cpu_im.c diff --git a/src/surf/cpu_im.c b/src/surf/cpu_im.c index 66faee8c06..4950f7793e 100644 --- a/src/surf/cpu_im.c +++ b/src/surf/cpu_im.c @@ -175,6 +175,9 @@ static int cpu_im_action_unref(surf_action_t action) xbt_swag_remove(action, ((cpu_Cas01_im_t) ACTION_GET_CPU(action))->action_set); xbt_swag_insert(ACTION_GET_CPU(action), cpu_im_modified_cpu); +#ifdef HAVE_TRACING + if (action->category) xbt_free (action->category); +#endif free(action); return 1; } @@ -226,7 +229,7 @@ static void cpu_im_update_remains(cpu_Cas01_im_t cpu, double now) cpu->last_update)); #ifdef HAVE_TRACING TRACE_surf_host_set_utilization (cpu->generic_resource.name, - action->generic_lmm_action.generic_action.data, lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable), cpu->last_update, now-cpu->last_update); + action->generic_lmm_action.generic_action.data, (surf_action_t)action, lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable), cpu->last_update, now-cpu->last_update); #endif DEBUG2("Update action(%p) remains %lf", action, GENERIC_ACTION(action).remains); @@ -308,7 +311,7 @@ static void cpu_im_update_actions_state(double now, double delta) /* set the remains to 0 due to precision problems when updating the remaining amount */ #ifdef HAVE_TRACING TRACE_surf_host_set_utilization (((cpu_Cas01_im_t)(action->cpu))->generic_resource.name, - action->generic_lmm_action.generic_action.data, lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable), ((cpu_Cas01_im_t)(action->cpu))->last_update, now-((cpu_Cas01_im_t)(action->cpu))->last_update); + action->generic_lmm_action.generic_action.data, (surf_action_t)action, lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable), ((cpu_Cas01_im_t)(action->cpu))->last_update, now-((cpu_Cas01_im_t)(action->cpu))->last_update); #endif GENERIC_ACTION(action).remains = 0; cpu_im_cpu_action_state_set((surf_action_t) action, SURF_ACTION_DONE);