X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b7cd17c5d85000c8ea2a145876058fa296fa6d63..6094020a03f9c10b954e3e1d32e1a3ffc75a8d7f:/src/surf/cpu.c diff --git a/src/surf/cpu.c b/src/surf/cpu.c index d9007207b2..2b7f6020e0 100644 --- a/src/surf/cpu.c +++ b/src/surf/cpu.c @@ -41,7 +41,7 @@ static cpu_Cas01_t cpu_new(char *name, double power_peak, 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_assert1(!surf_cpu_resource_by_name(name), "Host '%s' declared several times in the platform file", name); cpu->generic_resource.model = surf_cpu_model; @@ -63,13 +63,9 @@ 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 + xbt_lib_set(host_lib, name, SURF_CPU_LEVEL, cpu); return cpu; } @@ -98,10 +94,9 @@ static void parse_cpu_init(void) 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); - + current_property_set = NULL; } static void add_traces_cpu(void) @@ -119,7 +114,7 @@ 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); @@ -130,7 +125,7 @@ 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); @@ -142,8 +137,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 +159,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; @@ -217,6 +211,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); @@ -241,15 +236,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) { @@ -277,7 +280,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(); } @@ -289,7 +292,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, @@ -300,9 +303,9 @@ 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; + XBT_OUT(); return (surf_action_t) action; } @@ -313,7 +316,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; @@ -327,32 +330,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) @@ -363,27 +366,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) @@ -454,6 +466,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;