X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8308c42874c76edaffd662b81eaacc6ad87b36e4..1b30f00857843f1cee60814ed519ff82e8ef4787:/src/surf/cpu.c diff --git a/src/surf/cpu.c b/src/surf/cpu.c index ca63f90633..ce88542bf6 100644 --- a/src/surf/cpu.c +++ b/src/surf/cpu.c @@ -7,18 +7,15 @@ #include "surf_private.h" -typedef struct surf_action_cpu_Cas01 { - s_surf_action_t generic_action; - lmm_variable_t variable; - int suspended; -} s_surf_action_cpu_Cas01_t, *surf_action_cpu_Cas01_t; +typedef s_surf_action_lmm_t s_surf_action_cpu_Cas01_t, + *surf_action_cpu_Cas01_t; typedef struct cpu_Cas01 { s_surf_resource_t generic_resource; + double power_peak; double power_scale; - double power_current; tmgr_trace_event_t power_event; - e_surf_cpu_state_t state_current; + e_surf_resource_state_t state_current; tmgr_trace_event_t state_event; lmm_constraint_t constraint; } s_cpu_Cas01_t, *cpu_Cas01_t; @@ -32,12 +29,12 @@ surf_model_t surf_cpu_model = NULL; lmm_system_t cpu_maxmin_system = NULL; -static xbt_swag_t running_action_set_that_does_not_need_being_checked = NULL; +static xbt_swag_t cpu_running_action_set_that_does_not_need_being_checked = NULL; -static cpu_Cas01_t cpu_new(char *name, double power_scale, - double power_initial, +static cpu_Cas01_t cpu_new(char *name, double power_peak, + double power_scale, tmgr_trace_t power_trace, - e_surf_cpu_state_t state_initial, + e_surf_resource_state_t state_initial, tmgr_trace_t state_trace, xbt_dict_t cpu_properties) { @@ -46,10 +43,10 @@ static cpu_Cas01_t cpu_new(char *name, double power_scale, "Host '%s' declared several times in the platform file", name); cpu->generic_resource.model = surf_cpu_model; cpu->generic_resource.name = name; - current_property_set = cpu->generic_resource.properties = cpu_properties; + cpu->generic_resource.properties = cpu_properties; + cpu->power_peak = power_peak; + xbt_assert0(cpu->power_peak > 0, "Power has to be >0"); cpu->power_scale = power_scale; - xbt_assert0(cpu->power_scale > 0, "Power has to be >0"); - cpu->power_current = power_initial; if (power_trace) cpu->power_event = tmgr_history_add_trace(history, power_trace, 0.0, 0, cpu); @@ -61,9 +58,13 @@ static cpu_Cas01_t cpu_new(char *name, double power_scale, cpu->constraint = lmm_constraint_new(cpu_maxmin_system, cpu, - cpu->power_current * cpu->power_scale); + cpu->power_scale * cpu->power_peak); - xbt_dict_set(surf_model_resource_set(surf_cpu_model), name, cpu, surf_resource_free); + xbt_dict_set(surf_model_resource_set(surf_cpu_model), name, cpu, + surf_resource_free); +#ifdef HAVE_TRACING + TRACE_surf_cpu_new (name, cpu->power_scale * cpu->power_peak); +#endif return cpu; } @@ -71,27 +72,27 @@ static cpu_Cas01_t cpu_new(char *name, double power_scale, static void parse_cpu_init(void) { + double power_peak = 0.0; double power_scale = 0.0; - double power_initial = 0.0; tmgr_trace_t power_trace = NULL; - e_surf_cpu_state_t state_initial = SURF_CPU_OFF; + e_surf_resource_state_t state_initial = SURF_RESOURCE_OFF; tmgr_trace_t state_trace = NULL; - power_scale = get_cpu_power(A_surfxml_host_power); - surf_parse_get_double(&power_initial, A_surfxml_host_availability); - surf_parse_get_trace(&power_trace, A_surfxml_host_availability_file); + power_peak = get_cpu_power(A_surfxml_host_power); + surf_parse_get_double(&power_scale, A_surfxml_host_availability); + power_trace = tmgr_trace_new(A_surfxml_host_availability_file); xbt_assert0((A_surfxml_host_state == A_surfxml_host_state_ON) || (A_surfxml_host_state == A_surfxml_host_state_OFF), "Invalid state"); if (A_surfxml_host_state == A_surfxml_host_state_ON) - state_initial = SURF_CPU_ON; + state_initial = SURF_RESOURCE_ON; if (A_surfxml_host_state == A_surfxml_host_state_OFF) - state_initial = SURF_CPU_OFF; - surf_parse_get_trace(&state_trace, A_surfxml_host_state_file); + state_initial = SURF_RESOURCE_OFF; + state_trace = tmgr_trace_new(A_surfxml_host_state_file); current_property_set = xbt_dict_new(); - cpu_new(xbt_strdup(A_surfxml_host_id), power_scale, power_initial, + cpu_new(xbt_strdup(A_surfxml_host_id), power_peak, power_scale, power_trace, state_initial, state_trace, current_property_set); } @@ -130,19 +131,20 @@ static void add_traces_cpu(void) } } -static void define_callbacks(const char *file) +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); } -static int resource_used(void *resource_id) +static int cpu_resource_used(void *resource_id) { return lmm_constraint_used(cpu_maxmin_system, ((cpu_Cas01_t) resource_id)->constraint); } -static int action_unref(surf_action_t action) +static int cpu_action_unref(surf_action_t action) { action->refcount--; if (!action->refcount) { @@ -156,14 +158,14 @@ static int action_unref(surf_action_t action) return 0; } -static void action_cancel(surf_action_t action) +static void cpu_action_cancel(surf_action_t action) { surf_action_state_set(action, SURF_ACTION_FAILED); return; } static void cpu_action_state_set(surf_action_t action, - e_surf_action_state_t state) + e_surf_action_state_t state) { /* if((state==SURF_ACTION_DONE) || (state==SURF_ACTION_FAILED)) */ /* if(((surf_action_cpu_Cas01_t)action)->variable) { */ @@ -175,26 +177,30 @@ static void cpu_action_state_set(surf_action_t action, return; } -static double share_resources(double now) +static double cpu_share_resources(double now) { s_surf_action_cpu_Cas01_t action; - return generic_maxmin_share_resources(surf_cpu_model->states. - running_action_set, + return generic_maxmin_share_resources(surf_cpu_model-> + states.running_action_set, xbt_swag_offset(action, variable), cpu_maxmin_system, lmm_solve); } -static void update_actions_state(double now, double delta) +static void cpu_update_actions_state(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; - /* FIXME: UNUSED - xbt_swag_t failed_actions = - surf_cpu_model->states.failed_action_set; - */ xbt_swag_foreach_safe(action, next_action, running_actions) { +#ifdef HAVE_TRACING + TRACE_surf_update_action_state (action, action->generic_action.data, + lmm_variable_getvalue(action->variable), "PowerUsed", now-delta, delta); + cpu_Cas01_t x = lmm_constraint_id(lmm_get_cnst_from_var (cpu_maxmin_system, action->variable, 0)); + + TRACE_surf_update_action_state_cpu_resource (x->generic_resource.name, + action->generic_action.data, lmm_variable_getvalue(action->variable), now-delta, delta); +#endif double_update(&(action->generic_action.remains), lmm_variable_getvalue(action->variable) * delta); if (action->generic_action.max_duration != NO_MAX_DURATION) @@ -213,25 +219,30 @@ static void update_actions_state(double now, double delta) return; } -static void update_resource_state(void *id, +static void cpu_update_resource_state(void *id, tmgr_trace_event_t event_type, double value, double date) { cpu_Cas01_t cpu = id; if (event_type == cpu->power_event) { - cpu->power_current = value; + cpu->power_scale = value; lmm_update_constraint_bound(cpu_maxmin_system, cpu->constraint, - cpu->power_current * cpu->power_scale); + cpu->power_scale * cpu->power_peak); +#ifdef HAVE_TRACING + TRACE_surf_cpu_set_power (date, cpu->generic_resource.name, cpu->power_scale * cpu->power_peak); +#endif + if (tmgr_trace_event_free(event_type)) + cpu->power_event = NULL; } else if (event_type == cpu->state_event) { if (value > 0) - cpu->state_current = SURF_CPU_ON; + cpu->state_current = SURF_RESOURCE_ON; else { lmm_constraint_t cnst = cpu->constraint; lmm_variable_t var = NULL; lmm_element_t elem = NULL; - cpu->state_current = SURF_CPU_OFF; + cpu->state_current = SURF_RESOURCE_OFF; while ((var = lmm_get_var_from_cnst(cpu_maxmin_system, cnst, &elem))) { surf_action_t action = lmm_variable_id(var); @@ -244,6 +255,8 @@ static void update_resource_state(void *id, } } } + if (tmgr_trace_event_free(event_type)) + cpu->state_event = NULL; } else { CRITICAL0("Unknown event ! \n"); xbt_abort(); @@ -252,34 +265,19 @@ static void update_resource_state(void *id, return; } -static surf_action_t execute(void *cpu, double size) +static surf_action_t cpu_execute(void *cpu, double size) { surf_action_cpu_Cas01_t action = NULL; cpu_Cas01_t CPU = cpu; - XBT_IN2("(%s,%g)", CPU->generic_resource.name, size); - action = xbt_new0(s_surf_action_cpu_Cas01_t, 1); - - action->generic_action.refcount = 1; - action->generic_action.cost = size; - action->generic_action.remains = size; - action->generic_action.priority = 1.0; - action->generic_action.max_duration = NO_MAX_DURATION; - action->generic_action.start = surf_get_clock(); - action->generic_action.finish = -1.0; - action->generic_action.model_type = surf_cpu_model; + XBT_IN2("(%s,%g)", surf_resource_name(CPU), size); + action = + surf_action_new(sizeof(s_surf_action_cpu_Cas01_t), size, surf_cpu_model, + CPU->state_current != SURF_RESOURCE_ON); + action->suspended = 0; /* Should be useless because of the calloc but it seems to help valgrind... */ - if (CPU->state_current == SURF_CPU_ON) - action->generic_action.state_set = - surf_cpu_model->states.running_action_set; - else - action->generic_action.state_set = - surf_cpu_model->states.failed_action_set; - - xbt_swag_insert(action, action->generic_action.state_set); - action->variable = lmm_variable_new(cpu_maxmin_system, action, action->generic_action.priority, -1.0, 1); @@ -288,15 +286,15 @@ static surf_action_t execute(void *cpu, double size) return (surf_action_t) action; } -static surf_action_t action_sleep(void *cpu, double duration) +static surf_action_t cpu_action_sleep(void *cpu, double duration) { surf_action_cpu_Cas01_t action = NULL; if (duration > 0) duration = MAX(duration, MAXMIN_PRECISION); - XBT_IN2("(%s,%g)", ((cpu_Cas01_t) cpu)->generic_resource.name, duration); - action = (surf_action_cpu_Cas01_t) execute(cpu, 1.0); + XBT_IN2("(%s,%g)", surf_resource_name(cpu), duration); + action = (surf_action_cpu_Cas01_t) cpu_execute(cpu, 1.0); action->generic_action.max_duration = duration; action->suspended = 2; if (duration == NO_MAX_DURATION) { @@ -304,7 +302,7 @@ static surf_action_t action_sleep(void *cpu, double duration) is used to speed up update_resource_state */ xbt_swag_remove(action, ((surf_action_t) action)->state_set); ((surf_action_t) action)->state_set = - running_action_set_that_does_not_need_being_checked; + cpu_running_action_set_that_does_not_need_being_checked; xbt_swag_insert(action, ((surf_action_t) action)->state_set); } @@ -313,7 +311,7 @@ static surf_action_t action_sleep(void *cpu, double duration) return (surf_action_t) action; } -static void action_suspend(surf_action_t action) +static void cpu_action_suspend(surf_action_t action) { XBT_IN1("(%p)", action); if (((surf_action_cpu_Cas01_t) action)->suspended != 2) { @@ -325,7 +323,7 @@ static void action_suspend(surf_action_t action) XBT_OUT; } -static void action_resume(surf_action_t action) +static void cpu_action_resume(surf_action_t action) { XBT_IN1("(%p)", action); if (((surf_action_cpu_Cas01_t) action)->suspended != 2) { @@ -337,19 +335,19 @@ static void action_resume(surf_action_t action) XBT_OUT; } -static int action_is_suspended(surf_action_t action) +static int cpu_action_is_suspended(surf_action_t action) { return (((surf_action_cpu_Cas01_t) action)->suspended == 1); } -static void action_set_max_duration(surf_action_t action, double duration) +static void cpu_action_set_max_duration(surf_action_t action, double duration) { XBT_IN2("(%p,%g)", action, duration); action->max_duration = duration; XBT_OUT; } -static void action_set_priority(surf_action_t action, double priority) +static void cpu_action_set_priority(surf_action_t action, double priority) { XBT_IN2("(%p,%g)", action, priority); action->priority = priority; @@ -360,23 +358,30 @@ static void action_set_priority(surf_action_t action, double priority) XBT_OUT; } -static e_surf_cpu_state_t get_state(void *cpu) +static double cpu_action_get_remains(surf_action_t action) +{ + XBT_IN1("(%p)", action); + return action->remains; + XBT_OUT; +} + +static e_surf_resource_state_t cpu_get_state(void *cpu) { return ((cpu_Cas01_t) cpu)->state_current; } -static double get_speed(void *cpu, double load) +static double cpu_get_speed(void *cpu, double load) { - return load * (((cpu_Cas01_t) cpu)->power_scale); + return load * (((cpu_Cas01_t) cpu)->power_peak); } -static double get_available_speed(void *cpu) +static double cpu_get_available_speed(void *cpu) { /* number between 0 and 1 */ - return ((cpu_Cas01_t) cpu)->power_current; + return ((cpu_Cas01_t) cpu)->power_scale; } -static void finalize(void) +static void cpu_finalize(void) { lmm_system_free(cpu_maxmin_system); cpu_maxmin_system = NULL; @@ -384,8 +389,8 @@ static void finalize(void) surf_model_exit(surf_cpu_model); surf_cpu_model = NULL; - xbt_swag_free(running_action_set_that_does_not_need_being_checked); - running_action_set_that_does_not_need_being_checked = 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; } static void surf_cpu_model_init_internal(void) @@ -394,33 +399,35 @@ static void surf_cpu_model_init_internal(void) surf_cpu_model = surf_model_init(); - running_action_set_that_does_not_need_being_checked = + 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 = action_unref; - surf_cpu_model->action_cancel = action_cancel; + 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->model_private->resource_used = resource_used; - surf_cpu_model->model_private->share_resources = share_resources; - surf_cpu_model->model_private->update_actions_state = update_actions_state; + surf_cpu_model->model_private->resource_used = cpu_resource_used; + surf_cpu_model->model_private->share_resources = cpu_share_resources; + surf_cpu_model->model_private->update_actions_state = cpu_update_actions_state; surf_cpu_model->model_private->update_resource_state = - update_resource_state; - surf_cpu_model->model_private->finalize = finalize; + 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->get_remains = cpu_action_get_remains; - surf_cpu_model->suspend = action_suspend; - surf_cpu_model->resume = action_resume; - surf_cpu_model->is_suspended = action_is_suspended; - surf_cpu_model->set_max_duration = action_set_max_duration; - surf_cpu_model->set_priority = action_set_priority; - surf_cpu_model->extension.cpu.execute = execute; - surf_cpu_model->extension.cpu.sleep = action_sleep; + surf_cpu_model->extension.cpu.execute = cpu_execute; + surf_cpu_model->extension.cpu.sleep = cpu_action_sleep; - surf_cpu_model->extension.cpu.get_state = get_state; - surf_cpu_model->extension.cpu.get_speed = get_speed; - surf_cpu_model->extension.cpu.get_available_speed = get_available_speed; + surf_cpu_model->extension.cpu.get_state = cpu_get_state; + surf_cpu_model->extension.cpu.get_speed = cpu_get_speed; + surf_cpu_model->extension.cpu.get_available_speed = cpu_get_available_speed; if (!cpu_maxmin_system) cpu_maxmin_system = lmm_system_new(); @@ -446,6 +453,6 @@ void surf_cpu_model_init_Cas01(const char *filename) if (surf_cpu_model) return; surf_cpu_model_init_internal(); - define_callbacks(filename); + cpu_define_callbacks(filename); xbt_dynar_push(model_list, &surf_cpu_model); }