-/* Copyright (c) 2009-2011. The SimGrid Team.
+/* Copyright (c) 2009-2013. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
static xbt_swag_t
cpu_running_action_set_that_does_not_need_being_checked = NULL;
+/* Additionnal callback function to cleanup some data, called from surf_resource_free */
+
+static void cpu_cas01_cleanup(void* r){
+ cpu_Cas01_t cpu = (cpu_Cas01_t)r;
+ unsigned int iter;
+ xbt_dynar_t power_tuple = NULL;
+ xbt_dynar_foreach(cpu->energy->power_range_watts_list, iter, power_tuple)
+ xbt_dynar_free(&power_tuple);
+ xbt_dynar_free(&cpu->energy->power_range_watts_list);
+ xbt_dynar_free(&cpu->power_peak_list);
+ xbt_free(cpu->energy);
+ return;
+}
/* This function is registered as a callback to sg_platf_new_host() and never called directly */
static void *cpu_create_resource(const char *name, xbt_dynar_t power_peak,
name);
cpu = (cpu_Cas01_t) surf_resource_new(sizeof(s_cpu_Cas01_t),
surf_cpu_model, name,
- cpu_properties);
+ cpu_properties, &cpu_cas01_cleanup);
cpu->power_peak = xbt_dynar_get_as(power_peak, pstate, double);
cpu->power_peak_list = power_peak;
cpu->pstate = pstate;
cpu->energy->power_range_watts_list = cpu_get_watts_range_list(cpu);
cpu->energy->last_updated = surf_get_clock();
- XBT_DEBUG("CPU create: peak=%lf, pstate=%d",cpu->power_peak, cpu->pstate);
+ XBT_DEBUG("CPU create: peak=%f, pstate=%d",cpu->power_peak, cpu->pstate);
xbt_assert(cpu->power_peak > 0, "Power has to be >0");
cpu->power_scale = power_scale;
xbt_dynar_t cpu_get_watts_range_list(cpu_Cas01_t cpu_model)
{
- xbt_dynar_t power_range_list = xbt_dynar_new(sizeof(xbt_dynar_t), NULL);
+ xbt_dynar_t power_range_list;
xbt_dynar_t power_tuple;
int i = 0, pstate_nb=0;
xbt_dynar_t current_power_values;
if (all_power_values_str == NULL)
return NULL;
+
+ power_range_list = xbt_dynar_new(sizeof(xbt_dynar_t), NULL);
xbt_dynar_t all_power_values = xbt_str_split(all_power_values_str, ",");
pstate_nb = xbt_dynar_length(all_power_values);
xbt_dynar_push_as(power_tuple, double, max_power);
xbt_dynar_push_as(power_range_list, xbt_dynar_t, power_tuple);
+ xbt_dynar_free(¤t_power_values);
}
-
+ xbt_dynar_free(&all_power_values);
return power_range_list;
}
double current_power = min_power + cpu_load * power_slope;
- XBT_DEBUG("[get_current_watts] min_power=%lf, max_power=%lf, slope=%lf", min_power, max_power, power_slope);
- XBT_DEBUG("[get_current_watts] Current power (watts) = %lf, load = %lf", current_power, cpu_load);
+ XBT_DEBUG("[get_current_watts] min_power=%f, max_power=%f, slope=%f", min_power, max_power, power_slope);
+ XBT_DEBUG("[get_current_watts] Current power (watts) = %f, load = %f", current_power, cpu_load);
return current_power;
double start_time = cpu_model->energy->last_updated;
double finish_time = surf_get_clock();
- XBT_DEBUG("[cpu_update_energy] action time interval=(%lf-%lf), current power peak=%lf, current pstate=%d",
+ XBT_DEBUG("[cpu_update_energy] action time interval=(%f-%f), current power peak=%f, current pstate=%d",
start_time, finish_time, cpu_model->power_peak, cpu_model->pstate);
double current_energy = cpu_model->energy->total_energy;
double action_energy = cpu_get_current_watts_value(cpu_model, cpu_load)*(finish_time-start_time);
cpu_model->energy->total_energy = current_energy + action_energy;
cpu_model->energy->last_updated = finish_time;
- XBT_DEBUG("[cpu_update_energy] old_energy_value=%lf, action_energy_value=%lf", current_energy, action_energy);
+ XBT_DEBUG("[cpu_update_energy] old_energy_value=%f, action_energy_value=%f", current_energy, action_energy);
}