X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6761e997f501c19abb9cf5329733d556b1dfcfd8..c54b74368b97bb0d0b42aea6857681d7ff9df910:/src/surf/cpu.c diff --git a/src/surf/cpu.c b/src/surf/cpu.c index 0568742ee2..facbf7ece6 100644 --- a/src/surf/cpu.c +++ b/src/surf/cpu.c @@ -25,10 +25,13 @@ static cpu_Cas01_t cpu_new(char *name, double power_scale, double power_initial, tmgr_trace_t power_trace, e_surf_cpu_state_t state_initial, - tmgr_trace_t state_trace) + tmgr_trace_t state_trace, + xbt_dict_t cpu_properties) { cpu_Cas01_t cpu = xbt_new0(s_cpu_Cas01_t, 1); - + xbt_assert1(!xbt_dict_get_or_null(cpu_set, name), + "Host '%s' declared several times in the platform file",name); + cpu->model = (surf_model_t) surf_cpu_model; cpu->name = name; cpu->power_scale = power_scale; @@ -47,45 +50,83 @@ static cpu_Cas01_t cpu_new(char *name, double power_scale, lmm_constraint_new(cpu_maxmin_system, cpu, cpu->power_current * cpu->power_scale); + /*add the property set*/ + cpu->properties = cpu_properties; + + current_property_set = cpu_properties; + xbt_dict_set(cpu_set, name, cpu, cpu_free); return cpu; } -static void parse_cpu(void) + +static void parse_cpu_init(void) { - char *name = NULL; 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; tmgr_trace_t state_trace = NULL; - name = xbt_strdup(A_surfxml_cpu_name); - surf_parse_get_double(&power_scale, A_surfxml_cpu_power); - surf_parse_get_double(&power_initial, A_surfxml_cpu_availability); - surf_parse_get_trace(&power_trace, A_surfxml_cpu_availability_file); + 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); - xbt_assert0((A_surfxml_cpu_state == A_surfxml_cpu_state_ON) || - (A_surfxml_cpu_state == A_surfxml_cpu_state_OFF), + 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_cpu_state == A_surfxml_cpu_state_ON) + if (A_surfxml_host_state == A_surfxml_host_state_ON) state_initial = SURF_CPU_ON; - if (A_surfxml_cpu_state == A_surfxml_cpu_state_OFF) + if (A_surfxml_host_state == A_surfxml_host_state_OFF) state_initial = SURF_CPU_OFF; - surf_parse_get_trace(&state_trace, A_surfxml_cpu_state_file); + surf_parse_get_trace(&state_trace, A_surfxml_host_state_file); + + current_property_set = xbt_dict_new(); + cpu_new(xbt_strdup(A_surfxml_host_id), power_scale, power_initial, power_trace, state_initial, + state_trace, current_property_set); - cpu_new(name, power_scale, power_initial, power_trace, state_initial, - state_trace); } -static void parse_file(const char *file) +static void add_traces_cpu(void) { + xbt_dict_cursor_t cursor=NULL; + char *trace_name,*elm; + + static int called = 0; + + if (called) return; + called = 1; + + + /* connect all traces relative to hosts */ + xbt_dict_foreach(trace_connect_list_host_avail, cursor, trace_name, elm) { + tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name); + cpu_Cas01_t host = xbt_dict_get_or_null(cpu_set, elm); + + xbt_assert1(host, "Host %s undefined", elm); + xbt_assert1(trace, "Trace %s undefined", trace_name); + + host->state_event = tmgr_history_add_trace(history, trace, 0.0, 0, host); + } + + xbt_dict_foreach(trace_connect_list_power, cursor, trace_name, elm) { + tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name); + cpu_Cas01_t host = xbt_dict_get_or_null(cpu_set, elm); + + xbt_assert1(host, "Host %s undefined", elm); + xbt_assert1(trace, "Trace %s undefined", trace_name); + + host->power_event = tmgr_history_add_trace(history, trace, 0.0, 0, host); + } +} + +static void define_callbacks(const char *file) { surf_parse_reset_parser(); - ETag_surfxml_cpu_fun = parse_cpu; - surf_parse_open(file); - xbt_assert1((!surf_parse()), "Parse error in %s", file); - surf_parse_close(); + surfxml_add_callback(STag_surfxml_host_cb_list, parse_cpu_init); + surfxml_add_callback(STag_surfxml_prop_cb_list, parse_properties); + surfxml_add_callback(STag_surfxml_random_cb_list, &init_randomness); + surfxml_add_callback(ETag_surfxml_random_cb_list, &add_randomness); } static void *name_service(const char *name) @@ -93,15 +134,15 @@ static void *name_service(const char *name) return xbt_dict_get_or_null(cpu_set, name); } -static const char *get_model_name(void *model_id) +static const char *get_resource_name(void *resource_id) { - return ((cpu_Cas01_t) model_id)->name; + return ((cpu_Cas01_t) resource_id)->name; } -static int model_used(void *model_id) +static int resource_used(void *resource_id) { return lmm_constraint_used(cpu_maxmin_system, - ((cpu_Cas01_t) model_id)->constraint); + ((cpu_Cas01_t) resource_id)->constraint); } static int action_free(surf_action_t action) @@ -147,13 +188,13 @@ static void action_change_state(surf_action_t action, return; } -static double share_models(double now) +static double share_resources(double now) { s_surf_action_cpu_Cas01_t action; - return generic_maxmin_share_models2(surf_cpu_model->common_public-> - states.running_action_set, - xbt_swag_offset(action, variable), - cpu_maxmin_system, lmm_solve); + return generic_maxmin_share_resources(surf_cpu_model->common_public-> + states.running_action_set, + xbt_swag_offset(action, variable), + cpu_maxmin_system, lmm_solve); } static void update_actions_state(double now, double delta) @@ -168,6 +209,12 @@ static void update_actions_state(double now, double delta) */ xbt_swag_foreach_safe(action, next_action, running_actions) { + if (action->generic_action.max_duration == NO_MAX_DURATION && + action->suspended==2 ) + /* Rely on the fact that sleep action with no duration are on + the end of the queue */ + break; + double_update(&(action->generic_action.remains), lmm_variable_getvalue(action->variable) * delta); if (action->generic_action.max_duration != NO_MAX_DURATION) @@ -180,30 +227,15 @@ static void update_actions_state(double now, double delta) (action->generic_action.max_duration <= 0)) { action->generic_action.finish = surf_get_clock(); action_change_state((surf_action_t) action, SURF_ACTION_DONE); - } else { /* Need to check that none of the model has failed */ - lmm_constraint_t cnst = NULL; - int i = 0; - cpu_Cas01_t cpu = NULL; - - while ((cnst = - lmm_get_cnst_from_var(cpu_maxmin_system, action->variable, - i++))) { - cpu = lmm_constraint_id(cnst); - if (cpu->state_current == SURF_CPU_OFF) { - action->generic_action.finish = surf_get_clock(); - action_change_state((surf_action_t) action, SURF_ACTION_FAILED); - break; - } - } } } return; } -static void update_model_state(void *id, +static void update_resource_state(void *id, tmgr_trace_event_t event_type, - double value) + double value, double date) { cpu_Cas01_t cpu = id; @@ -214,8 +246,23 @@ static void update_model_state(void *id, } else if (event_type == cpu->state_event) { if (value > 0) cpu->state_current = SURF_CPU_ON; - else + else { + lmm_constraint_t cnst = cpu->constraint; + lmm_variable_t var = NULL; + lmm_element_t elem = NULL; + cpu->state_current = SURF_CPU_OFF; + + while((var = lmm_get_var_from_cnst(cpu_maxmin_system,cnst,&elem))) { + surf_action_t action = lmm_variable_id(var) ; + + if(surf_action_get_state(action)==SURF_ACTION_RUNNING || + surf_action_get_state(action)==SURF_ACTION_READY) { + action->finish = date; + action_change_state( action, SURF_ACTION_FAILED); + } + } + } } else { CRITICAL0("Unknown event ! \n"); xbt_abort(); @@ -250,7 +297,9 @@ static surf_action_t execute(void *cpu, double size) else action->generic_action.state_set = surf_cpu_model->common_public->states.failed_action_set; - xbt_swag_insert(action, action->generic_action.state_set); + /* Insert at the head by default. This convention is used to speed + up update_resource_state */ + xbt_swag_insert_at_head(action, action->generic_action.state_set); action->variable = lmm_variable_new(cpu_maxmin_system, action, action->generic_action.priority, @@ -263,11 +312,22 @@ static surf_action_t execute(void *cpu, double size) static surf_action_t action_sleep(void *cpu, double duration) { surf_action_cpu_Cas01_t action = NULL; + xbt_swag_t action_set = NULL; + if (duration>0) + duration=MAX(duration,MAXMIN_PRECISION); XBT_IN2("(%s,%g)", ((cpu_Cas01_t) cpu)->name, duration); action = (surf_action_cpu_Cas01_t) execute(cpu, 1.0); action->generic_action.max_duration = duration; action->suspended = 2; + if(duration == NO_MAX_DURATION) { + /* Move to the *end* of the corresponding action set. This convention + is used to speed up update_resource_state */ + action_set = action->generic_action.state_set; + xbt_swag_remove(action, action_set); + xbt_swag_insert(action, action_set); + } + lmm_update_variable_weight(cpu_maxmin_system, action->variable, 0.0); XBT_OUT; return (surf_action_t) action; @@ -334,6 +394,11 @@ static double get_available_speed(void *cpu) return ((cpu_Cas01_t) cpu)->power_current; } +static xbt_dict_t get_properties(void *cpu) +{ + return ((cpu_Cas01_t) cpu)->properties; +} + static void finalize(void) { xbt_dict_free(&cpu_set); @@ -374,7 +439,7 @@ static void surf_cpu_model_init_internal(void) xbt_swag_new(xbt_swag_offset(action, state_hookup)); surf_cpu_model->common_public->name_service = name_service; - surf_cpu_model->common_public->get_model_name = get_model_name; + surf_cpu_model->common_public->get_resource_name = get_resource_name; surf_cpu_model->common_public->action_get_state = surf_action_get_state; surf_cpu_model->common_public->action_get_start_time = @@ -390,12 +455,12 @@ static void surf_cpu_model_init_internal(void) surf_cpu_model->common_public->action_set_data = surf_action_set_data; surf_cpu_model->common_public->name = "CPU"; - surf_cpu_model->common_private->model_used = model_used; - surf_cpu_model->common_private->share_models = share_models; + surf_cpu_model->common_private->resource_used = resource_used; + surf_cpu_model->common_private->share_resources = share_resources; surf_cpu_model->common_private->update_actions_state = update_actions_state; - surf_cpu_model->common_private->update_model_state = - update_model_state; + surf_cpu_model->common_private->update_resource_state = + update_resource_state; surf_cpu_model->common_private->finalize = finalize; surf_cpu_model->common_public->suspend = action_suspend; @@ -411,11 +476,11 @@ static void surf_cpu_model_init_internal(void) surf_cpu_model->extension_public->get_speed = get_speed; surf_cpu_model->extension_public->get_available_speed = get_available_speed; + /*manage the properties of the cpu*/ + surf_cpu_model->common_public->get_properties = get_properties; - cpu_set = xbt_dict_new(); - - if (!cpu_maxmin_system) - cpu_maxmin_system = lmm_system_new(); + if(!cpu_set) cpu_set = xbt_dict_new(); + if (!cpu_maxmin_system) cpu_maxmin_system = lmm_system_new(); } /*********************************************************************/ @@ -438,6 +503,6 @@ void surf_cpu_model_init_Cas01(const char *filename) if (surf_cpu_model) return; surf_cpu_model_init_internal(); - parse_file(filename); + define_callbacks(filename); xbt_dynar_push(model_list, &surf_cpu_model); }