X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b23f76c819d776be7e164c27102a3dd969ca2880..8353ca761ac086a2dffa56a6b1c862f19b803879:/src/surf/cpu.c diff --git a/src/surf/cpu.c b/src/surf/cpu.c index e8e838b546..b251771f15 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(char *name, double power_peak, double power_scale, tmgr_trace_t power_trace, int core, @@ -40,18 +40,19 @@ 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_model_resource_by_name(surf_cpu_model, name), + 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->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); @@ -65,11 +66,7 @@ static cpu_Cas01_t cpu_new(char *name, double power_peak, lmm_constraint_new(cpu_maxmin_system, cpu, 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->core * cpu->power_scale * cpu->power_peak); -#endif + xbt_lib_set(host_lib, name, SURF_CPU_LEVEL, cpu); return cpu; } @@ -77,31 +74,17 @@ static cpu_Cas01_t cpu_new(char *name, double power_peak, 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; - - 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); - - current_property_set = xbt_dict_new(); - cpu_new(xbt_strdup(A_surfxml_host_id), power_peak, power_scale, - power_trace, core, state_initial, state_trace, current_property_set); - + if(strcmp(struct_host->V_host_coord,"")) xbt_die("Coordinates not implemented yet!"); + + cpu_create_resource(struct_host->V_host_id, + struct_host->V_host_power_peak, + struct_host->V_host_power_scale, + struct_host->V_host_power_trace, + struct_host->V_host_core, + struct_host->V_host_state_initial, + struct_host->V_host_state_trace, + current_property_set); + current_property_set = NULL; } static void add_traces_cpu(void) @@ -119,10 +102,10 @@ static void add_traces_cpu(void) /* 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 = surf_model_resource_by_name(surf_cpu_model, elm); + 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); @@ -130,10 +113,10 @@ static void add_traces_cpu(void) 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 = surf_model_resource_by_name(surf_cpu_model, elm); + 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); @@ -142,8 +125,7 @@ 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_host_cb_list, parse_cpu_init); surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_traces_cpu); } @@ -165,7 +147,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; @@ -207,16 +189,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_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); @@ -285,7 +270,7 @@ static void cpu_update_resource_state(void *id, if (tmgr_trace_event_free(event_type)) cpu->state_event = NULL; } else { - CRITICAL0("Unknown event ! \n"); + XBT_CRITICAL("Unknown event ! \n"); xbt_abort(); } @@ -297,7 +282,7 @@ 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)", surf_resource_name(CPU), size); + XBT_IN("(%s,%g)", surf_resource_name(CPU), size); action = surf_action_new(sizeof(s_surf_action_cpu_Cas01_t), size, surf_cpu_model, @@ -310,7 +295,7 @@ static surf_action_t cpu_execute(void *cpu, double size) action->generic_action.priority, CPU->power_scale * CPU->power_peak, 1); lmm_expand(cpu_maxmin_system, CPU->constraint, action->variable, 1.0); - XBT_OUT; + XBT_OUT(); return (surf_action_t) action; } @@ -321,7 +306,7 @@ static surf_action_t cpu_action_sleep(void *cpu, double duration) if (duration > 0) duration = MAX(duration, MAXMIN_PRECISION); - XBT_IN2("(%s,%g)", surf_resource_name(cpu), duration); + XBT_IN("(%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; @@ -335,32 +320,32 @@ static surf_action_t cpu_action_sleep(void *cpu, double duration) } lmm_update_variable_weight(cpu_maxmin_system, action->variable, 0.0); - XBT_OUT; + XBT_OUT(); return (surf_action_t) action; } static void cpu_action_suspend(surf_action_t action) { - XBT_IN1("(%p)", action); + XBT_IN("(%p)", action); if (((surf_action_cpu_Cas01_t) action)->suspended != 2) { lmm_update_variable_weight(cpu_maxmin_system, ((surf_action_cpu_Cas01_t) action)->variable, 0.0); ((surf_action_cpu_Cas01_t) action)->suspended = 1; } - XBT_OUT; + XBT_OUT(); } static void cpu_action_resume(surf_action_t action) { - XBT_IN1("(%p)", action); + XBT_IN("(%p)", action); if (((surf_action_cpu_Cas01_t) action)->suspended != 2) { lmm_update_variable_weight(cpu_maxmin_system, ((surf_action_cpu_Cas01_t) action)->variable, action->priority); ((surf_action_cpu_Cas01_t) action)->suspended = 0; } - XBT_OUT; + XBT_OUT(); } static int cpu_action_is_suspended(surf_action_t action) @@ -371,27 +356,36 @@ static int cpu_action_is_suspended(surf_action_t action) static void cpu_action_set_max_duration(surf_action_t action, double duration) { - XBT_IN2("(%p,%g)", action, duration); + XBT_IN("(%p,%g)", action, duration); action->max_duration = duration; - XBT_OUT; + XBT_OUT(); } static void cpu_action_set_priority(surf_action_t action, double priority) { - XBT_IN2("(%p,%g)", action, priority); + XBT_IN("(%p,%g)", action, priority); action->priority = priority; lmm_update_variable_weight(cpu_maxmin_system, ((surf_action_cpu_Cas01_t) action)->variable, priority); - XBT_OUT; + XBT_OUT(); +} + +#ifdef HAVE_TRACING +static void cpu_action_set_category(surf_action_t action, const char *category) +{ + XBT_IN("(%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); + XBT_IN("(%p)", action); return action->remains; - XBT_OUT; + XBT_OUT(); } static e_surf_resource_state_t cpu_get_state(void *cpu) @@ -410,17 +404,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) { @@ -462,6 +445,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;