X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/62be96c324e33952038493a0aef1bb4a518766c3..6a7c78afcfb651c6e585f19ec4f60089e8a483a8:/src/surf/cpu.c diff --git a/src/surf/cpu.c b/src/surf/cpu.c index 75b84d589b..69aedef073 100644 --- a/src/surf/cpu.c +++ b/src/surf/cpu.c @@ -14,6 +14,7 @@ surf_cpu_model_t surf_cpu_model = NULL; lmm_system_t cpu_maxmin_system = NULL; xbt_dict_t cpu_set = NULL; +xbt_swag_t running_action_set_that_does_not_need_being_checked = NULL; static void cpu_free(void *cpu) { @@ -69,7 +70,7 @@ static void parse_cpu_init(void) e_surf_cpu_state_t state_initial = SURF_CPU_OFF; tmgr_trace_t state_trace = NULL; - surf_parse_get_double(&power_scale, A_surfxml_host_power); + 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); @@ -88,15 +89,45 @@ static void parse_cpu_init(void) } -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(); surfxml_add_callback(STag_surfxml_host_cb_list, parse_cpu_init); - surfxml_add_callback(STag_surfxml_prop_cb_list, &parse_properties); - - surf_parse_open(file); - xbt_assert1((!surf_parse()), "Parse error in %s", file); - surf_parse_close(); + 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) @@ -191,21 +222,6 @@ 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; - } - } } } @@ -214,7 +230,7 @@ static void update_actions_state(double now, double delta) static void update_resource_state(void *id, tmgr_trace_event_t event_type, - double value) + double value, double date) { cpu_Cas01_t cpu = id; @@ -225,8 +241,24 @@ static void update_resource_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 || + surf_action_get_state(action)==SURF_ACTION_NOT_IN_THE_SYSTEM) { + action->finish = date; + action_change_state( action, SURF_ACTION_FAILED); + } + } + } } else { CRITICAL0("Unknown event ! \n"); xbt_abort(); @@ -261,6 +293,7 @@ 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); action->variable = lmm_variable_new(cpu_maxmin_system, action, @@ -275,10 +308,21 @@ static surf_action_t 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)->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 */ + 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; + xbt_swag_insert(action, ((surf_action_t)action)->state_set); + } + lmm_update_variable_weight(cpu_maxmin_system, action->variable, 0.0); XBT_OUT; return (surf_action_t) action; @@ -389,6 +433,9 @@ static void surf_cpu_model_init_internal(void) surf_cpu_model->common_public->states.done_action_set = xbt_swag_new(xbt_swag_offset(action, state_hookup)); + running_action_set_that_does_not_need_being_checked = + xbt_swag_new(xbt_swag_offset(action, state_hookup)); + surf_cpu_model->common_public->name_service = name_service; surf_cpu_model->common_public->get_resource_name = get_resource_name; surf_cpu_model->common_public->action_get_state = @@ -454,6 +501,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); }