X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a4f777f30924d7890b9e1da29f9d1a637035531b..51dcb8e712855f3cb16800ddea745ef6fc8d79e9:/src/surf/cpu_ti.c diff --git a/src/surf/cpu_ti.c b/src/surf/cpu_ti.c index 41e3bc1afe..30d23f88c1 100644 --- a/src/surf/cpu_ti.c +++ b/src/surf/cpu_ti.c @@ -6,14 +6,15 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ /* - commit: e2d6799c4182f00443b3013aadb1c2412372460f - This commit retrieves the old implementation of CPU_TI with multi-levels. + commit: e2d6799c4182f00443b3013aadb1c2412372460f + This commit retrieves the old implementation of CPU_TI with multi-levels. */ #include "surf_private.h" #include "trace_mgr_private.h" #include "cpu_ti_private.h" #include "xbt/heap.h" +#include "surf/surf_resource.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_ti, surf, "Logging specific to the SURF CPU TRACE INTEGRATION module"); @@ -49,10 +50,8 @@ static int surf_cpu_ti_binary_search(double *array, double a, int low, static void surf_cpu_ti_free_trace(surf_cpu_ti_trace_t trace) { - if (trace->time_points) - xbt_free(trace->time_points); - if (trace->integral) - xbt_free(trace->integral); + xbt_free(trace->time_points); + xbt_free(trace->integral); xbt_free(trace); } @@ -74,12 +73,12 @@ static surf_cpu_ti_trace_t surf_cpu_ti_trace_new(tmgr_trace_t power_trace) trace = xbt_new0(s_surf_cpu_ti_trace_t, 1); trace->time_points = xbt_malloc0(sizeof(double) * - (xbt_dynar_length(power_trace->event_list) + 1)); + (xbt_dynar_length(power_trace->s_list.event_list) + 1)); trace->integral = xbt_malloc0(sizeof(double) * - (xbt_dynar_length(power_trace->event_list) + 1)); - trace->nb_points = xbt_dynar_length(power_trace->event_list); - xbt_dynar_foreach(power_trace->event_list, cpt, val) { + (xbt_dynar_length(power_trace->s_list.event_list) + 1)); + trace->nb_points = xbt_dynar_length(power_trace->s_list.event_list); + xbt_dynar_foreach(power_trace->s_list.event_list, cpt, val) { trace->time_points[i] = time; trace->integral[i] = integral; integral += val.delta * val.value; @@ -94,10 +93,10 @@ static surf_cpu_ti_trace_t surf_cpu_ti_trace_new(tmgr_trace_t power_trace) /** * \brief Creates a new integration trace from a tmgr_trace_t * -* \param power_trace CPU availability trace -* \param value Percentage of CPU power available (useful to fixed tracing) -* \param spacing Initial spacing -* \return Integration trace structure +* \param power_trace CPU availability trace +* \param value Percentage of CPU power available (useful to fixed tracing) +* \param spacing Initial spacing +* \return Integration trace structure */ static surf_cpu_ti_tgmr_t cpu_ti_parse_trace(tmgr_trace_t power_trace, double value) @@ -117,8 +116,8 @@ static surf_cpu_ti_tgmr_t cpu_ti_parse_trace(tmgr_trace_t power_trace, } /* only one point available, fixed trace */ - if (xbt_dynar_length(power_trace->event_list) == 1) { - xbt_dynar_get_cpy(power_trace->event_list, 0, &val); + if (xbt_dynar_length(power_trace->s_list.event_list) == 1) { + xbt_dynar_get_cpy(power_trace->s_list.event_list, 0, &val); trace->type = TRACE_FIXED; trace->value = val.value; return trace; @@ -128,7 +127,7 @@ static surf_cpu_ti_tgmr_t cpu_ti_parse_trace(tmgr_trace_t power_trace, trace->power_trace = power_trace; /* count the total time of trace file */ - xbt_dynar_foreach(power_trace->event_list, cpt, val) { + xbt_dynar_foreach(power_trace->s_list.event_list, cpt, val) { total_time += val.delta; } trace->trace = surf_cpu_ti_trace_new(power_trace); @@ -143,7 +142,7 @@ static surf_cpu_ti_tgmr_t cpu_ti_parse_trace(tmgr_trace_t power_trace, } -static void* cpu_ti_create_resource(char *name, double power_peak, +static void* cpu_ti_create_resource(const char *name, double power_peak, double power_scale, tmgr_trace_t power_trace, int core, @@ -153,18 +152,17 @@ static void* cpu_ti_create_resource(char *name, double power_peak, { tmgr_trace_t empty_trace; s_tmgr_event_t val; - cpu_ti_t cpu = xbt_new0(s_cpu_ti_t, 1); + cpu_ti_t cpu = NULL; s_surf_action_cpu_ti_t ti_action; xbt_assert(core==1,"Multi-core not handled with this model yet"); xbt_assert(!surf_cpu_resource_by_name(name), "Host '%s' declared several times in the platform file", name); xbt_assert(core==1,"Multi-core not handled with this model yet"); + cpu = (cpu_ti_t) surf_resource_new(sizeof(s_cpu_ti_t), + surf_cpu_model, name,cpu_properties); cpu->action_set = xbt_swag_new(xbt_swag_offset(ti_action, cpu_list_hookup)); - cpu->generic_resource.model = surf_cpu_model; - cpu->generic_resource.name = name; - cpu->generic_resource.properties = cpu_properties; cpu->power_peak = power_peak; xbt_assert(cpu->power_peak > 0, "Power has to be >0"); XBT_DEBUG("power scale %lf", power_scale); @@ -174,10 +172,10 @@ static void* cpu_ti_create_resource(char *name, double power_peak, if (state_trace) cpu->state_event = tmgr_history_add_trace(history, state_trace, 0.0, 0, cpu); - if (power_trace && xbt_dynar_length(power_trace->event_list) > 1) { + if (power_trace && xbt_dynar_length(power_trace->s_list.event_list) > 1) { /* add a fake trace event if periodicity == 0 */ - xbt_dynar_get_cpy(power_trace->event_list, - xbt_dynar_length(power_trace->event_list) - 1, &val); + xbt_dynar_get_cpy(power_trace->s_list.event_list, + xbt_dynar_length(power_trace->s_list.event_list) - 1, &val); if (val.delta == 0) { empty_trace = tmgr_empty_trace_new(); cpu->power_event = @@ -191,17 +189,16 @@ static void* cpu_ti_create_resource(char *name, double power_peak, } -static void parse_cpu_ti_init(void) +static void parse_cpu_ti_init(sg_platf_host_cbarg_t host) { - cpu_ti_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; + cpu_ti_create_resource(host->id, + host->power_peak, + host->power_scale, + host->power_trace, + host->core_amount, + host->initial_state, + host->state_trace, + host->properties); } @@ -247,10 +244,10 @@ static void add_traces_cpu_ti(void) cpu->avail_trace = cpu_ti_parse_trace(trace, cpu->power_scale); /* add a fake trace event if periodicity == 0 */ - if (trace && xbt_dynar_length(trace->event_list) > 1) { + if (trace && xbt_dynar_length(trace->s_list.event_list) > 1) { s_tmgr_event_t val; - xbt_dynar_get_cpy(trace->event_list, - xbt_dynar_length(trace->event_list) - 1, &val); + xbt_dynar_get_cpy(trace->s_list.event_list, + xbt_dynar_length(trace->s_list.event_list) - 1, &val); if (val.delta == 0) { tmgr_trace_t empty_trace; empty_trace = tmgr_empty_trace_new(); @@ -264,8 +261,8 @@ static void add_traces_cpu_ti(void) static void cpu_ti_define_callbacks() { - surfxml_add_callback(ETag_surfxml_host_cb_list, parse_cpu_ti_init); - surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_traces_cpu_ti); + sg_platf_host_add_cb(parse_cpu_ti_init); + sg_platf_postparse_add_cb(add_traces_cpu_ti); } static int cpu_ti_resource_used(void *resource_id) @@ -311,12 +308,11 @@ static void cpu_ti_action_state_set(surf_action_t action, /** * \brief Update the remaining amount of actions * -* \param cpu Cpu on which the actions are running -* \param now Current time +* \param cpu Cpu on which the actions are running +* \param now Current time */ static void cpu_ti_update_remaining_amount(cpu_ti_t cpu, double now) { -#define GENERIC_ACTION(action) action->generic_action double area_total; surf_action_cpu_ti_t action; @@ -332,13 +328,14 @@ static void cpu_ti_update_remaining_amount(cpu_ti_t cpu, double now) cpu->last_update); xbt_swag_foreach(action, cpu->action_set) { + surf_action_t generic = (surf_action_t)action; /* action not running, skip it */ - if (GENERIC_ACTION(action).state_set != + if (generic->state_set != surf_cpu_model->states.running_action_set) continue; /* bogus priority, skip it */ - if (GENERIC_ACTION(action).priority <= 0) + if (generic->priority <= 0) continue; /* action suspended, skip it */ @@ -346,20 +343,20 @@ static void cpu_ti_update_remaining_amount(cpu_ti_t cpu, double now) continue; /* action don't need update */ - if (GENERIC_ACTION(action).start >= now) + if (generic->start >= now) continue; /* skip action that are finishing now */ - if (GENERIC_ACTION(action).finish >= 0 - && GENERIC_ACTION(action).finish <= now) + if (generic->finish >= 0 + && generic->finish <= now) continue; /* update remaining */ - double_update(&(GENERIC_ACTION(action).remains), + double_update(&(generic->remains), area_total / (cpu->sum_priority * - GENERIC_ACTION(action).priority)); + generic->priority)); XBT_DEBUG("Update remaining action(%p) remaining %lf", action, - GENERIC_ACTION(action).remains); + generic->remains); } cpu->last_update = now; #undef GENERIC_ACTION @@ -368,8 +365,8 @@ static void cpu_ti_update_remaining_amount(cpu_ti_t cpu, double now) /** * \brief Update the finish date of action if necessary * -* \param cpu Cpu on which the actions are running -* \param now Current time +* \param cpu Cpu on which the actions are running +* \param now Current time */ static void cpu_ti_update_action_finish_date(cpu_ti_t cpu, double now) { @@ -497,6 +494,8 @@ static void cpu_ti_update_resource_state(void *id, cpu_ti_t cpu = id; surf_action_cpu_ti_t action; + surf_watched_hosts(); + if (event_type == cpu->power_event) { tmgr_trace_t power_trace; surf_cpu_ti_tgmr_t trace; @@ -509,8 +508,8 @@ static void cpu_ti_update_resource_state(void *id, xbt_swag_insert(cpu, cpu_ti_modified_cpu); power_trace = cpu->avail_trace->power_trace; - xbt_dynar_get_cpy(power_trace->event_list, - xbt_dynar_length(power_trace->event_list) - 1, &val); + xbt_dynar_get_cpy(power_trace->s_list.event_list, + xbt_dynar_length(power_trace->s_list.event_list) - 1, &val); /* free old trace */ surf_cpu_ti_free_tmgr(cpu->avail_trace); cpu->power_scale = val.value; @@ -684,8 +683,8 @@ static double cpu_ti_action_get_remains(surf_action_t action) cpu_ti_update_remaining_amount((cpu_ti_t) ((surf_action_cpu_ti_t) action)->cpu, surf_get_clock()); - return action->remains; XBT_OUT(); + return action->remains; } static e_surf_resource_state_t cpu_ti_get_state(void *cpu) @@ -701,9 +700,9 @@ static double cpu_ti_get_speed(void *cpu, double load) /** * \brief Auxiliary function to update the CPU power scale. * -* This function uses the trace structure to return the power scale at the determined time a. -* \param trace Trace structure to search the updated power scale -* \param a Time +* This function uses the trace structure to return the power scale at the determined time a. +* \param trace Trace structure to search the updated power scale +* \param a Time * \return CPU power scale */ static double surf_cpu_ti_get_power_scale(surf_cpu_ti_tgmr_t trace, @@ -717,7 +716,7 @@ static double surf_cpu_ti_get_power_scale(surf_cpu_ti_tgmr_t trace, point = surf_cpu_ti_binary_search(trace->trace->time_points, reduced_a, 0, trace->trace->nb_points - 1); - xbt_dynar_get_cpy(trace->power_trace->event_list, point, &val); + xbt_dynar_get_cpy(trace->power_trace->s_list.event_list, point, &val); return val.value; } @@ -737,12 +736,12 @@ static void cpu_ti_finalize(void) char *key; xbt_lib_foreach(host_lib, cursor, key, cpu){ - if(cpu[SURF_CPU_LEVEL]) - { - cpu_ti_t CPU = cpu[SURF_CPU_LEVEL]; - xbt_swag_free(CPU->action_set); - surf_cpu_ti_free_tmgr(CPU->avail_trace); - } + if(cpu[SURF_CPU_LEVEL]) + { + cpu_ti_t CPU = cpu[SURF_CPU_LEVEL]; + xbt_swag_free(CPU->action_set); + surf_cpu_ti_free_tmgr(CPU->avail_trace); + } } surf_model_exit(surf_cpu_model); @@ -768,7 +767,7 @@ static void surf_cpu_ti_model_init_internal(void) cpu_ti_modified_cpu = xbt_swag_new(xbt_swag_offset(cpu, modified_cpu_hookup)); - surf_cpu_model->name = "CPU_TI"; + surf_cpu_model->name = "cpu_ti"; surf_cpu_model->action_unref = cpu_ti_action_unref; surf_cpu_model->action_cancel = cpu_ti_action_cancel; @@ -796,7 +795,6 @@ static void surf_cpu_ti_model_init_internal(void) surf_cpu_model->extension.cpu.get_speed = cpu_ti_get_speed; surf_cpu_model->extension.cpu.get_available_speed = cpu_ti_get_available_speed; - surf_cpu_model->extension.cpu.create_resource = cpu_ti_create_resource; surf_cpu_model->extension.cpu.add_traces = add_traces_cpu_ti; cpu_ti_action_heap = xbt_heap_new(8, NULL); @@ -807,8 +805,7 @@ static void surf_cpu_ti_model_init_internal(void) void surf_cpu_model_init_ti() { - if (surf_cpu_model) - return; + xbt_assert(!surf_cpu_model,"CPU model already initialized. This should not happen."); surf_cpu_ti_model_init_internal(); cpu_ti_define_callbacks(); xbt_dynar_push(model_list, &surf_cpu_model); @@ -822,8 +819,8 @@ void surf_cpu_model_init_ti() * the cyclic effect. * * \param trace Trace structure. -* \param a Begin of interval -* \param b End of interval +* \param a Begin of interval +* \param b End of interval * \return the integrate value. -1 if an error occurs. */ static double surf_cpu_ti_integrate_trace(surf_cpu_ti_tgmr_t trace, @@ -883,12 +880,12 @@ static double surf_cpu_ti_integrate_trace(surf_cpu_ti_tgmr_t trace, /** * \brief Auxiliary function to calculate the integral between a and b. - * It simply calculates the integral at point a and b and returns the difference - * between them. - * \param trace Trace structure - * \param a Initial point - * \param b Final point - * \return Integral + * It simply calculates the integral at point a and b and returns the difference + * between them. + * \param trace Trace structure + * \param a Initial point + * \param b Final point + * \return Integral */ static double surf_cpu_ti_integrate_trace_simple(surf_cpu_ti_trace_t trace, double a, double b) @@ -900,9 +897,9 @@ static double surf_cpu_ti_integrate_trace_simple(surf_cpu_ti_trace_t trace, /** * \brief Auxiliary function to calculate the integral at point a. - * \param trace Trace structure - * \param a point - * \return Integral + * \param trace Trace structure + * \param a point + * \return Integral */ static double surf_cpu_ti_integrate_trace_simple_point(surf_cpu_ti_trace_t trace, double a) @@ -937,10 +934,10 @@ static double surf_cpu_ti_integrate_trace_simple_point(surf_cpu_ti_trace_t * * Here, amount can span multiple trace periods * -* \param trace CPU trace structure -* \param a Initial time -* \param amount Amount to be executed -* \return End time +* \param trace CPU trace structure +* \param a Initial time +* \param amount Amount to be executed +* \return End time */ static double surf_cpu_ti_solve_trace(surf_cpu_ti_tgmr_t trace, double a, double amount) @@ -989,8 +986,8 @@ static double surf_cpu_ti_solve_trace(surf_cpu_ti_tgmr_t trace, double a, /* Now solve for new_amount which is <= trace_total */ /* - fprintf(stderr,"reduced_a = %.2f\n",reduced_a); - fprintf(stderr,"reduced_amount = %.2f\n",reduced_amount); + fprintf(stderr,"reduced_a = %.2f\n",reduced_a); + fprintf(stderr,"reduced_amount = %.2f\n",reduced_amount); */ reduced_b = surf_cpu_ti_solve_trace_somewhat_simple(trace, reduced_a, @@ -1020,7 +1017,7 @@ static double surf_cpu_ti_solve_trace_somewhat_simple(surf_cpu_ti_tgmr_t amount_till_end = surf_cpu_ti_integrate_trace(trace, a, trace->last_time); /* - fprintf(stderr,"amount_till_end=%.2f\n",amount_till_end); + fprintf(stderr,"amount_till_end=%.2f\n",amount_till_end); */ if (amount_till_end > amount) { @@ -1035,10 +1032,10 @@ static double surf_cpu_ti_solve_trace_somewhat_simple(surf_cpu_ti_tgmr_t /** * \brief Auxiliary function to solve integral. - * It returns the date when the requested amount of flops is available - * \param trace Trace structure - * \param a Initial point - * \param amount Amount of flops + * It returns the date when the requested amount of flops is available + * \param trace Trace structure + * \param a Initial point + * \param amount Amount of flops * \return The date when amount is available. */ static double surf_cpu_ti_solve_trace_simple(surf_cpu_ti_trace_t trace, @@ -1064,11 +1061,11 @@ static double surf_cpu_ti_solve_trace_simple(surf_cpu_ti_trace_t trace, /** * \brief Binary search in array. - * It returns the first point of the interval in which "a" is. - * \param array Array - * \param a Value to search - * \param low Low bound to search in array - * \param high Upper bound to search in array + * It returns the first point of the interval in which "a" is. + * \param array Array + * \param a Value to search + * \param low Low bound to search in array + * \param high Upper bound to search in array * \return Index of point */ static int surf_cpu_ti_binary_search(double *array, double a, int low,