X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9440459ec55c278e70946654c42d6c3c74c582f5..867ae3ddfab33175d0bce6d797b2f537396693aa:/src/surf/cpu_ti.c diff --git a/src/surf/cpu_ti.c b/src/surf/cpu_ti.c index 13ccde8b54..b1c3d1d04e 100644 --- a/src/surf/cpu_ti.c +++ b/src/surf/cpu_ti.c @@ -14,7 +14,7 @@ #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"); @@ -50,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); } @@ -144,7 +142,7 @@ static surf_cpu_ti_tgmr_t cpu_ti_parse_trace(tmgr_trace_t power_trace, } -static cpu_ti_t cpu_ti_new(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, @@ -154,17 +152,17 @@ static cpu_ti_t cpu_ti_new(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); @@ -191,33 +189,16 @@ static cpu_ti_t cpu_ti_new(char *name, double power_peak, } -static void parse_cpu_ti_init(void) +static void parse_cpu_ti_init(sg_platf_host_cbarg_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_assert((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_ti_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; + 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); } @@ -278,10 +259,10 @@ static void add_traces_cpu_ti(void) } } -static void cpu_ti_define_callbacks(const char *file) +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) @@ -332,7 +313,6 @@ static void cpu_ti_action_state_set(surf_action_t action, */ 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; @@ -348,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 */ @@ -362,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 @@ -700,8 +681,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) @@ -746,19 +727,6 @@ static double cpu_ti_get_available_speed(void *cpu) return CPU->power_scale; } -static void cpu_ti_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) -{ - xbt_assert(core==1,"Multi-core not handled with this model yet"); - cpu_ti_new(name, power_peak, power_scale, power_trace, core, - state_initial, state_trace, cpu_properties); -} - static void cpu_ti_finalize(void) { void **cpu; @@ -797,7 +765,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; @@ -834,12 +802,11 @@ static void surf_cpu_ti_model_init_internal(void) } -void surf_cpu_model_init_ti(const char *filename) +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(filename); + cpu_ti_define_callbacks(); xbt_dynar_push(model_list, &surf_cpu_model); } @@ -1103,22 +1070,21 @@ static double surf_cpu_ti_solve_trace_simple(surf_cpu_ti_trace_t trace, static int surf_cpu_ti_binary_search(double *array, double a, int low, int high) { - xbt_assert(low a) - return mid; - - if (array[mid] < a) - low = mid + 1; - else - high = mid - 1; + xbt_assert(low < high, "Wrong parameters: low (%d) should be smaller than" + " high (%d)", low, high); + + int mid; + do { + mid = low + (high - low) / 2; + XBT_DEBUG("a %lf low %d high %d mid %d value %lf", a, low, high, mid, + array[mid]); + + if (array[mid] > a) + high = mid; + else + low = mid; } + while (low < high - 1); + + return low; }