X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/526747a744ea55946618ab192e053cd508947259..70388188c97f56fbe2b645c9b00dcb05d0b86509:/src/surf/cpu.c diff --git a/src/surf/cpu.c b/src/surf/cpu.c index 2b7f6020e0..1bbeb9ff1a 100644 --- a/src/surf/cpu.c +++ b/src/surf/cpu.c @@ -32,7 +32,7 @@ lmm_system_t cpu_maxmin_system = 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_peak, +static void* cpu_create_resource(const char *name, double power_peak, double power_scale, tmgr_trace_t power_trace, int core, @@ -40,18 +40,18 @@ static cpu_Cas01_t cpu_new(char *name, double power_peak, tmgr_trace_t state_trace, xbt_dict_t cpu_properties) { - cpu_Cas01_t cpu = xbt_new0(s_cpu_Cas01_t, 1); - xbt_assert1(!surf_cpu_resource_by_name(name), + + cpu_Cas01_t cpu = NULL; + xbt_assert(!surf_cpu_resource_by_name(name), "Host '%s' declared several times in the platform file", name); - cpu->generic_resource.model = surf_cpu_model; - cpu->generic_resource.name = name; - cpu->generic_resource.properties = cpu_properties; + cpu = (cpu_Cas01_t) surf_resource_new(sizeof(s_cpu_Cas01_t), + surf_cpu_model, name,cpu_properties); cpu->power_peak = power_peak; - xbt_assert0(cpu->power_peak > 0, "Power has to be >0"); + xbt_assert(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); + xbt_assert(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); @@ -71,31 +71,18 @@ static cpu_Cas01_t cpu_new(char *name, double power_peak, } -static void parse_cpu_init(void) +static void parse_cpu_init(surf_parsing_host_arg_t host) { - 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; - - 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), - "Invalid state"); - if (A_surfxml_host_state == A_surfxml_host_state_ON) - state_initial = SURF_RESOURCE_ON; - if (A_surfxml_host_state == A_surfxml_host_state_OFF) - state_initial = SURF_RESOURCE_OFF; - state_trace = tmgr_trace_new(A_surfxml_host_state_file); - - cpu_new(xbt_strdup(A_surfxml_host_id), power_peak, power_scale, - power_trace, core, state_initial, state_trace, current_property_set); + if(strcmp(host->V_host_coord,"")) xbt_die("Coordinates not implemented yet!"); + + cpu_create_resource(host->V_host_id, + host->V_host_power_peak, + host->V_host_power_scale, + host->V_host_power_trace, + host->V_host_core, + host->V_host_state_initial, + host->V_host_state_trace, + current_property_set); current_property_set = NULL; } @@ -116,8 +103,8 @@ static void add_traces_cpu(void) tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name); cpu_Cas01_t host = surf_cpu_resource_by_name(elm); - xbt_assert1(host, "Host %s undefined", elm); - xbt_assert1(trace, "Trace %s undefined", trace_name); + xbt_assert(host, "Host %s undefined", elm); + xbt_assert(trace, "Trace %s undefined", trace_name); host->state_event = tmgr_history_add_trace(history, trace, 0.0, 0, host); @@ -127,17 +114,17 @@ static void add_traces_cpu(void) tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name); cpu_Cas01_t host = surf_cpu_resource_by_name(elm); - xbt_assert1(host, "Host %s undefined", elm); - xbt_assert1(trace, "Trace %s undefined", trace_name); + xbt_assert(host, "Host %s undefined", elm); + xbt_assert(trace, "Trace %s undefined", trace_name); host->power_event = tmgr_history_add_trace(history, trace, 0.0, 0, host); } } -static void cpu_define_callbacks(const char *file) +static void cpu_define_callbacks(void) { - surfxml_add_callback(ETag_surfxml_host_cb_list, parse_cpu_init); + surf_parse_host_add_cb(parse_cpu_init); surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_traces_cpu); } @@ -201,17 +188,19 @@ static void cpu_update_actions_state(double now, double delta) xbt_swag_foreach_safe(action, next_action, running_actions) { #ifdef HAVE_TRACING - cpu_Cas01_t x = + if (TRACE_is_enabled()) { + cpu_Cas01_t x = lmm_constraint_id(lmm_get_cnst_from_var (cpu_maxmin_system, action->variable, 0)); - TRACE_surf_host_set_utilization(x->generic_resource.name, - action->generic_action.data, - (surf_action_t) action, - lmm_variable_getvalue - (action->variable), now - delta, - delta); - TRACE_last_timestamp_to_dump = now-delta; + TRACE_surf_host_set_utilization(x->generic_resource.name, + action->generic_action.data, + (surf_action_t) action, + 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); @@ -414,17 +403,6 @@ static double cpu_get_available_speed(void *cpu) return ((cpu_Cas01_t) cpu)->power_scale; } -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, core, - state_initial, state_trace, cpu_properties); -} static void cpu_finalize(void) { @@ -500,11 +478,11 @@ static void surf_cpu_model_init_internal(void) /* note = "Available at */ /* \url{http://grail.sdsc.edu/papers/simgrid_ccgrid01.ps.gz}." */ /* } */ -void surf_cpu_model_init_Cas01(const char *filename) +void surf_cpu_model_init_Cas01() { if (surf_cpu_model) return; surf_cpu_model_init_internal(); - cpu_define_callbacks(filename); + cpu_define_callbacks(); xbt_dynar_push(model_list, &surf_cpu_model); }