X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/160719c0de3bf98d1b4cdeed9ac7d4b28c4dc9bd..6760cb07d6b57be16928d95339d71e57c4e24f36:/src/surf/cpu_ti.c diff --git a/src/surf/cpu_ti.c b/src/surf/cpu_ti.c index bdd1033cd3..a3bfa2fc7b 100644 --- a/src/surf/cpu_ti.c +++ b/src/surf/cpu_ti.c @@ -1,7 +1,6 @@ -/* $Id$ */ - -/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */ +/* Copyright (c) 2009, 2010. The SimGrid Team. + * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -21,32 +20,32 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_ti, surf, "Logging specific to the SURF CPU TRACE INTEGRATION module"); -static xbt_swag_t running_action_set_that_does_not_need_being_checked = NULL; -static xbt_swag_t modified_cpu = NULL; -static xbt_heap_t action_heap; +static xbt_swag_t cpu_ti_running_action_set_that_does_not_need_being_checked = NULL; +static xbt_swag_t cpu_ti_modified_cpu = NULL; +static xbt_heap_t cpu_ti_action_heap; /* prototypes of new trace functions */ -static double surf_cpu_integrate_trace(surf_cpu_ti_tgmr_t trace, double a, +static double surf_cpu_ti_integrate_trace(surf_cpu_ti_tgmr_t trace, double a, double b); -static double surf_cpu_solve_trace(surf_cpu_ti_tgmr_t trace, double a, +static double surf_cpu_ti_solve_trace(surf_cpu_ti_tgmr_t trace, double a, double amount); -static double surf_cpu_solve_trace_somewhat_simple(surf_cpu_ti_tgmr_t trace, +static double surf_cpu_ti_solve_trace_somewhat_simple(surf_cpu_ti_tgmr_t trace, double a, double amount); -static void surf_cpu_free_tmgr(surf_cpu_ti_tgmr_t trace); +static void surf_cpu_ti_free_tmgr(surf_cpu_ti_tgmr_t trace); -static double surf_cpu_integrate_trace_simple(surf_cpu_ti_trace_t trace, +static double surf_cpu_ti_integrate_trace_simple(surf_cpu_ti_trace_t trace, double a, double b); -static double surf_cpu_integrate_trace_simple_point(surf_cpu_ti_trace_t trace, +static double surf_cpu_ti_integrate_trace_simple_point(surf_cpu_ti_trace_t trace, double a); -static double surf_cpu_solve_trace_simple(surf_cpu_ti_trace_t trace, double a, +static double surf_cpu_ti_solve_trace_simple(surf_cpu_ti_trace_t trace, double a, double amount); -static int surf_cpu_binary_search(double *array, double a, int low, int high); +static int surf_cpu_ti_binary_search(double *array, double a, int low, int high); /* end prototypes */ -static void surf_cpu_free_trace(surf_cpu_ti_trace_t trace) +static void surf_cpu_ti_free_trace(surf_cpu_ti_trace_t trace) { if (trace->time_points) xbt_free(trace->time_points); @@ -55,14 +54,14 @@ static void surf_cpu_free_trace(surf_cpu_ti_trace_t trace) xbt_free(trace); } -static void surf_cpu_free_tmgr(surf_cpu_ti_tgmr_t trace) +static void surf_cpu_ti_free_tmgr(surf_cpu_ti_tgmr_t trace) { if (trace->trace) - surf_cpu_free_trace(trace->trace); + surf_cpu_ti_free_trace(trace->trace); xbt_free(trace); } -static surf_cpu_ti_trace_t surf_cpu_trace_new(tmgr_trace_t power_trace) +static surf_cpu_ti_trace_t surf_cpu_ti_trace_new(tmgr_trace_t power_trace) { surf_cpu_ti_trace_t trace; s_tmgr_event_t val; @@ -130,9 +129,9 @@ static surf_cpu_ti_tgmr_t cpu_ti_parse_trace(tmgr_trace_t power_trace, xbt_dynar_foreach(power_trace->event_list, cpt, val) { total_time += val.delta; } - trace->trace = surf_cpu_trace_new(power_trace); + trace->trace = surf_cpu_ti_trace_new(power_trace); trace->last_time = total_time; - trace->total = surf_cpu_integrate_trace_simple(trace->trace, 0, total_time); + trace->total = surf_cpu_ti_integrate_trace_simple(trace->trace, 0, total_time); DEBUG2("Total integral %lf, last_time %lf ", trace->total, trace->last_time); @@ -141,7 +140,7 @@ static surf_cpu_ti_tgmr_t cpu_ti_parse_trace(tmgr_trace_t power_trace, } -static cpu_ti_t cpu_new(char *name, double power_peak, +static cpu_ti_t cpu_ti_new(char *name, double power_peak, double power_scale, tmgr_trace_t power_trace, e_surf_resource_state_t state_initial, @@ -184,7 +183,7 @@ static cpu_ti_t cpu_new(char *name, double power_peak, } -static void parse_cpu_init(void) +static void parse_cpu_ti_init(void) { double power_peak = 0.0; double power_scale = 0.0; @@ -206,12 +205,12 @@ static void parse_cpu_init(void) 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, + cpu_ti_new(xbt_strdup(A_surfxml_host_id), power_peak, power_scale, power_trace, state_initial, state_trace, current_property_set); } -static void add_traces_cpu(void) +static void add_traces_cpu_ti(void) { xbt_dict_cursor_t cursor = NULL; char *trace_name, *elm; @@ -247,7 +246,7 @@ static void add_traces_cpu(void) DEBUG2("Add power trace: %s to CPU(%s)", trace_name, elm); if (cpu->avail_trace) - surf_cpu_free_tmgr(cpu->avail_trace); + surf_cpu_ti_free_tmgr(cpu->avail_trace); cpu->avail_trace = cpu_ti_parse_trace(trace, cpu->power_scale); @@ -267,20 +266,20 @@ static void add_traces_cpu(void) } } -static void define_callbacks(const char *file) +static void cpu_ti_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_platform_cb_list, &add_traces_cpu); + surfxml_add_callback(STag_surfxml_host_cb_list, parse_cpu_ti_init); + surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_traces_cpu_ti); } -static int resource_used(void *resource_id) +static int cpu_ti_resource_used(void *resource_id) { cpu_ti_t cpu = resource_id; return xbt_swag_size(cpu->action_set); } -static int action_unref(surf_action_t action) +static int cpu_ti_action_unref(surf_action_t action) { action->refcount--; if (!action->refcount) { @@ -288,27 +287,27 @@ static int action_unref(surf_action_t action) /* remove from action_set */ xbt_swag_remove(action, ACTION_GET_CPU(action)->action_set); /* remove from heap */ - xbt_heap_remove(action_heap, ((surf_action_cpu_ti_t) action)->index_heap); - xbt_swag_insert(ACTION_GET_CPU(action), modified_cpu); + xbt_heap_remove(cpu_ti_action_heap, ((surf_action_cpu_ti_t) action)->index_heap); + xbt_swag_insert(ACTION_GET_CPU(action), cpu_ti_modified_cpu); free(action); return 1; } return 0; } -static void action_cancel(surf_action_t action) +static void cpu_ti_action_cancel(surf_action_t action) { surf_action_state_set(action, SURF_ACTION_FAILED); - xbt_heap_remove(action_heap, ((surf_action_cpu_ti_t) action)->index_heap); - xbt_swag_insert(ACTION_GET_CPU(action), modified_cpu); + xbt_heap_remove(cpu_ti_action_heap, ((surf_action_cpu_ti_t) action)->index_heap); + xbt_swag_insert(ACTION_GET_CPU(action), cpu_ti_modified_cpu); return; } -static void cpu_action_state_set(surf_action_t action, +static void cpu_ti_action_state_set(surf_action_t action, e_surf_action_state_t state) { surf_action_state_set(action, state); - xbt_swag_insert(ACTION_GET_CPU(action), modified_cpu); + xbt_swag_insert(ACTION_GET_CPU(action), cpu_ti_modified_cpu); return; } @@ -318,7 +317,7 @@ static void cpu_action_state_set(surf_action_t action, * \param cpu Cpu on which the actions are running * \param now Current time */ -static void cpu_update_remaining_amount(cpu_ti_t cpu, double now) +static void cpu_ti_update_remaining_amount(cpu_ti_t cpu, double now) { #define GENERIC_ACTION(action) action->generic_action double area_total; @@ -330,7 +329,7 @@ static void cpu_update_remaining_amount(cpu_ti_t cpu, double now) /* calcule the surface */ area_total = - surf_cpu_integrate_trace(cpu->avail_trace, cpu->last_update, + surf_cpu_ti_integrate_trace(cpu->avail_trace, cpu->last_update, now) * cpu->power_peak; DEBUG2("Flops total: %lf, Last update %lf", area_total, cpu->last_update); @@ -374,14 +373,14 @@ static void cpu_update_remaining_amount(cpu_ti_t cpu, double now) * \param cpu Cpu on which the actions are running * \param now Current time */ -static void cpu_update_action_finish_date(cpu_ti_t cpu, double now) +static void cpu_ti_update_action_finish_date(cpu_ti_t cpu, double now) { #define GENERIC_ACTION(action) action->generic_action surf_action_cpu_ti_t action; double sum_priority = 0.0, total_area, min_finish = -1; /* update remaning amount of actions */ - cpu_update_remaining_amount(cpu, now); + cpu_ti_update_remaining_amount(cpu, now); xbt_swag_foreach(action, cpu->action_set) { /* action not running, skip it */ @@ -402,6 +401,7 @@ static void cpu_update_action_finish_date(cpu_ti_t cpu, double now) cpu->sum_priority = sum_priority; xbt_swag_foreach(action, cpu->action_set) { + min_finish = -1; /* action not running, skip it */ if (GENERIC_ACTION(action).state_set != surf_cpu_model->states.running_action_set) @@ -417,7 +417,7 @@ static void cpu_update_action_finish_date(cpu_ti_t cpu, double now) total_area /= cpu->power_peak; GENERIC_ACTION(action).finish = - surf_cpu_solve_trace(cpu->avail_trace, now, total_area); + surf_cpu_ti_solve_trace(cpu->avail_trace, now, total_area); /* verify which event will happen before (max_duration or finish time) */ if ((GENERIC_ACTION(action).max_duration != NO_MAX_DURATION) && (GENERIC_ACTION(action).start + @@ -438,12 +438,12 @@ static void cpu_update_action_finish_date(cpu_ti_t cpu, double now) DEBUG2("action(%p) index %d", action, action->index_heap); if (action->index_heap >= 0) { surf_action_cpu_ti_t heap_act = - xbt_heap_remove(action_heap, action->index_heap); + xbt_heap_remove(cpu_ti_action_heap, action->index_heap); if (heap_act != action) DIE_IMPOSSIBLE; } if (min_finish != NO_MAX_DURATION) - xbt_heap_push(action_heap, action, min_finish); + xbt_heap_push(cpu_ti_action_heap, action, min_finish); DEBUG5 ("Update finish time: Cpu(%s) Action: %p, Start Time: %lf Finish Time: %lf Max duration %lf", @@ -451,47 +451,47 @@ static void cpu_update_action_finish_date(cpu_ti_t cpu, double now) GENERIC_ACTION(action).finish, GENERIC_ACTION(action).max_duration); } /* remove from modified cpu */ - xbt_swag_remove(cpu, modified_cpu); + xbt_swag_remove(cpu, cpu_ti_modified_cpu); #undef GENERIC_ACTION } -static double share_resources(double now) +static double cpu_ti_share_resources(double now) { cpu_ti_t cpu, cpu_next; double min_action_duration = -1; /* iterates over modified cpus to update share resources */ - xbt_swag_foreach_safe(cpu, cpu_next, modified_cpu) { - cpu_update_action_finish_date(cpu, now); + xbt_swag_foreach_safe(cpu, cpu_next, cpu_ti_modified_cpu) { + cpu_ti_update_action_finish_date(cpu, now); } /* get the min next event if heap not empty */ - if (xbt_heap_size(action_heap) > 0) - min_action_duration = xbt_heap_maxkey(action_heap) - now; + if (xbt_heap_size(cpu_ti_action_heap) > 0) + min_action_duration = xbt_heap_maxkey(cpu_ti_action_heap) - now; DEBUG1("Share resources, min next event date: %lf", min_action_duration); return min_action_duration; } -static void update_actions_state(double now, double delta) +static void cpu_ti_update_actions_state(double now, double delta) { #define GENERIC_ACTION(action) action->generic_action surf_action_cpu_ti_t action; - while ((xbt_heap_size(action_heap) > 0) - && (xbt_heap_maxkey(action_heap) <= now)) { - action = xbt_heap_pop(action_heap); + while ((xbt_heap_size(cpu_ti_action_heap) > 0) + && (xbt_heap_maxkey(cpu_ti_action_heap) <= now)) { + action = xbt_heap_pop(cpu_ti_action_heap); DEBUG1("Action %p: finish", action); GENERIC_ACTION(action).finish = surf_get_clock(); /* set the remains to 0 due to precision problems when updating the remaining amount */ GENERIC_ACTION(action).remains = 0; - cpu_action_state_set((surf_action_t) action, SURF_ACTION_DONE); + cpu_ti_action_state_set((surf_action_t) action, SURF_ACTION_DONE); /* update remaining amout of all actions */ - cpu_update_remaining_amount(action->cpu, surf_get_clock()); + cpu_ti_update_remaining_amount(action->cpu, surf_get_clock()); } #undef GENERIC_ACTION } -static void update_resource_state(void *id, +static void cpu_ti_update_resource_state(void *id, tmgr_trace_event_t event_type, double value, double date) { @@ -506,14 +506,14 @@ static void update_resource_state(void *id, DEBUG3("Finish trace date: %lf value %lf date %lf", surf_get_clock(), value, date); /* update remaining of actions and put in modified cpu swag */ - cpu_update_remaining_amount(cpu, date); - xbt_swag_insert(cpu, modified_cpu); + cpu_ti_update_remaining_amount(cpu, date); + 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); /* free old trace */ - surf_cpu_free_tmgr(cpu->avail_trace); + surf_cpu_ti_free_tmgr(cpu->avail_trace); cpu->power_scale = val.value; trace = xbt_new0(s_surf_cpu_ti_tgmr_t, 1); @@ -541,10 +541,10 @@ static void update_resource_state(void *id, || surf_action_state_get((surf_action_t) action) == SURF_ACTION_NOT_IN_THE_SYSTEM) { action->generic_action.finish = date; - cpu_action_state_set((surf_action_t) action, SURF_ACTION_FAILED); + cpu_ti_action_state_set((surf_action_t) action, SURF_ACTION_FAILED); if (action->index_heap >= 0) { surf_action_cpu_ti_t heap_act = - xbt_heap_remove(action_heap, action->index_heap); + xbt_heap_remove(cpu_ti_action_heap, action->index_heap); if (heap_act != action) DIE_IMPOSSIBLE; } @@ -561,7 +561,7 @@ static void update_resource_state(void *id, return; } -static surf_action_t execute(void *cpu, double size) +static surf_action_t cpu_ti_execute(void *cpu, double size) { surf_action_cpu_ti_t action = NULL; cpu_ti_t CPU = cpu; @@ -573,7 +573,7 @@ static surf_action_t execute(void *cpu, double size) action->cpu = cpu; action->index_heap = -1; - xbt_swag_insert(CPU, modified_cpu); + xbt_swag_insert(CPU, cpu_ti_modified_cpu); xbt_swag_insert(action, CPU->action_set); @@ -584,12 +584,12 @@ static surf_action_t execute(void *cpu, double size) return (surf_action_t) action; } -static void action_update_index_heap(void *action, int i) +static void cpu_ti_action_update_index_heap(void *action, int i) { ((surf_action_cpu_ti_t) action)->index_heap = i; } -static surf_action_t action_sleep(void *cpu, double duration) +static surf_action_t cpu_ti_action_sleep(void *cpu, double duration) { surf_action_cpu_ti_t action = NULL; @@ -597,7 +597,7 @@ static surf_action_t action_sleep(void *cpu, double duration) duration = MAX(duration, MAXMIN_PRECISION); XBT_IN2("(%s,%g)", surf_resource_name(cpu), duration); - action = (surf_action_cpu_ti_t) execute(cpu, 1.0); + action = (surf_action_cpu_ti_t) cpu_ti_execute(cpu, 1.0); action->generic_action.max_duration = duration; action->suspended = 2; if (duration == NO_MAX_DURATION) { @@ -605,39 +605,40 @@ static surf_action_t action_sleep(void *cpu, double duration) 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; + cpu_ti_running_action_set_that_does_not_need_being_checked; xbt_swag_insert(action, ((surf_action_t) action)->state_set); } XBT_OUT; return (surf_action_t) action; } -static void action_suspend(surf_action_t action) +static void cpu_ti_action_suspend(surf_action_t action) { XBT_IN1("(%p)", action); if (((surf_action_cpu_ti_t) action)->suspended != 2) { ((surf_action_cpu_ti_t) action)->suspended = 1; - xbt_swag_insert(ACTION_GET_CPU(action), modified_cpu); + xbt_heap_remove(cpu_ti_action_heap, ((surf_action_cpu_ti_t) action)->index_heap); + xbt_swag_insert(ACTION_GET_CPU(action), cpu_ti_modified_cpu); } XBT_OUT; } -static void action_resume(surf_action_t action) +static void cpu_ti_action_resume(surf_action_t action) { XBT_IN1("(%p)", action); if (((surf_action_cpu_ti_t) action)->suspended != 2) { ((surf_action_cpu_ti_t) action)->suspended = 0; - xbt_swag_insert(ACTION_GET_CPU(action), modified_cpu); + xbt_swag_insert(ACTION_GET_CPU(action), cpu_ti_modified_cpu); } XBT_OUT; } -static int action_is_suspended(surf_action_t action) +static int cpu_ti_action_is_suspended(surf_action_t action) { return (((surf_action_cpu_ti_t) action)->suspended == 1); } -static void action_set_max_duration(surf_action_t action, double duration) +static void cpu_ti_action_set_max_duration(surf_action_t action, double duration) { surf_action_cpu_ti_t ACT = (surf_action_cpu_ti_t) action; double min_finish; @@ -657,38 +658,38 @@ static void action_set_max_duration(surf_action_t action, double duration) /* add in action heap */ if (ACT->index_heap >= 0) { surf_action_cpu_ti_t heap_act = - xbt_heap_remove(action_heap, ACT->index_heap); + xbt_heap_remove(cpu_ti_action_heap, ACT->index_heap); if (heap_act != ACT) DIE_IMPOSSIBLE; } - xbt_heap_push(action_heap, ACT, min_finish); + xbt_heap_push(cpu_ti_action_heap, ACT, min_finish); XBT_OUT; } -static void action_set_priority(surf_action_t action, double priority) +static void cpu_ti_action_set_priority(surf_action_t action, double priority) { XBT_IN2("(%p,%g)", action, priority); action->priority = priority; - xbt_swag_insert(ACTION_GET_CPU(action), modified_cpu); + xbt_swag_insert(ACTION_GET_CPU(action), cpu_ti_modified_cpu); XBT_OUT; } -static double action_get_remains(surf_action_t action) +static double cpu_ti_action_get_remains(surf_action_t action) { XBT_IN1("(%p)", action); - cpu_update_remaining_amount((cpu_ti_t) ((surf_action_cpu_ti_t) action)->cpu, + cpu_ti_update_remaining_amount((cpu_ti_t) ((surf_action_cpu_ti_t) action)->cpu, surf_get_clock()); return action->remains; XBT_OUT; } -static e_surf_resource_state_t get_state(void *cpu) +static e_surf_resource_state_t cpu_ti_get_state(void *cpu) { return ((cpu_ti_t) cpu)->state_current; } -static double get_speed(void *cpu, double load) +static double cpu_ti_get_speed(void *cpu, double load) { return load * (((cpu_ti_t) cpu)->power_peak); } @@ -701,7 +702,7 @@ static double get_speed(void *cpu, double load) * \param a Time * \return CPU power scale */ -static double surf_cpu_get_power_scale(surf_cpu_ti_tgmr_t trace, double a) +static double surf_cpu_ti_get_power_scale(surf_cpu_ti_tgmr_t trace, double a) { double reduced_a; int point; @@ -709,22 +710,22 @@ static double surf_cpu_get_power_scale(surf_cpu_ti_tgmr_t trace, double a) reduced_a = a - floor(a / trace->last_time) * trace->last_time; point = - surf_cpu_binary_search(trace->trace->time_points, reduced_a, 0, + 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, 0, &val); return val.value; } -static double get_available_speed(void *cpu) +static double cpu_ti_get_available_speed(void *cpu) { cpu_ti_t CPU = cpu; CPU->power_scale = - surf_cpu_get_power_scale(CPU->avail_trace, surf_get_clock()); + surf_cpu_ti_get_power_scale(CPU->avail_trace, surf_get_clock()); /* number between 0 and 1 */ return CPU->power_scale; } -static void finalize(void) +static void cpu_ti_finalize(void) { void *cpu; xbt_dict_cursor_t cursor; @@ -732,59 +733,59 @@ static void finalize(void) xbt_dict_foreach(surf_model_resource_set(surf_cpu_model), cursor, key, cpu) { cpu_ti_t CPU = cpu; xbt_swag_free(CPU->action_set); - surf_cpu_free_tmgr(CPU->avail_trace); + surf_cpu_ti_free_tmgr(CPU->avail_trace); } surf_model_exit(surf_cpu_model); surf_cpu_model = NULL; - xbt_swag_free(running_action_set_that_does_not_need_being_checked); - xbt_swag_free(modified_cpu); - running_action_set_that_does_not_need_being_checked = NULL; - xbt_heap_free(action_heap); + xbt_swag_free(cpu_ti_running_action_set_that_does_not_need_being_checked); + xbt_swag_free(cpu_ti_modified_cpu); + cpu_ti_running_action_set_that_does_not_need_being_checked = NULL; + xbt_heap_free(cpu_ti_action_heap); } -static void surf_cpu_model_init_internal(void) +static void surf_cpu_ti_model_init_internal(void) { s_surf_action_t action; s_cpu_ti_t cpu; surf_cpu_model = surf_model_init(); - running_action_set_that_does_not_need_being_checked = + cpu_ti_running_action_set_that_does_not_need_being_checked = xbt_swag_new(xbt_swag_offset(action, state_hookup)); - modified_cpu = xbt_swag_new(xbt_swag_offset(cpu, modified_cpu_hookup)); + cpu_ti_modified_cpu = xbt_swag_new(xbt_swag_offset(cpu, modified_cpu_hookup)); surf_cpu_model->name = "CPU_TI"; - surf_cpu_model->action_unref = action_unref; - surf_cpu_model->action_cancel = action_cancel; - surf_cpu_model->action_state_set = cpu_action_state_set; + surf_cpu_model->action_unref = cpu_ti_action_unref; + surf_cpu_model->action_cancel = cpu_ti_action_cancel; + surf_cpu_model->action_state_set = cpu_ti_action_state_set; - surf_cpu_model->model_private->resource_used = resource_used; - surf_cpu_model->model_private->share_resources = share_resources; - surf_cpu_model->model_private->update_actions_state = update_actions_state; + surf_cpu_model->model_private->resource_used = cpu_ti_resource_used; + surf_cpu_model->model_private->share_resources = cpu_ti_share_resources; + surf_cpu_model->model_private->update_actions_state = cpu_ti_update_actions_state; surf_cpu_model->model_private->update_resource_state = - update_resource_state; - surf_cpu_model->model_private->finalize = finalize; + cpu_ti_update_resource_state; + surf_cpu_model->model_private->finalize = cpu_ti_finalize; - surf_cpu_model->suspend = action_suspend; - surf_cpu_model->resume = action_resume; - surf_cpu_model->is_suspended = action_is_suspended; - surf_cpu_model->set_max_duration = action_set_max_duration; - surf_cpu_model->set_priority = action_set_priority; - surf_cpu_model->get_remains = action_get_remains; + surf_cpu_model->suspend = cpu_ti_action_suspend; + surf_cpu_model->resume = cpu_ti_action_resume; + surf_cpu_model->is_suspended = cpu_ti_action_is_suspended; + surf_cpu_model->set_max_duration = cpu_ti_action_set_max_duration; + surf_cpu_model->set_priority = cpu_ti_action_set_priority; + surf_cpu_model->get_remains = cpu_ti_action_get_remains; - surf_cpu_model->extension.cpu.execute = execute; - surf_cpu_model->extension.cpu.sleep = action_sleep; + surf_cpu_model->extension.cpu.execute = cpu_ti_execute; + surf_cpu_model->extension.cpu.sleep = cpu_ti_action_sleep; - surf_cpu_model->extension.cpu.get_state = get_state; - surf_cpu_model->extension.cpu.get_speed = get_speed; - surf_cpu_model->extension.cpu.get_available_speed = get_available_speed; + surf_cpu_model->extension.cpu.get_state = cpu_ti_get_state; + surf_cpu_model->extension.cpu.get_speed = cpu_ti_get_speed; + surf_cpu_model->extension.cpu.get_available_speed = cpu_ti_get_available_speed; - action_heap = xbt_heap_new(8, NULL); - xbt_heap_set_update_callback(action_heap, action_update_index_heap); + cpu_ti_action_heap = xbt_heap_new(8, NULL); + xbt_heap_set_update_callback(cpu_ti_action_heap, cpu_ti_action_update_index_heap); } @@ -792,8 +793,8 @@ void surf_cpu_model_init_ti(const char *filename) { if (surf_cpu_model) return; - surf_cpu_model_init_internal(); - define_callbacks(filename); + surf_cpu_ti_model_init_internal(); + cpu_ti_define_callbacks(filename); xbt_dynar_push(model_list, &surf_cpu_model); } @@ -809,7 +810,7 @@ void surf_cpu_model_init_ti(const char *filename) * \param b End of interval * \return the integrate value. -1 if an error occurs. */ -static double surf_cpu_integrate_trace(surf_cpu_ti_tgmr_t trace, double a, +static double surf_cpu_ti_integrate_trace(surf_cpu_ti_tgmr_t trace, double a, double b) { double first_chunk; @@ -838,18 +839,18 @@ static double surf_cpu_integrate_trace(surf_cpu_ti_tgmr_t trace, double a, b_index = (int) (floor(b / trace->last_time)); if (a_index > b_index) { /* Same chunk */ - return surf_cpu_integrate_trace_simple(trace->trace, + return surf_cpu_ti_integrate_trace_simple(trace->trace, a - (a_index - 1) * trace->last_time, b - (b_index) * trace->last_time); } - first_chunk = surf_cpu_integrate_trace_simple(trace->trace, + first_chunk = surf_cpu_ti_integrate_trace_simple(trace->trace, a - (a_index - 1) * trace->last_time, trace->last_time); middle_chunk = (b_index - a_index) * trace->total; - last_chunk = surf_cpu_integrate_trace_simple(trace->trace, + last_chunk = surf_cpu_ti_integrate_trace_simple(trace->trace, 0.0, b - (b_index) * trace->last_time); @@ -869,12 +870,12 @@ static double surf_cpu_integrate_trace(surf_cpu_ti_tgmr_t trace, double a, * \param b Final point * \return Integral */ -static double surf_cpu_integrate_trace_simple(surf_cpu_ti_trace_t trace, +static double surf_cpu_ti_integrate_trace_simple(surf_cpu_ti_trace_t trace, double a, double b) { - return surf_cpu_integrate_trace_simple_point(trace, + return surf_cpu_ti_integrate_trace_simple_point(trace, b) - - surf_cpu_integrate_trace_simple_point(trace, a); + surf_cpu_ti_integrate_trace_simple_point(trace, a); } /** @@ -883,14 +884,14 @@ static double surf_cpu_integrate_trace_simple(surf_cpu_ti_trace_t trace, * \param a point * \return Integral */ -static double surf_cpu_integrate_trace_simple_point(surf_cpu_ti_trace_t trace, +static double surf_cpu_ti_integrate_trace_simple_point(surf_cpu_ti_trace_t trace, double a) { double integral = 0; int ind; double a_aux = a; ind = - surf_cpu_binary_search(trace->time_points, a, 0, trace->nb_points - 1); + surf_cpu_ti_binary_search(trace->time_points, a, 0, trace->nb_points - 1); integral += trace->integral[ind]; DEBUG7("a %lf ind %d integral %lf ind + 1 %lf ind %lf time +1 %lf time %lf", a, ind, integral, trace->integral[ind + 1], trace->integral[ind], @@ -919,7 +920,7 @@ static double surf_cpu_integrate_trace_simple_point(surf_cpu_ti_trace_t trace, * \param amount Amount to be executed * \return End time */ -static double surf_cpu_solve_trace(surf_cpu_ti_tgmr_t trace, double a, +static double surf_cpu_ti_solve_trace(surf_cpu_ti_tgmr_t trace, double a, double amount) { int quotient; @@ -970,7 +971,7 @@ static double surf_cpu_solve_trace(surf_cpu_ti_tgmr_t trace, double a, fprintf(stderr,"reduced_amount = %.2f\n",reduced_amount); */ reduced_b = - surf_cpu_solve_trace_somewhat_simple(trace, reduced_a, reduced_amount); + surf_cpu_ti_solve_trace_somewhat_simple(trace, reduced_a, reduced_amount); /* Re-map to the original b and amount */ b = (trace->last_time) * (int) (floor(a / trace->last_time)) + @@ -985,23 +986,23 @@ static double surf_cpu_solve_trace(surf_cpu_ti_tgmr_t trace, double a, * and a <=trace->last_time * */ -static double surf_cpu_solve_trace_somewhat_simple(surf_cpu_ti_tgmr_t trace, +static double surf_cpu_ti_solve_trace_somewhat_simple(surf_cpu_ti_tgmr_t trace, double a, double amount) { double amount_till_end; double b; DEBUG2("Solve integral: [%.2f, amount=%.2f]", a, amount); - amount_till_end = surf_cpu_integrate_trace(trace, a, trace->last_time); + amount_till_end = surf_cpu_ti_integrate_trace(trace, a, trace->last_time); /* fprintf(stderr,"amount_till_end=%.2f\n",amount_till_end); */ if (amount_till_end > amount) { - b = surf_cpu_solve_trace_simple(trace->trace, a, amount); + b = surf_cpu_ti_solve_trace_simple(trace->trace, a, amount); } else { b = trace->last_time + - surf_cpu_solve_trace_simple(trace->trace, 0.0, + surf_cpu_ti_solve_trace_simple(trace->trace, 0.0, amount - amount_till_end); } return b; @@ -1015,15 +1016,15 @@ static double surf_cpu_solve_trace_somewhat_simple(surf_cpu_ti_tgmr_t trace, * \param amount Amount of flops * \return The date when amount is available. */ -static double surf_cpu_solve_trace_simple(surf_cpu_ti_trace_t trace, double a, +static double surf_cpu_ti_solve_trace_simple(surf_cpu_ti_trace_t trace, double a, double amount) { double integral_a; int ind; double time; - integral_a = surf_cpu_integrate_trace_simple_point(trace, a); + integral_a = surf_cpu_ti_integrate_trace_simple_point(trace, a); ind = - surf_cpu_binary_search(trace->integral, integral_a + amount, 0, + surf_cpu_ti_binary_search(trace->integral, integral_a + amount, 0, trace->nb_points - 1); time = trace->time_points[ind]; time += @@ -1045,7 +1046,7 @@ static double surf_cpu_solve_trace_simple(surf_cpu_ti_trace_t trace, double a, * \param high Upper bound to search in array * \return Index of point */ -static int surf_cpu_binary_search(double *array, double a, int low, int high) +static int surf_cpu_ti_binary_search(double *array, double a, int low, int high) { int mid = low + (high - low) / 2; DEBUG5("a %lf low %d high %d mid %d value %lf", a, low, high, mid, @@ -1058,7 +1059,7 @@ static int surf_cpu_binary_search(double *array, double a, int low, int high) return mid; if (array[mid] < a) - return surf_cpu_binary_search(array, a, mid + 1, high); + return surf_cpu_ti_binary_search(array, a, mid + 1, high); else - return surf_cpu_binary_search(array, a, low, mid - 1); + return surf_cpu_ti_binary_search(array, a, low, mid - 1); }