X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a067481f5e9782cf82ebc6c1487d58083ec2fbd5..f150764ab6d151957355c437ad66146210cbf8f9:/src/surf/cpu_cas01.c diff --git a/src/surf/cpu_cas01.c b/src/surf/cpu_cas01.c index c4f62db6d4..15cf9981c3 100644 --- a/src/surf/cpu_cas01.c +++ b/src/surf/cpu_cas01.c @@ -1,4 +1,4 @@ -/* 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 @@ -7,48 +7,38 @@ #include "surf_private.h" #include "surf/surf_resource.h" #include "maxmin_private.h" +#include "simgrid/sg_config.h" +#include "cpu_cas01_private.h" + +#include "string.h" +#include "stdlib.h" surf_model_t surf_cpu_model = NULL; -lmm_system_t cpu_maxmin_system = NULL; -e_UM_t cpu_update_mechanism = UM_UNDEFINED; -static int cpu_selective_update = 0; - -static xbt_swag_t cpu_modified_set= NULL; -static xbt_heap_t cpu_action_heap = NULL; - -#undef GENERIC_LMM_ACTION -#undef GENERIC_ACTION -#undef ACTION_GET_CPU -#define GENERIC_LMM_ACTION(action) action->generic_lmm_action -#define GENERIC_ACTION(action) GENERIC_LMM_ACTION(action).generic_action -#define ACTION_GET_CPU(action) ((surf_action_cpu_Cas01_t) action)->cpu - -typedef struct surf_action_cpu_cas01 { - s_surf_action_lmm_t generic_lmm_action; -} s_surf_action_cpu_Cas01_t, *surf_action_cpu_Cas01_t; - -typedef struct cpu_Cas01 { - s_surf_resource_t generic_resource; - s_xbt_swag_hookup_t modified_cpu_hookup; - double power_peak; - double power_scale; - tmgr_trace_event_t power_event; - int core; - e_surf_resource_state_t state_current; - tmgr_trace_event_t state_event; - lmm_constraint_t constraint; -} s_cpu_Cas01_t, *cpu_Cas01_t; + XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu, surf, "Logging specific to the SURF CPU IMPROVED module"); - - 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; +} -static void *cpu_create_resource(const char *name, double power_peak, +/* 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, + int pstate, double power_scale, tmgr_trace_t power_trace, int core, @@ -58,13 +48,23 @@ static void *cpu_create_resource(const char *name, double power_peak, { cpu_Cas01_t cpu = NULL; - xbt_assert(!surf_cpu_resource_by_name(name), + xbt_assert(!surf_cpu_resource_priv(surf_cpu_resource_by_name(name)), "Host '%s' declared several times in the platform file", name); cpu = (cpu_Cas01_t) surf_resource_new(sizeof(s_cpu_Cas01_t), surf_cpu_model, name, - cpu_properties); - cpu->power_peak = power_peak; + 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 = xbt_new(s_energy_cpu_cas01_t, 1); + cpu->energy->total_energy = 0; + cpu->energy->power_range_watts_list = cpu_get_watts_range_list(cpu); + cpu->energy->last_updated = surf_get_clock(); + + 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; cpu->core = core; @@ -80,12 +80,12 @@ static void *cpu_create_resource(const char *name, double power_peak, tmgr_history_add_trace(history, state_trace, 0.0, 0, cpu); cpu->constraint = - lmm_constraint_new(cpu_maxmin_system, cpu, + lmm_constraint_new(surf_cpu_model->model_private->maxmin_system, cpu, cpu->core * cpu->power_scale * cpu->power_peak); xbt_lib_set(host_lib, name, SURF_CPU_LEVEL, cpu); - return cpu; + return xbt_lib_get_elm_or_null(host_lib, name);; } @@ -93,6 +93,7 @@ static void parse_cpu_init(sg_platf_host_cbarg_t host) { cpu_create_resource(host->id, host->power_peak, + host->pstate, host->power_scale, host->power_trace, host->core_amount, @@ -141,269 +142,138 @@ static void cpu_define_callbacks() static int cpu_resource_used(void *resource) { - return lmm_constraint_used(cpu_maxmin_system, + return lmm_constraint_used(surf_cpu_model->model_private->maxmin_system, ((cpu_Cas01_t) resource)->constraint); } -static int cpu_action_unref(surf_action_t action) +static double cpu_share_resources_lazy(double now) { - action->refcount--; - if (!action->refcount) { - xbt_swag_remove(action, action->state_set); - if (((surf_action_lmm_t) action)->variable) - lmm_variable_free(cpu_maxmin_system, - ((surf_action_lmm_t) action)->variable); - if (cpu_update_mechanism == UM_LAZY) { - /* remove from heap */ - surf_action_lmm_heap_remove(cpu_action_heap,(surf_action_lmm_t)action); - xbt_swag_remove(action, cpu_modified_set); - } -#ifdef HAVE_TRACING - xbt_free(action->category); -#endif - surf_action_free(&action); - return 1; - } - return 0; + return generic_share_resources_lazy(now, surf_cpu_model); } -static void cpu_action_cancel(surf_action_t action) +static double cpu_share_resources_full(double now) { - surf_action_state_set(action, SURF_ACTION_FAILED); - if (cpu_update_mechanism == UM_LAZY) { - xbt_swag_remove(action, cpu_modified_set); - surf_action_lmm_heap_remove(cpu_action_heap,(surf_action_lmm_t)action); - } - return; + s_surf_action_cpu_Cas01_t action; + return generic_maxmin_share_resources(surf_cpu_model->states. + running_action_set, + xbt_swag_offset(action, + generic_lmm_action. + variable), + surf_cpu_model->model_private->maxmin_system, lmm_solve); } -static void cpu_action_state_set(surf_action_t action, - e_surf_action_state_t state) +static void cpu_update_actions_state_lazy(double now, double delta) { -/* if((state==SURF_ACTION_DONE) || (state==SURF_ACTION_FAILED)) */ -/* if(((surf_action_lmm_t)action)->variable) { */ -/* lmm_variable_disable(cpu_maxmin_system, ((surf_action_lmm_t)action)->variable); */ -/* ((surf_action_lmm_t)action)->variable = NULL; */ -/* } */ + generic_update_actions_state_lazy(now, delta, surf_cpu_model); +} - surf_action_state_set(action, state); - return; +static void cpu_update_actions_state_full(double now, double delta) +{ + generic_update_actions_state_full(now, delta, surf_cpu_model); } -static void cpu_update_action_remaining_lazy(double now) +xbt_dynar_t cpu_get_watts_range_list(cpu_Cas01_t cpu_model) { - surf_action_cpu_Cas01_t action; - double delta = 0.0; + xbt_dynar_t power_range_list; + xbt_dynar_t power_tuple; + int i = 0, pstate_nb=0; + xbt_dynar_t current_power_values; + double min_power, max_power; + xbt_dict_t props = cpu_model->generic_resource.properties; - xbt_swag_foreach(action, cpu_modified_set) { - if (GENERIC_ACTION(action).state_set != - surf_cpu_model->states.running_action_set) - continue; // FIXME useless ???? + if (props == NULL) + return NULL; - /* bogus priority, skip it */ - if (GENERIC_ACTION(action).priority <= 0) - continue; + char* all_power_values_str = xbt_dict_get_or_null(props, "power_per_state"); - delta = now - GENERIC_LMM_ACTION(action).last_update; - if (GENERIC_ACTION(action).remains > 0) { + if (all_power_values_str == NULL) + return NULL; - double_update(&(GENERIC_ACTION(action).remains), - lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable) * delta); -#ifdef HAVE_TRACING - if (TRACE_is_enabled()) { - cpu_Cas01_t cpu = - lmm_constraint_id(lmm_get_cnst_from_var - (cpu_maxmin_system, - GENERIC_LMM_ACTION(action).variable, 0)); - TRACE_surf_host_set_utilization(cpu->generic_resource.name, - ((surf_action_t)action)->category, - lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable), - GENERIC_LMM_ACTION(action).last_update, - now - GENERIC_LMM_ACTION(action).last_update); - } -#endif - XBT_DEBUG("Update action(%p) remains %lf", action, - GENERIC_ACTION(action).remains); - } - GENERIC_LMM_ACTION(action).last_update = now; - } + 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); + for (i=0; i< pstate_nb; i++) + { + /* retrieve the power values associated with the current pstate */ + current_power_values = xbt_str_split(xbt_dynar_get_as(all_power_values, i, char*), ":"); + xbt_assert(xbt_dynar_length(current_power_values) > 1, + "Power properties incorrectly defined - could not retrieve min and max power values for host %s", + cpu_model->generic_resource.name); -static double cpu_share_resources_lazy(double now) -{ - surf_action_cpu_Cas01_t action = NULL; - double min = -1; - double value; + /* min_power corresponds to the idle power (cpu load = 0) */ + /* max_power is the power consumed at 100% cpu load */ + min_power = atof(xbt_dynar_get_as(current_power_values, 0, char*)); + max_power = atof(xbt_dynar_get_as(current_power_values, 1, char*)); - XBT_DEBUG - ("Before share resources, the size of modified actions set is %d", - xbt_swag_size(cpu_modified_set)); - cpu_update_action_remaining_lazy(now); + power_tuple = xbt_dynar_new(sizeof(double), NULL); + xbt_dynar_push_as(power_tuple, double, min_power); + xbt_dynar_push_as(power_tuple, double, max_power); - lmm_solve(cpu_maxmin_system); + 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; - XBT_DEBUG - ("After share resources, The size of modified actions set is %d", - xbt_swag_size(cpu_modified_set)); +} - xbt_swag_foreach(action, cpu_modified_set) { - int max_dur_flag = 0; +/** + * Computes the power consumed by the host according to the current pstate and processor load + * + */ +static double cpu_get_current_watts_value(cpu_Cas01_t cpu_model, double cpu_load) +{ + xbt_dynar_t power_range_list = cpu_model->energy->power_range_watts_list; - if (GENERIC_ACTION(action).state_set != - surf_cpu_model->states.running_action_set) - continue; + if (power_range_list == NULL) + { + XBT_DEBUG("No power range properties specified for host %s", cpu_model->generic_resource.name); + return 0; + } + xbt_assert(xbt_dynar_length(power_range_list) == xbt_dynar_length(cpu_model->power_peak_list), + "The number of power ranges in the properties does not match the number of pstates for host %s", + cpu_model->generic_resource.name); - /* bogus priority, skip it */ - if (GENERIC_ACTION(action).priority <= 0) - continue; + /* retrieve the power values associated with the current pstate */ + xbt_dynar_t current_power_values = xbt_dynar_get_as(power_range_list, cpu_model->pstate, xbt_dynar_t); - min = -1; - value = lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable); - if (value > 0) { - if (GENERIC_ACTION(action).remains > 0) { - value = GENERIC_ACTION(action).remains / value; - min = now + value; - } else { - value = 0.0; - min = now; - } - } + /* min_power corresponds to the idle power (cpu load = 0) */ + /* max_power is the power consumed at 100% cpu load */ + double min_power = xbt_dynar_get_as(current_power_values, 0, double); + double max_power = xbt_dynar_get_as(current_power_values, 1, double); + double power_slope = max_power - min_power; - if ((GENERIC_ACTION(action).max_duration != NO_MAX_DURATION) - && (min == -1 - || GENERIC_ACTION(action).start + - GENERIC_ACTION(action).max_duration < min)) { - min = GENERIC_ACTION(action).start + - GENERIC_ACTION(action).max_duration; - max_dur_flag = 1; - } + double current_power = min_power + cpu_load * power_slope; - XBT_DEBUG("Action(%p) Start %lf Finish %lf Max_duration %lf", action, - GENERIC_ACTION(action).start, now + value, - GENERIC_ACTION(action).max_duration); + 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); - if (min != -1) { - surf_action_lmm_heap_remove(cpu_action_heap,(surf_action_lmm_t)action); - surf_action_lmm_heap_insert(cpu_action_heap,(surf_action_lmm_t)action, min, max_dur_flag ? MAX_DURATION : NORMAL); - XBT_DEBUG("Insert at heap action(%p) min %lf now %lf", action, min, - now); - } else DIE_IMPOSSIBLE; - } - - //hereafter must have already the min value for this resource model - if (xbt_heap_size(cpu_action_heap) > 0) - min = xbt_heap_maxkey(cpu_action_heap) - now; - else - min = -1; + return current_power; - XBT_DEBUG("The minimum with the HEAP %lf", min); - - return min; } -static double cpu_share_resources_full(double now) +/** + * Updates the total energy consumed as the sum of the current energy and + * the energy consumed by the current action + */ +void cpu_update_energy(cpu_Cas01_t cpu_model, double cpu_load) { - s_surf_action_cpu_Cas01_t action; - return generic_maxmin_share_resources(surf_cpu_model->states. - running_action_set, - xbt_swag_offset(action, - generic_lmm_action. - variable), - cpu_maxmin_system, lmm_solve); -} -static void cpu_update_actions_state_lazy(double now, double delta) -{ - surf_action_cpu_Cas01_t action; - while ((xbt_heap_size(cpu_action_heap) > 0) - && (double_equals(xbt_heap_maxkey(cpu_action_heap), now))) { - action = xbt_heap_pop(cpu_action_heap); - XBT_DEBUG("Action %p: finish", action); - GENERIC_ACTION(action).finish = surf_get_clock(); -#ifdef HAVE_TRACING - if (TRACE_is_enabled()) { - cpu_Cas01_t cpu = - lmm_constraint_id(lmm_get_cnst_from_var - (cpu_maxmin_system, - GENERIC_LMM_ACTION(action).variable, 0)); - TRACE_surf_host_set_utilization(cpu->generic_resource.name, - ((surf_action_t)action)->category, - lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable), - GENERIC_LMM_ACTION(action).last_update, - now - GENERIC_LMM_ACTION(action).last_update); - } -#endif - /* set the remains to 0 due to precision problems when updating the remaining amount */ - GENERIC_ACTION(action).remains = 0; - cpu_action_state_set((surf_action_t) action, SURF_ACTION_DONE); - surf_action_lmm_heap_remove(cpu_action_heap,(surf_action_lmm_t)action); - } -#ifdef HAVE_TRACING - if (TRACE_is_enabled()) { - //defining the last timestamp that we can safely dump to trace file - //without losing the event ascending order (considering all CPU's) - double smaller = -1; - xbt_swag_t running_actions = surf_cpu_model->states.running_action_set; - xbt_swag_foreach(action, running_actions) { - if (smaller < 0) { - smaller = GENERIC_LMM_ACTION(action).last_update; - continue; - } - if (GENERIC_LMM_ACTION(action).last_update < smaller) { - smaller = GENERIC_LMM_ACTION(action).last_update; - } - } - if (smaller > 0) { - TRACE_last_timestamp_to_dump = smaller; - } - } -#endif - return; -} + double start_time = cpu_model->energy->last_updated; + double finish_time = surf_get_clock(); -static void cpu_update_actions_state_full(double now, double delta) -{ - surf_action_cpu_Cas01_t action = NULL; - surf_action_cpu_Cas01_t next_action = NULL; - xbt_swag_t running_actions = surf_cpu_model->states.running_action_set; - xbt_swag_foreach_safe(action, next_action, running_actions) { -#ifdef HAVE_TRACING - if (TRACE_is_enabled()) { - cpu_Cas01_t x = - lmm_constraint_id(lmm_get_cnst_from_var - (cpu_maxmin_system, - GENERIC_LMM_ACTION(action).variable, 0)); - - TRACE_surf_host_set_utilization(x->generic_resource.name, - ((surf_action_t)action)->category, - lmm_variable_getvalue(GENERIC_LMM_ACTION(action). - variable), - now - delta, - delta); - TRACE_last_timestamp_to_dump = now - delta; - } -#endif - double_update(&(GENERIC_ACTION(action).remains), - lmm_variable_getvalue(GENERIC_LMM_ACTION(action). - variable) * delta); - if (GENERIC_LMM_ACTION(action).generic_action.max_duration != - NO_MAX_DURATION) - double_update(&(GENERIC_ACTION(action).max_duration), delta); - if ((GENERIC_ACTION(action).remains <= 0) && - (lmm_get_variable_weight(GENERIC_LMM_ACTION(action).variable) > - 0)) { - GENERIC_ACTION(action).finish = surf_get_clock(); - cpu_action_state_set((surf_action_t) action, SURF_ACTION_DONE); - } else if ((GENERIC_ACTION(action).max_duration != NO_MAX_DURATION) && - (GENERIC_ACTION(action).max_duration <= 0)) { - GENERIC_ACTION(action).finish = surf_get_clock(); - cpu_action_state_set((surf_action_t) action, SURF_ACTION_DONE); - } - } + 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=%f, action_energy_value=%f", current_energy, action_energy); - return; } static void cpu_update_resource_state(void *id, @@ -416,7 +286,7 @@ static void cpu_update_resource_state(void *id, if (event_type == cpu->power_event) { cpu->power_scale = value; - lmm_update_constraint_bound(cpu_maxmin_system, cpu->constraint, + lmm_update_constraint_bound(surf_cpu_model->model_private->maxmin_system, cpu->constraint, cpu->core * cpu->power_scale * cpu->power_peak); #ifdef HAVE_TRACING @@ -425,23 +295,25 @@ static void cpu_update_resource_state(void *id, cpu->power_peak); #endif while ((var = lmm_get_var_from_cnst - (cpu_maxmin_system, cpu->constraint, &elem))) { + (surf_cpu_model->model_private->maxmin_system, cpu->constraint, &elem))) { surf_action_cpu_Cas01_t action = lmm_variable_id(var); - lmm_update_variable_bound(cpu_maxmin_system, + lmm_update_variable_bound(surf_cpu_model->model_private->maxmin_system, GENERIC_LMM_ACTION(action).variable, cpu->power_scale * cpu->power_peak); } if (tmgr_trace_event_free(event_type)) cpu->power_event = NULL; } else if (event_type == cpu->state_event) { - if (value > 0) + if (value > 0) { + if(cpu->state_current == SURF_RESOURCE_OFF) + xbt_dynar_push_as(host_that_restart, char*, (cpu->generic_resource.name)); cpu->state_current = SURF_RESOURCE_ON; - else { + } else { lmm_constraint_t cnst = cpu->constraint; cpu->state_current = SURF_RESOURCE_OFF; - while ((var = lmm_get_var_from_cnst(cpu_maxmin_system, cnst, &elem))) { + while ((var = lmm_get_var_from_cnst(surf_cpu_model->model_private->maxmin_system, cnst, &elem))) { surf_action_t action = lmm_variable_id(var); if (surf_action_state_get(action) == SURF_ACTION_RUNNING || @@ -449,7 +321,7 @@ static void cpu_update_resource_state(void *id, surf_action_state_get(action) == SURF_ACTION_NOT_IN_THE_SYSTEM) { action->finish = date; - cpu_action_state_set(action, SURF_ACTION_FAILED); + surf_action_state_set(action, SURF_ACTION_FAILED); } } } @@ -466,7 +338,9 @@ static void cpu_update_resource_state(void *id, static surf_action_t cpu_execute(void *cpu, double size) { surf_action_cpu_Cas01_t action = NULL; - cpu_Cas01_t CPU = cpu; + //xbt_dict_cursor_t cursor = NULL; + cpu_Cas01_t CPU = surf_cpu_resource_priv(cpu); + //xbt_dict_t props = CPU->generic_resource.properties; XBT_IN("(%s,%g)", surf_resource_name(CPU), size); action = @@ -478,14 +352,16 @@ static surf_action_t cpu_execute(void *cpu, double size) calloc but it seems to help valgrind... */ GENERIC_LMM_ACTION(action).variable = - lmm_variable_new(cpu_maxmin_system, action, + lmm_variable_new(surf_cpu_model->model_private->maxmin_system, action, GENERIC_ACTION(action).priority, CPU->power_scale * CPU->power_peak, 1); - if (cpu_update_mechanism == UM_LAZY) { + if (surf_cpu_model->model_private->update_mechanism == UM_LAZY) { GENERIC_LMM_ACTION(action).index_heap = -1; GENERIC_LMM_ACTION(action).last_update = surf_get_clock(); + GENERIC_LMM_ACTION(action).last_value = 0.0; } - lmm_expand(cpu_maxmin_system, CPU->constraint, + + lmm_expand(surf_cpu_model->model_private->maxmin_system, CPU->constraint, GENERIC_LMM_ACTION(action).variable, 1.0); XBT_OUT(); return (surf_action_t) action; @@ -498,8 +374,9 @@ static surf_action_t cpu_action_sleep(void *cpu, double duration) if (duration > 0) duration = MAX(duration, MAXMIN_PRECISION); - XBT_IN("(%s,%g)", surf_resource_name(cpu), duration); + XBT_IN("(%s,%g)", surf_resource_name(surf_cpu_resource_priv(cpu)), duration); action = (surf_action_cpu_Cas01_t) cpu_execute(cpu, 1.0); + // FIXME: sleep variables should not consume 1.0 in lmm_expand GENERIC_ACTION(action).max_duration = duration; GENERIC_LMM_ACTION(action).suspended = 2; if (duration == NO_MAX_DURATION) { @@ -511,127 +388,90 @@ static surf_action_t cpu_action_sleep(void *cpu, double duration) xbt_swag_insert(action, ((surf_action_t) action)->state_set); } - lmm_update_variable_weight(cpu_maxmin_system, + lmm_update_variable_weight(surf_cpu_model->model_private->maxmin_system, GENERIC_LMM_ACTION(action).variable, 0.0); - if (cpu_update_mechanism == UM_LAZY) { // remove action from the heap - surf_action_lmm_heap_remove(cpu_action_heap,(surf_action_lmm_t)action); + if (surf_cpu_model->model_private->update_mechanism == UM_LAZY) { // remove action from the heap + surf_action_lmm_heap_remove(surf_cpu_model->model_private->action_heap,(surf_action_lmm_t)action); // this is necessary for a variable with weight 0 since such // variables are ignored in lmm and we need to set its max_duration // correctly at the next call to share_resources - xbt_swag_insert_at_head(action,cpu_modified_set); + xbt_swag_insert_at_head(action,surf_cpu_model->model_private->modified_set); } XBT_OUT(); return (surf_action_t) action; } -static void cpu_action_suspend(surf_action_t action) +static e_surf_resource_state_t cpu_get_state(void *cpu) { - XBT_IN("(%p)", action); - if (((surf_action_lmm_t) action)->suspended != 2) { - lmm_update_variable_weight(cpu_maxmin_system, - ((surf_action_lmm_t) action)->variable, - 0.0); - ((surf_action_lmm_t) action)->suspended = 1; - if (cpu_update_mechanism == UM_LAZY) - surf_action_lmm_heap_remove(cpu_action_heap,(surf_action_lmm_t)action); - } - XBT_OUT(); + return ((cpu_Cas01_t)surf_cpu_resource_priv(cpu))->state_current; } -static void cpu_action_resume(surf_action_t action) +static double cpu_get_speed(void *cpu, double load) { - - XBT_IN("(%p)", action); - if (((surf_action_lmm_t) action)->suspended != 2) { - lmm_update_variable_weight(cpu_maxmin_system, - ((surf_action_lmm_t) action)->variable, - action->priority); - ((surf_action_lmm_t) action)->suspended = 0; - if (cpu_update_mechanism == UM_LAZY) - surf_action_lmm_heap_remove(cpu_action_heap,(surf_action_lmm_t)action); - } - XBT_OUT(); + return load * ((cpu_Cas01_t)surf_cpu_resource_priv(cpu))->power_peak; } -static int cpu_action_is_suspended(surf_action_t action) +static int cpu_get_core(void *cpu) { - return (((surf_action_lmm_t) action)->suspended == 1); + return ((cpu_Cas01_t)surf_cpu_resource_priv(cpu))->core; } -static void cpu_action_set_max_duration(surf_action_t action, - double duration) -{ - XBT_IN("(%p,%g)", action, duration); - - action->max_duration = duration; - if (cpu_update_mechanism == UM_LAZY) - surf_action_lmm_heap_remove(cpu_action_heap,(surf_action_lmm_t)action); - XBT_OUT(); -} -static void cpu_action_set_priority(surf_action_t action, double priority) +static double cpu_get_available_speed(void *cpu) { - XBT_IN("(%p,%g)", action, priority); - action->priority = priority; - lmm_update_variable_weight(cpu_maxmin_system, - ((surf_action_lmm_t) action)->variable, - priority); - - if (cpu_update_mechanism == UM_LAZY) - surf_action_lmm_heap_remove(cpu_action_heap,(surf_action_lmm_t)action); - XBT_OUT(); + /* number between 0 and 1 */ + return ((cpu_Cas01_t)surf_cpu_resource_priv(cpu))->power_scale; } -#ifdef HAVE_TRACING -static void cpu_action_set_category(surf_action_t action, - const char *category) +static double cpu_get_current_power_peak(void *cpu) { - XBT_IN("(%p,%s)", action, category); - action->category = xbt_strdup(category); - XBT_OUT(); + return ((cpu_Cas01_t)surf_cpu_resource_priv(cpu))->power_peak; } -#endif -static double cpu_action_get_remains(surf_action_t action) +static double cpu_get_power_peak_at(void *cpu, int pstate_index) { - XBT_IN("(%p)", action); - /* update remains before return it */ - if (cpu_update_mechanism == UM_LAZY) - cpu_update_action_remaining_lazy(surf_get_clock()); - XBT_OUT(); - return action->remains; + xbt_dynar_t plist = ((cpu_Cas01_t)surf_cpu_resource_priv(cpu))->power_peak_list; + xbt_assert((pstate_index <= xbt_dynar_length(plist)), "Invalid parameters (pstate index out of bounds)"); + + return xbt_dynar_get_as(plist, pstate_index, double); } -static e_surf_resource_state_t cpu_get_state(void *cpu) +static int cpu_get_nb_pstates(void *cpu) { - return ((cpu_Cas01_t) cpu)->state_current; + return xbt_dynar_length(((cpu_Cas01_t)surf_cpu_resource_priv(cpu))->power_peak_list); } -static double cpu_get_speed(void *cpu, double load) +static void cpu_set_power_peak_at(void *cpu, int pstate_index) { - return load * (((cpu_Cas01_t) cpu)->power_peak); + cpu_Cas01_t cpu_implem = (cpu_Cas01_t)surf_cpu_resource_priv(cpu); + xbt_dynar_t plist = cpu_implem->power_peak_list; + xbt_assert((pstate_index <= xbt_dynar_length(plist)), "Invalid parameters (pstate index out of bounds)"); + + double new_power_peak = xbt_dynar_get_as(plist, pstate_index, double); + cpu_implem->pstate = pstate_index; + cpu_implem->power_peak = new_power_peak; } -static double cpu_get_available_speed(void *cpu) +static double cpu_get_consumed_energy(void *cpu) { - /* number between 0 and 1 */ - return ((cpu_Cas01_t) cpu)->power_scale; + return ((cpu_Cas01_t)surf_cpu_resource_priv(cpu))->energy->total_energy; } static void cpu_finalize(void) { - lmm_system_free(cpu_maxmin_system); - cpu_maxmin_system = NULL; + lmm_system_free(surf_cpu_model->model_private->maxmin_system); + surf_cpu_model->model_private->maxmin_system = NULL; + + if (surf_cpu_model->model_private->action_heap) + xbt_heap_free(surf_cpu_model->model_private->action_heap); + xbt_swag_free(surf_cpu_model->model_private->modified_set); surf_model_exit(surf_cpu_model); surf_cpu_model = NULL; xbt_swag_free(cpu_running_action_set_that_does_not_need_being_checked); cpu_running_action_set_that_does_not_need_being_checked = NULL; - if (cpu_action_heap) - xbt_heap_free(cpu_action_heap); - xbt_swag_free(cpu_modified_set); } static void surf_cpu_model_init_internal() @@ -639,66 +479,91 @@ static void surf_cpu_model_init_internal() s_surf_action_t action; s_surf_action_cpu_Cas01_t comp; + char *optim = xbt_cfg_get_string(_sg_cfg_set, "cpu/optim"); + int select = + xbt_cfg_get_boolean(_sg_cfg_set, "cpu/maxmin_selective_update"); + surf_cpu_model = surf_model_init(); + if (!strcmp(optim, "Full")) { + surf_cpu_model->model_private->update_mechanism = UM_FULL; + surf_cpu_model->model_private->selective_update = select; + } else if (!strcmp(optim, "Lazy")) { + surf_cpu_model->model_private->update_mechanism = UM_LAZY; + surf_cpu_model->model_private->selective_update = 1; + xbt_assert((select == 1) + || + (xbt_cfg_is_default_value + (_sg_cfg_set, "cpu/maxmin_selective_update")), + "Disabling selective update while using the lazy update mechanism is dumb!"); + } else { + xbt_die("Unsupported optimization (%s) for this model", optim); + } + cpu_running_action_set_that_does_not_need_being_checked = xbt_swag_new(xbt_swag_offset(action, state_hookup)); surf_cpu_model->name = "cpu"; - surf_cpu_model->action_unref = cpu_action_unref; - surf_cpu_model->action_cancel = cpu_action_cancel; - surf_cpu_model->action_state_set = cpu_action_state_set; + surf_cpu_model->action_unref = surf_action_unref; + surf_cpu_model->action_cancel = surf_action_cancel; + surf_cpu_model->action_state_set = surf_action_state_set; surf_cpu_model->model_private->resource_used = cpu_resource_used; - if (cpu_update_mechanism == UM_LAZY) { + if (surf_cpu_model->model_private->update_mechanism == UM_LAZY) { surf_cpu_model->model_private->share_resources = cpu_share_resources_lazy; surf_cpu_model->model_private->update_actions_state = cpu_update_actions_state_lazy; - } else if (cpu_update_mechanism == UM_FULL) { + } else if (surf_cpu_model->model_private->update_mechanism == UM_FULL) { surf_cpu_model->model_private->share_resources = cpu_share_resources_full; surf_cpu_model->model_private->update_actions_state = cpu_update_actions_state_full; } else - xbt_die("Invalid update mechanism!"); + xbt_die("Invalid cpu update mechanism!"); surf_cpu_model->model_private->update_resource_state = cpu_update_resource_state; surf_cpu_model->model_private->finalize = cpu_finalize; - surf_cpu_model->suspend = cpu_action_suspend; - surf_cpu_model->resume = cpu_action_resume; - surf_cpu_model->is_suspended = cpu_action_is_suspended; - surf_cpu_model->set_max_duration = cpu_action_set_max_duration; - surf_cpu_model->set_priority = cpu_action_set_priority; + surf_cpu_model->suspend = surf_action_suspend; + surf_cpu_model->resume = surf_action_resume; + surf_cpu_model->is_suspended = surf_action_is_suspended; + surf_cpu_model->set_max_duration = surf_action_set_max_duration; + surf_cpu_model->set_priority = surf_action_set_priority; #ifdef HAVE_TRACING - surf_cpu_model->set_category = cpu_action_set_category; + surf_cpu_model->set_category = surf_action_set_category; #endif - surf_cpu_model->get_remains = cpu_action_get_remains; + surf_cpu_model->get_remains = surf_action_get_remains; surf_cpu_model->extension.cpu.execute = cpu_execute; surf_cpu_model->extension.cpu.sleep = cpu_action_sleep; surf_cpu_model->extension.cpu.get_state = cpu_get_state; + surf_cpu_model->extension.cpu.get_core = cpu_get_core; surf_cpu_model->extension.cpu.get_speed = cpu_get_speed; surf_cpu_model->extension.cpu.get_available_speed = cpu_get_available_speed; - surf_cpu_model->extension.cpu.create_resource = cpu_create_resource; + surf_cpu_model->extension.cpu.get_current_power_peak = cpu_get_current_power_peak; + surf_cpu_model->extension.cpu.get_power_peak_at = cpu_get_power_peak_at; + surf_cpu_model->extension.cpu.get_nb_pstates = cpu_get_nb_pstates; + surf_cpu_model->extension.cpu.set_power_peak_at = cpu_set_power_peak_at; + surf_cpu_model->extension.cpu.get_consumed_energy = cpu_get_consumed_energy; + surf_cpu_model->extension.cpu.add_traces = cpu_add_traces_cpu; - if (!cpu_maxmin_system) { - cpu_maxmin_system = lmm_system_new(cpu_selective_update); + if (!surf_cpu_model->model_private->maxmin_system) { + surf_cpu_model->model_private->maxmin_system = lmm_system_new(surf_cpu_model->model_private->selective_update); } - if (cpu_update_mechanism == UM_LAZY) { - cpu_action_heap = xbt_heap_new(8, NULL); - xbt_heap_set_update_callback(cpu_action_heap, + if (surf_cpu_model->model_private->update_mechanism == UM_LAZY) { + surf_cpu_model->model_private->action_heap = xbt_heap_new(8, NULL); + xbt_heap_set_update_callback(surf_cpu_model->model_private->action_heap, surf_action_lmm_update_index_heap); - cpu_modified_set = + surf_cpu_model->model_private->modified_set = xbt_swag_new(xbt_swag_offset(comp, generic_lmm_action.action_list_hookup)); - cpu_maxmin_system->keep_track = cpu_modified_set; + surf_cpu_model->model_private->maxmin_system->keep_track = surf_cpu_model->model_private->modified_set; } } @@ -720,30 +585,16 @@ static void surf_cpu_model_init_internal() void surf_cpu_model_init_Cas01() { - char *optim = xbt_cfg_get_string(_surf_cfg_set, "cpu/optim"); - int select = - xbt_cfg_get_int(_surf_cfg_set, "cpu/maxmin_selective_update"); + char *optim = xbt_cfg_get_string(_sg_cfg_set, "cpu/optim"); - if (!strcmp(optim, "Full")) { - cpu_update_mechanism = UM_FULL; - cpu_selective_update = select; - } else if (!strcmp(optim, "Lazy")) { - cpu_update_mechanism = UM_LAZY; - cpu_selective_update = 1; - xbt_assert((select == 1) - || - (xbt_cfg_is_default_value - (_surf_cfg_set, "cpu/maxmin_selective_update")), - "Disabling selective update while using the lazy update mechanism is dumb!"); - } else if (!strcmp(optim, "TI")) { + if (surf_cpu_model) + return; + + if (!strcmp(optim, "TI")) { surf_cpu_model_init_ti(); return; - } else { - xbt_die("Unsupported optimization (%s) for this model", optim); } - if (surf_cpu_model) - return; surf_cpu_model_init_internal(); cpu_define_callbacks(); xbt_dynar_push(model_list, &surf_cpu_model);