X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3306173adf8a11cb32a60a7636181a230a7104ee..f4ae32c676421a6cd5c076b273dd7a07f2695957:/src/surf/cpu.c diff --git a/src/surf/cpu.c b/src/surf/cpu.c index 941b213a84..3814631308 100644 --- a/src/surf/cpu.c +++ b/src/surf/cpu.c @@ -19,6 +19,7 @@ static xbt_swag_t running_action_set_that_does_not_need_being_checked = NULL; static void cpu_free(void *cpu) { free(((cpu_Cas01_t) cpu)->name); + xbt_dict_free(&(((cpu_Cas01_t)cpu)->properties)); free(cpu); } @@ -145,8 +146,8 @@ static int resource_used(void *resource_id) static int action_free(surf_action_t action) { - action->using--; - if (!action->using) { + action->refcount --; + if (!action->refcount ) { xbt_swag_remove(action, action->state_set); if (((surf_action_cpu_Cas01_t) action)->variable) lmm_variable_free(cpu_maxmin_system, @@ -159,7 +160,7 @@ static int action_free(surf_action_t action) static void action_use(surf_action_t action) { - action->using++; + action->refcount ++; } static void action_cancel(surf_action_t action) @@ -272,7 +273,7 @@ static surf_action_t execute(void *cpu, double size) XBT_IN2("(%s,%g)", CPU->name, size); action = xbt_new0(s_surf_action_cpu_Cas01_t, 1); - action->generic_action.using = 1; + action->generic_action.refcount = 1; action->generic_action.cost = size; action->generic_action.remains = size; action->generic_action.priority = 1.0;