X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e683f4e829813790c25870ccf9d43a18b8296d2a..1b4e20873a7bd405842f3d8d1e6dd1d518db5535:/src/surf/cpu_ti.c diff --git a/src/surf/cpu_ti.c b/src/surf/cpu_ti.c index a4e40b94dc..b14ceecb14 100644 --- a/src/surf/cpu_ti.c +++ b/src/surf/cpu_ti.c @@ -1,5 +1,5 @@ -/* Copyright (c) 2009, 2010. The SimGrid Team. +/* Copyright (c) 2009-2013. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -111,7 +111,7 @@ static surf_cpu_ti_tgmr_t cpu_ti_parse_trace(tmgr_trace_t power_trace, if (!power_trace) { trace->type = TRACE_FIXED; trace->value = value; - XBT_DEBUG("No availabily trace. Constant value = %lf", value); + XBT_DEBUG("No availability trace. Constant value = %f", value); return trace; } @@ -135,14 +135,15 @@ static surf_cpu_ti_tgmr_t cpu_ti_parse_trace(tmgr_trace_t power_trace, trace->total = surf_cpu_ti_integrate_trace_simple(trace->trace, 0, total_time); - XBT_DEBUG("Total integral %lf, last_time %lf ", + XBT_DEBUG("Total integral %f, last_time %f ", trace->total, trace->last_time); return trace; } -static void* cpu_ti_create_resource(const char *name, double power_peak, +static void* cpu_ti_create_resource(const char *name, xbt_dynar_t power_peak, + int pstate, double power_scale, tmgr_trace_t power_trace, int core, @@ -155,17 +156,23 @@ static void* cpu_ti_create_resource(const char *name, double power_peak, 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), + xbt_assert(!surf_cpu_resource_priv(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); + surf_cpu_model, name,cpu_properties, NULL); cpu->action_set = xbt_swag_new(xbt_swag_offset(ti_action, cpu_list_hookup)); - cpu->power_peak = power_peak; + + xbt_dynar_get_cpy(power_peak, 0, &cpu->power_peak); + xbt_dynar_free(&power_peak); /* kill memory leak */ + //cpu->power_peak = power_peak; + cpu->pstate = pstate; + XBT_DEBUG("CPU create: peak=%f, pstate=%d",cpu->power_peak, cpu->pstate); + xbt_assert(cpu->power_peak > 0, "Power has to be >0"); - XBT_DEBUG("power scale %lf", power_scale); + XBT_DEBUG("power scale %f", power_scale); cpu->power_scale = power_scale; cpu->avail_trace = cpu_ti_parse_trace(power_trace, power_scale); cpu->state_current = state_initial; @@ -185,7 +192,7 @@ static void* cpu_ti_create_resource(const char *name, double power_peak, } xbt_lib_set(host_lib, name, SURF_CPU_LEVEL, cpu); - return cpu; + return xbt_lib_get_elm_or_null(host_lib, name); } @@ -193,6 +200,7 @@ static void parse_cpu_ti_init(sg_platf_host_cbarg_t host) { cpu_ti_create_resource(host->id, host->power_peak, + host->pstate, host->power_scale, host->power_trace, host->core_amount, @@ -216,7 +224,7 @@ static void add_traces_cpu_ti(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_ti_t cpu = surf_cpu_resource_by_name(elm); + cpu_ti_t cpu = surf_cpu_resource_priv(surf_cpu_resource_by_name(elm)); xbt_assert(cpu, "Host %s undefined", elm); xbt_assert(trace, "Trace %s undefined", trace_name); @@ -232,7 +240,7 @@ static void add_traces_cpu_ti(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_ti_t cpu = surf_cpu_resource_by_name(elm); + cpu_ti_t cpu = surf_cpu_resource_priv(surf_cpu_resource_by_name(elm)); xbt_assert(cpu, "Host %s undefined", elm); xbt_assert(trace, "Trace %s undefined", trace_name); @@ -277,11 +285,11 @@ static int cpu_ti_action_unref(surf_action_t action) if (!action->refcount) { xbt_swag_remove(action, action->state_set); /* remove from action_set */ - xbt_swag_remove(action, ACTION_GET_CPU(action)->action_set); + xbt_swag_remove(action, ((cpu_ti_t)surf_cpu_resource_priv(ACTION_GET_CPU(action)))->action_set); /* remove from heap */ 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_swag_insert(((cpu_ti_t)surf_cpu_resource_priv(ACTION_GET_CPU(action))), cpu_ti_modified_cpu); surf_action_free(&action); return 1; } @@ -293,7 +301,7 @@ static void cpu_ti_action_cancel(surf_action_t action) surf_action_state_set(action, SURF_ACTION_FAILED); 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_swag_insert(surf_cpu_resource_priv(ACTION_GET_CPU(action)), cpu_ti_modified_cpu); return; } @@ -301,7 +309,7 @@ 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), cpu_ti_modified_cpu); + xbt_swag_insert(surf_cpu_resource_priv(ACTION_GET_CPU(action)), cpu_ti_modified_cpu); return; } @@ -324,7 +332,7 @@ static void cpu_ti_update_remaining_amount(cpu_ti_t cpu, double now) area_total = surf_cpu_ti_integrate_trace(cpu->avail_trace, cpu->last_update, now) * cpu->power_peak; - XBT_DEBUG("Flops total: %lf, Last update %lf", area_total, + XBT_DEBUG("Flops total: %f, Last update %f", area_total, cpu->last_update); xbt_swag_foreach(action, cpu->action_set) { @@ -355,7 +363,7 @@ static void cpu_ti_update_remaining_amount(cpu_ti_t cpu, double now) double_update(&(generic->remains), area_total / (cpu->sum_priority * generic->priority)); - XBT_DEBUG("Update remaining action(%p) remaining %lf", action, + XBT_DEBUG("Update remaining action(%p) remaining %f", action, generic->remains); } cpu->last_update = now; @@ -441,7 +449,7 @@ static void cpu_ti_update_action_finish_date(cpu_ti_t cpu, double now) xbt_heap_push(cpu_ti_action_heap, action, min_finish); XBT_DEBUG - ("Update finish time: Cpu(%s) Action: %p, Start Time: %lf Finish Time: %lf Max duration %lf", + ("Update finish time: Cpu(%s) Action: %p, Start Time: %f Finish Time: %f Max duration %f", cpu->generic_resource.name, action, GENERIC_ACTION(action).start, GENERIC_ACTION(action).finish, GENERIC_ACTION(action).max_duration); @@ -464,7 +472,7 @@ static double cpu_ti_share_resources(double now) if (xbt_heap_size(cpu_ti_action_heap) > 0) min_action_duration = xbt_heap_maxkey(cpu_ti_action_heap) - now; - XBT_DEBUG("Share resources, min next event date: %lf", min_action_duration); + XBT_DEBUG("Share resources, min next event date: %f", min_action_duration); return min_action_duration; } @@ -481,8 +489,8 @@ static void cpu_ti_update_actions_state(double now, double delta) /* set the remains to 0 due to precision problems when updating the remaining amount */ GENERIC_ACTION(action).remains = 0; cpu_ti_action_state_set((surf_action_t) action, SURF_ACTION_DONE); - /* update remaining amout of all actions */ - cpu_ti_update_remaining_amount(action->cpu, surf_get_clock()); + /* update remaining amount of all actions */ + cpu_ti_update_remaining_amount(surf_cpu_resource_priv(action->cpu), surf_get_clock()); } #undef GENERIC_ACTION } @@ -494,14 +502,12 @@ 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; s_tmgr_event_t val; - XBT_DEBUG("Finish trace date: %lf value %lf date %lf", surf_get_clock(), + XBT_DEBUG("Finish trace date: %f value %f date %f", surf_get_clock(), value, date); /* update remaining of actions and put in modified cpu swag */ cpu_ti_update_remaining_amount(cpu, date); @@ -517,7 +523,7 @@ static void cpu_ti_update_resource_state(void *id, trace = xbt_new0(s_surf_cpu_ti_tgmr_t, 1); trace->type = TRACE_FIXED; trace->value = val.value; - XBT_DEBUG("value %lf", val.value); + XBT_DEBUG("value %f", val.value); cpu->avail_trace = trace; @@ -525,9 +531,11 @@ static void cpu_ti_update_resource_state(void *id, cpu->power_event = NULL; } else if (event_type == cpu->state_event) { - if (value > 0) + if (value > 0) { + if(cpu->state_current == SURF_RESOURCE_OFF) + xbt_dynar_push_as(host_that_restart, char*, (cpu->generic_resource.name)); cpu->state_current = SURF_RESOURCE_ON; - else { + } else { cpu->state_current = SURF_RESOURCE_OFF; /* put all action running on cpu to failed */ @@ -563,7 +571,7 @@ static void cpu_ti_update_resource_state(void *id, static surf_action_t cpu_ti_execute(void *cpu, double size) { surf_action_cpu_ti_t action = NULL; - cpu_ti_t CPU = cpu; + cpu_ti_t CPU = surf_cpu_resource_priv(cpu); XBT_IN("(%s,%g)", surf_resource_name(CPU), size); action = @@ -595,7 +603,7 @@ static surf_action_t cpu_ti_action_sleep(void *cpu, double duration) if (duration > 0) duration = MAX(duration, MAXMIN_PRECISION); - XBT_IN("(%s,%g)", surf_resource_name(cpu), duration); + XBT_IN("(%s,%g)", surf_resource_name(surf_cpu_resource_priv(cpu)), duration); action = (surf_action_cpu_ti_t) cpu_ti_execute(cpu, 1.0); action->generic_action.max_duration = duration; action->suspended = 2; @@ -618,7 +626,7 @@ static void cpu_ti_action_suspend(surf_action_t action) ((surf_action_cpu_ti_t) action)->suspended = 1; 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_swag_insert(surf_cpu_resource_priv(ACTION_GET_CPU(action)), cpu_ti_modified_cpu); } XBT_OUT(); } @@ -628,7 +636,7 @@ static void cpu_ti_action_resume(surf_action_t action) XBT_IN("(%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), cpu_ti_modified_cpu); + xbt_swag_insert(surf_cpu_resource_priv(ACTION_GET_CPU(action)), cpu_ti_modified_cpu); } XBT_OUT(); } @@ -673,7 +681,7 @@ static void cpu_ti_action_set_priority(surf_action_t action, { XBT_IN("(%p,%g)", action, priority); action->priority = priority; - xbt_swag_insert(ACTION_GET_CPU(action), cpu_ti_modified_cpu); + xbt_swag_insert(surf_cpu_resource_priv(ACTION_GET_CPU(action)), cpu_ti_modified_cpu); XBT_OUT(); } @@ -689,12 +697,12 @@ static double cpu_ti_action_get_remains(surf_action_t action) static e_surf_resource_state_t cpu_ti_get_state(void *cpu) { - return ((cpu_ti_t) cpu)->state_current; + return ((cpu_ti_t)surf_cpu_resource_priv(cpu))->state_current; } static double cpu_ti_get_speed(void *cpu, double load) { - return load * (((cpu_ti_t) cpu)->power_peak); + return load * ((cpu_ti_t)surf_cpu_resource_priv(cpu))->power_peak; } /** @@ -722,7 +730,7 @@ static double surf_cpu_ti_get_power_scale(surf_cpu_ti_tgmr_t trace, static double cpu_ti_get_available_speed(void *cpu) { - cpu_ti_t CPU = cpu; + cpu_ti_t CPU = surf_cpu_resource_priv(cpu); CPU->power_scale = surf_cpu_ti_get_power_scale(CPU->avail_trace, surf_get_clock()); /* number between 0 and 1 */ @@ -795,7 +803,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); @@ -913,7 +920,7 @@ static double surf_cpu_ti_integrate_trace_simple_point(surf_cpu_ti_trace_t trace->nb_points - 1); integral += trace->integral[ind]; XBT_DEBUG - ("a %lf ind %d integral %lf ind + 1 %lf ind %lf time +1 %lf time %lf", + ("a %f ind %d integral %f ind + 1 %f ind %f time +1 %f time %f", a, ind, integral, trace->integral[ind + 1], trace->integral[ind], trace->time_points[ind + 1], trace->time_points[ind]); double_update(&a_aux, trace->time_points[ind]); @@ -925,7 +932,7 @@ static double surf_cpu_ti_integrate_trace_simple_point(surf_cpu_ti_trace_t trace-> time_points [ind]); - XBT_DEBUG("Integral a %lf = %lf", a, integral); + XBT_DEBUG("Integral a %f = %f", a, integral); return integral; } @@ -975,14 +982,14 @@ static double surf_cpu_ti_solve_trace(surf_cpu_ti_tgmr_t trace, double a, return (a + (amount / trace->value)); } - XBT_DEBUG("amount %lf total %lf", amount, trace->total); + XBT_DEBUG("amount %f total %f", amount, trace->total); /* Reduce the problem to one where amount <= trace_total */ quotient = (int) (floor(amount / trace->total)); reduced_amount = (trace->total) * ((amount / trace->total) - floor(amount / trace->total)); reduced_a = a - (trace->last_time) * (int) (floor(a / trace->last_time)); - XBT_DEBUG("Quotient: %d reduced_amount: %lf reduced_a: %lf", quotient, + XBT_DEBUG("Quotient: %d reduced_amount: %f reduced_a: %f", quotient, reduced_amount, reduced_a); /* Now solve for new_amount which is <= trace_total */ @@ -1078,7 +1085,7 @@ static int surf_cpu_ti_binary_search(double *array, double a, int low, int mid; do { mid = low + (high - low) / 2; - XBT_DEBUG("a %lf low %d high %d mid %d value %lf", a, low, high, mid, + XBT_DEBUG("a %f low %d high %d mid %d value %f", a, low, high, mid, array[mid]); if (array[mid] > a)