X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0f5e8daaa6e9f74521068aa75837200bcd182ea6..485a5ec02aa2f8c667ab99f1d556e1851a99cc07:/src/surf/cpu.c diff --git a/src/surf/cpu.c b/src/surf/cpu.c index 7feee6f9cd..dc1165f80e 100644 --- a/src/surf/cpu.c +++ b/src/surf/cpu.c @@ -13,6 +13,7 @@ typedef struct cpu_Cas01 { s_surf_resource_t generic_resource; double power_peak; double power_scale; + int core; tmgr_trace_event_t power_event; e_surf_resource_state_t state_current; tmgr_trace_event_t state_event; @@ -34,6 +35,7 @@ static xbt_swag_t cpu_running_action_set_that_does_not_need_being_checked = static cpu_Cas01_t cpu_new(char *name, double power_peak, double power_scale, tmgr_trace_t power_trace, + int core, e_surf_resource_state_t state_initial, tmgr_trace_t state_trace, xbt_dict_t cpu_properties) @@ -48,6 +50,8 @@ static cpu_Cas01_t cpu_new(char *name, double power_peak, cpu->power_peak = power_peak; xbt_assert0(cpu->power_peak > 0, "Power has to be >0"); cpu->power_scale = power_scale; + cpu->core = core; + xbt_assert1(core>0,"Invalid number of cores %d",core); if (power_trace) cpu->power_event = tmgr_history_add_trace(history, power_trace, 0.0, 0, cpu); @@ -59,13 +63,10 @@ static cpu_Cas01_t cpu_new(char *name, double power_peak, cpu->constraint = lmm_constraint_new(cpu_maxmin_system, cpu, - cpu->power_scale * cpu->power_peak); + cpu->core * cpu->power_scale * cpu->power_peak); xbt_dict_set(surf_model_resource_set(surf_cpu_model), name, cpu, surf_resource_free); -#ifdef HAVE_TRACING - TRACE_surf_host_declaration(name, cpu->power_scale * cpu->power_peak); -#endif return cpu; } @@ -75,6 +76,7 @@ static void parse_cpu_init(void) { double power_peak = 0.0; double power_scale = 0.0; + int core = 0; tmgr_trace_t power_trace = NULL; e_surf_resource_state_t state_initial = SURF_RESOURCE_OFF; tmgr_trace_t state_trace = NULL; @@ -82,6 +84,7 @@ static void parse_cpu_init(void) 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); + surf_parse_get_int(&core, A_surfxml_host_core); xbt_assert0((A_surfxml_host_state == A_surfxml_host_state_ON) || (A_surfxml_host_state == A_surfxml_host_state_OFF), @@ -94,7 +97,7 @@ static void parse_cpu_init(void) current_property_set = xbt_dict_new(); cpu_new(xbt_strdup(A_surfxml_host_id), power_peak, power_scale, - power_trace, state_initial, state_trace, current_property_set); + power_trace, core, state_initial, state_trace, current_property_set); } @@ -136,7 +139,6 @@ static void add_traces_cpu(void) 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); } @@ -159,7 +161,7 @@ static int cpu_action_unref(surf_action_t action) if (action->category) xbt_free(action->category); #endif - free(action); + surf_action_free(&action); return 1; } return 0; @@ -211,6 +213,7 @@ static void cpu_update_actions_state(double now, double delta) lmm_variable_getvalue (action->variable), now - delta, delta); + TRACE_last_timestamp_to_dump = now-delta; #endif double_update(&(action->generic_action.remains), lmm_variable_getvalue(action->variable) * delta); @@ -235,15 +238,23 @@ static void cpu_update_resource_state(void *id, double value, double date) { cpu_Cas01_t cpu = id; + lmm_variable_t var = NULL; + lmm_element_t elem = NULL; if (event_type == cpu->power_event) { cpu->power_scale = value; lmm_update_constraint_bound(cpu_maxmin_system, cpu->constraint, - cpu->power_scale * cpu->power_peak); + cpu->core * cpu->power_scale * cpu->power_peak); #ifdef HAVE_TRACING TRACE_surf_host_set_power(date, cpu->generic_resource.name, - cpu->power_scale * cpu->power_peak); + cpu->core * cpu->power_scale * cpu->power_peak); #endif + while ((var = lmm_get_var_from_cnst + (cpu_maxmin_system, cpu->constraint, &elem))) { + surf_action_cpu_Cas01_t action = lmm_variable_id(var); + lmm_update_variable_bound(cpu_maxmin_system, 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) { @@ -294,7 +305,7 @@ static surf_action_t cpu_execute(void *cpu, double size) action->variable = lmm_variable_new(cpu_maxmin_system, action, action->generic_action.priority, - -1.0, 1); + CPU->power_scale * CPU->power_peak, 1); lmm_expand(cpu_maxmin_system, CPU->constraint, action->variable, 1.0); XBT_OUT; return (surf_action_t) action; @@ -373,6 +384,15 @@ static void cpu_action_set_priority(surf_action_t action, double priority) XBT_OUT; } +#ifdef HAVE_TRACING +static void cpu_action_set_category(surf_action_t action, const char *category) +{ + XBT_IN2("(%p,%s)", action, category); + action->category = xbt_strdup (category); + XBT_OUT; +} +#endif + static double cpu_action_get_remains(surf_action_t action) { XBT_IN1("(%p)", action); @@ -399,11 +419,12 @@ static double cpu_get_available_speed(void *cpu) static void cpu_create_resource(char *name, double power_peak, double power_scale, tmgr_trace_t power_trace, + int core, e_surf_resource_state_t state_initial, tmgr_trace_t state_trace, xbt_dict_t cpu_properties) { - cpu_new(name, power_peak, power_scale, power_trace, + cpu_new(name, power_peak, power_scale, power_trace, core, state_initial, state_trace, cpu_properties); } @@ -447,6 +468,9 @@ static void surf_cpu_model_init_internal(void) 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; +#ifdef HAVE_TRACING + surf_cpu_model->set_category = cpu_action_set_category; +#endif surf_cpu_model->get_remains = cpu_action_get_remains; surf_cpu_model->extension.cpu.execute = cpu_execute;