X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2be0e4648c5b7055580df1c265b7c43ee6763a46..9d765a692e8aae0c06d16ce6d7db2acdd0b3b63d:/src/surf/cpu_cas01.c diff --git a/src/surf/cpu_cas01.c b/src/surf/cpu_cas01.c index 3755de922a..968a8f3a3c 100644 --- a/src/surf/cpu_cas01.c +++ b/src/surf/cpu_cas01.c @@ -51,7 +51,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu, surf, static xbt_swag_t cpu_running_action_set_that_does_not_need_being_checked = NULL; -static void* cpu_create_resource(const char *name, double power_peak, +static void *cpu_create_resource(const char *name, double power_peak, double power_scale, tmgr_trace_t power_trace, int core, @@ -63,15 +63,16 @@ static void* cpu_create_resource(const char *name, double power_peak, s_surf_action_cpu_Cas01_t action; xbt_assert(!surf_cpu_resource_by_name(name), - "Host '%s' declared several times in the platform file", - name); + "Host '%s' declared several times in the platform file", + name); cpu = (cpu_Cas01_t) surf_resource_new(sizeof(s_cpu_Cas01_t), - surf_cpu_model, name,cpu_properties); + surf_cpu_model, name, + cpu_properties); cpu->power_peak = power_peak; xbt_assert(cpu->power_peak > 0, "Power has to be >0"); cpu->power_scale = power_scale; cpu->core = core; - xbt_assert(core>0,"Invalid number of cores %d",core); + xbt_assert(core > 0, "Invalid number of cores %d", core); if (power_trace) cpu->power_event = @@ -87,8 +88,9 @@ static void* cpu_create_resource(const char *name, double power_peak, cpu->core * cpu->power_scale * cpu->power_peak); xbt_lib_set(host_lib, name, SURF_CPU_LEVEL, cpu); - if(cpu_update_mechanism == UM_LAZY) - cpu->action_set = xbt_swag_new(xbt_swag_offset(action, cpu_list_hookup)); + if (cpu_update_mechanism == UM_LAZY) + cpu->action_set = + xbt_swag_new(xbt_swag_offset(action, cpu_list_hookup)); return cpu; } @@ -96,14 +98,13 @@ static void* cpu_create_resource(const char *name, double power_peak, static void parse_cpu_init(sg_platf_host_cbarg_t host) { - cpu_create_resource(host->id, - host->power_peak, - host->power_scale, - host->power_trace, - host->core_amount, - host->initial_state, - host->state_trace, - host->properties); + cpu_create_resource(host->id, + host->power_peak, + host->power_scale, + host->power_trace, + host->core_amount, + host->initial_state, + host->state_trace, host->properties); } static void cpu_add_traces_cpu(void) @@ -159,13 +160,13 @@ static int cpu_action_unref(surf_action_t action) if (((surf_action_lmm_t) action)->variable) lmm_variable_free(cpu_maxmin_system, ((surf_action_lmm_t) action)->variable); - if(cpu_update_mechanism == UM_LAZY){ - /* remove from heap */ - xbt_heap_remove(cpu_action_heap, - ((surf_action_cpu_Cas01_t) action)->index_heap); - xbt_swag_remove(action, - ((cpu_Cas01_t) ACTION_GET_CPU(action))->action_set); - xbt_swag_insert(ACTION_GET_CPU(action), cpu_modified_cpu); + if (cpu_update_mechanism == UM_LAZY) { + /* remove from heap */ + xbt_heap_remove(cpu_action_heap, + ((surf_action_cpu_Cas01_t) action)->index_heap); + xbt_swag_remove(action, + ((cpu_Cas01_t) ACTION_GET_CPU(action))->action_set); + xbt_swag_insert(ACTION_GET_CPU(action), cpu_modified_cpu); } #ifdef HAVE_TRACING xbt_free(action->category); @@ -179,17 +180,17 @@ static int cpu_action_unref(surf_action_t action) static void cpu_action_cancel(surf_action_t action) { surf_action_state_set(action, SURF_ACTION_FAILED); - if(cpu_update_mechanism == UM_LAZY){ - xbt_heap_remove(cpu_action_heap, - ((surf_action_cpu_Cas01_t) action)->index_heap); - xbt_swag_remove(action, - ((cpu_Cas01_t) ACTION_GET_CPU(action))->action_set); + if (cpu_update_mechanism == UM_LAZY) { + xbt_heap_remove(cpu_action_heap, + ((surf_action_cpu_Cas01_t) action)->index_heap); + xbt_swag_remove(action, + ((cpu_Cas01_t) ACTION_GET_CPU(action))->action_set); } return; } static void cpu_cpu_action_state_set(surf_action_t action, - e_surf_action_state_t state) + e_surf_action_state_t state) { /* if((state==SURF_ACTION_DONE) || (state==SURF_ACTION_FAILED)) */ /* if(((surf_action_lmm_t)action)->variable) { */ @@ -220,22 +221,22 @@ static void cpu_update_remains(cpu_Cas01_t cpu, double now) double_update(&(GENERIC_ACTION(action).remains), lmm_variable_getvalue(GENERIC_LMM_ACTION (action).variable) * (now - - cpu->last_update)); + cpu-> + last_update)); #ifdef HAVE_TRACING if (TRACE_is_enabled()) { TRACE_surf_host_set_utilization(cpu->generic_resource.name, - action-> - generic_lmm_action.generic_action. - data, (surf_action_t) action, + action->generic_lmm_action. + generic_action.data, + (surf_action_t) action, lmm_variable_getvalue - (GENERIC_LMM_ACTION - (action).variable), - cpu->last_update, + (GENERIC_LMM_ACTION(action). + variable), cpu->last_update, now - cpu->last_update); } #endif XBT_DEBUG("Update action(%p) remains %lf", action, - GENERIC_ACTION(action).remains); + GENERIC_ACTION(action).remains); } } cpu->last_update = now; @@ -284,8 +285,8 @@ static double cpu_share_resources_lazy(double now) GENERIC_ACTION(action).max_duration; XBT_DEBUG("Action(%p) Start %lf Finish %lf Max_duration %lf", action, - GENERIC_ACTION(action).start, now + value, - GENERIC_ACTION(action).max_duration); + GENERIC_ACTION(action).start, now + value, + GENERIC_ACTION(action).max_duration); if (action->index_heap >= 0) { surf_action_cpu_Cas01_t heap_act = @@ -304,11 +305,15 @@ static double cpu_share_resources_lazy(double now) 0 ? xbt_heap_maxkey(cpu_action_heap) - now : -1; } -static double cpu_share_resources_full(double now) { - surf_action_cpu_Cas01_t action; - return generic_maxmin_share_resources(surf_cpu_model->states.running_action_set, - xbt_swag_offset(*action, generic_lmm_action.variable), - cpu_maxmin_system, lmm_solve); +static double cpu_share_resources_full(double now) +{ + s_surf_action_cpu_Cas01_t action; + return generic_maxmin_share_resources(surf_cpu_model->states. + running_action_set, + xbt_swag_offset(action, + generic_lmm_action. + variable), + cpu_maxmin_system, lmm_solve); } static void cpu_update_actions_state_lazy(double now, double delta) @@ -322,13 +327,15 @@ static void cpu_update_actions_state_lazy(double now, double delta) /* set the remains to 0 due to precision problems when updating the remaining amount */ #ifdef HAVE_TRACING if (TRACE_is_enabled()) { - cpu_Cas01_t cpu = ((cpu_Cas01_t)(action->cpu)); + cpu_Cas01_t cpu = ((cpu_Cas01_t) (action->cpu)); TRACE_surf_host_set_utilization(cpu->generic_resource.name, - GENERIC_LMM_ACTION(action).generic_action.data, - (surf_action_t) action, - lmm_variable_getvalue (GENERIC_LMM_ACTION(action).variable), - cpu->last_update, - now - cpu->last_update); + GENERIC_LMM_ACTION(action). + generic_action.data, + (surf_action_t) action, + lmm_variable_getvalue + (GENERIC_LMM_ACTION(action). + variable), cpu->last_update, + now - cpu->last_update); } #endif GENERIC_ACTION(action).remains = 0; @@ -344,14 +351,14 @@ static void cpu_update_actions_state_lazy(double now, double delta) xbt_lib_cursor_t cursor; char *key; double smaller = -1; - xbt_lib_foreach(host_lib, cursor, key, data){ - if(data[SURF_CPU_LEVEL]){ + xbt_lib_foreach(host_lib, cursor, key, data) { + if (data[SURF_CPU_LEVEL]) { cpu = data[SURF_CPU_LEVEL]; - if (smaller < 0){ + if (smaller < 0) { smaller = cpu->last_update; continue; } - if (cpu->last_update < smaller){ + if (cpu->last_update < smaller) { smaller = cpu->last_update; } } @@ -373,24 +380,28 @@ static void cpu_update_actions_state_full(double now, double delta) #ifdef HAVE_TRACING if (TRACE_is_enabled()) { cpu_Cas01_t x = - lmm_constraint_id(lmm_get_cnst_from_var - (cpu_maxmin_system, GENERIC_LMM_ACTION(action).variable, 0)); + lmm_constraint_id(lmm_get_cnst_from_var + (cpu_maxmin_system, + GENERIC_LMM_ACTION(action).variable, 0)); TRACE_surf_host_set_utilization(x->generic_resource.name, GENERIC_ACTION(action).data, (surf_action_t) action, lmm_variable_getvalue - (GENERIC_LMM_ACTION(action).variable), now - delta, - delta); - TRACE_last_timestamp_to_dump = now-delta; + (GENERIC_LMM_ACTION(action). + variable), now - delta, delta); + TRACE_last_timestamp_to_dump = now - delta; } #endif double_update(&(GENERIC_ACTION(action).remains), - lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable) * delta); - if (GENERIC_LMM_ACTION(action).generic_action.max_duration != NO_MAX_DURATION) + lmm_variable_getvalue(GENERIC_LMM_ACTION(action). + variable) * delta); + if (GENERIC_LMM_ACTION(action).generic_action.max_duration != + NO_MAX_DURATION) double_update(&(GENERIC_ACTION(action).max_duration), delta); if ((GENERIC_ACTION(action).remains <= 0) && - (lmm_get_variable_weight(GENERIC_LMM_ACTION(action).variable) > 0)) { + (lmm_get_variable_weight(GENERIC_LMM_ACTION(action).variable) > + 0)) { GENERIC_ACTION(action).finish = surf_get_clock(); cpu_cpu_action_state_set((surf_action_t) action, SURF_ACTION_DONE); } else if ((GENERIC_ACTION(action).max_duration != NO_MAX_DURATION) && @@ -404,8 +415,8 @@ static void cpu_update_actions_state_full(double now, double delta) } static void cpu_update_resource_state(void *id, - tmgr_trace_event_t event_type, - double value, double date) + tmgr_trace_event_t event_type, + double value, double date) { cpu_Cas01_t cpu = id; lmm_variable_t var = NULL; @@ -414,18 +425,21 @@ static void cpu_update_resource_state(void *id, if (event_type == cpu->power_event) { cpu->power_scale = value; lmm_update_constraint_bound(cpu_maxmin_system, cpu->constraint, - cpu->core * 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->core * 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, GENERIC_LMM_ACTION(action).variable, - cpu->power_scale * cpu->power_peak); + surf_action_cpu_Cas01_t action = lmm_variable_id(var); + lmm_update_variable_bound(cpu_maxmin_system, + GENERIC_LMM_ACTION(action).variable, + cpu->power_scale * cpu->power_peak); } - if(cpu_update_mechanism == UM_LAZY) + if (cpu_update_mechanism == UM_LAZY) xbt_swag_insert(cpu, cpu_modified_cpu); if (tmgr_trace_event_free(event_type)) cpu->power_event = NULL; @@ -434,13 +448,10 @@ static void cpu_update_resource_state(void *id, cpu->state_current = SURF_RESOURCE_ON; else { lmm_constraint_t cnst = cpu->constraint; - lmm_variable_t var = NULL; - lmm_element_t elem = NULL; cpu->state_current = SURF_RESOURCE_OFF; - while ((var = - lmm_get_var_from_cnst(cpu_maxmin_system, cnst, &elem))) { + while ((var = lmm_get_var_from_cnst(cpu_maxmin_system, cnst, &elem))) { surf_action_t action = lmm_variable_id(var); if (surf_action_state_get(action) == SURF_ACTION_RUNNING || @@ -478,8 +489,9 @@ static surf_action_t cpu_execute(void *cpu, double size) GENERIC_LMM_ACTION(action).variable = lmm_variable_new(cpu_maxmin_system, action, - GENERIC_ACTION(action).priority, CPU->power_scale * CPU->power_peak, 1); - if(cpu_update_mechanism == UM_LAZY){ + GENERIC_ACTION(action).priority, + CPU->power_scale * CPU->power_peak, 1); + if (cpu_update_mechanism == UM_LAZY) { action->index_heap = -1; action->cpu = CPU; xbt_swag_insert(CPU, cpu_modified_cpu); @@ -513,7 +525,7 @@ static surf_action_t cpu_action_sleep(void *cpu, double duration) lmm_update_variable_weight(cpu_maxmin_system, GENERIC_LMM_ACTION(action).variable, 0.0); - if(cpu_update_mechanism == UM_LAZY) + if (cpu_update_mechanism == UM_LAZY) xbt_swag_insert(cpu, cpu_modified_cpu); XBT_OUT(); return (surf_action_t) action; @@ -527,7 +539,7 @@ static void cpu_action_suspend(surf_action_t action) ((surf_action_lmm_t) action)->variable, 0.0); ((surf_action_lmm_t) action)->suspended = 1; - if(cpu_update_mechanism == UM_LAZY){ + if (cpu_update_mechanism == UM_LAZY) { xbt_heap_remove(cpu_action_heap, ((surf_action_cpu_Cas01_t) action)->index_heap); xbt_swag_insert(ACTION_GET_CPU(action), cpu_modified_cpu); @@ -545,7 +557,7 @@ static void cpu_action_resume(surf_action_t action) ((surf_action_lmm_t) action)->variable, action->priority); ((surf_action_lmm_t) action)->suspended = 0; - if(cpu_update_mechanism == UM_LAZY) + if (cpu_update_mechanism == UM_LAZY) xbt_swag_insert(ACTION_GET_CPU(action), cpu_modified_cpu); } XBT_OUT(); @@ -557,19 +569,18 @@ static int cpu_action_is_suspended(surf_action_t action) } static void cpu_action_set_max_duration(surf_action_t action, - double duration) + double duration) { XBT_IN("(%p,%g)", action, duration); action->max_duration = duration; /* insert cpu in modified_cpu set to notice the max duration change */ - if(cpu_update_mechanism == UM_LAZY) + if (cpu_update_mechanism == UM_LAZY) xbt_swag_insert(ACTION_GET_CPU(action), cpu_modified_cpu); XBT_OUT(); } -static void cpu_action_set_priority(surf_action_t action, - double priority) +static void cpu_action_set_priority(surf_action_t action, double priority) { XBT_IN("(%p,%g)", action, priority); action->priority = priority; @@ -577,17 +588,17 @@ static void cpu_action_set_priority(surf_action_t action, ((surf_action_lmm_t) action)->variable, priority); - if(cpu_update_mechanism == UM_LAZY) + if (cpu_update_mechanism == UM_LAZY) xbt_swag_insert(ACTION_GET_CPU(action), cpu_modified_cpu); XBT_OUT(); } #ifdef HAVE_TRACING static void cpu_action_set_category(surf_action_t action, - const char *category) + const char *category) { XBT_IN("(%p,%s)", action, category); - action->category = xbt_strdup (category); + action->category = xbt_strdup(category); XBT_OUT(); } #endif @@ -596,7 +607,7 @@ static double cpu_action_get_remains(surf_action_t action) { XBT_IN("(%p)", action); /* update remains before return it */ - if(cpu_update_mechanism == UM_LAZY) + if (cpu_update_mechanism == UM_LAZY) cpu_update_remains(ACTION_GET_CPU(action), surf_get_clock()); XBT_OUT(); return action->remains; @@ -629,11 +640,10 @@ static void cpu_finalize(void) xbt_lib_cursor_t cursor; char *key; - xbt_lib_foreach(host_lib, cursor, key, cpu){ - if(cpu[SURF_CPU_LEVEL]) - { - cpu_Cas01_t CPU = cpu[SURF_CPU_LEVEL]; - xbt_swag_free(CPU->action_set); + xbt_lib_foreach(host_lib, cursor, key, cpu) { + if (cpu[SURF_CPU_LEVEL]) { + cpu_Cas01_t CPU = cpu[SURF_CPU_LEVEL]; + xbt_swag_free(CPU->action_set); } } @@ -643,11 +653,12 @@ static void cpu_finalize(void) surf_model_exit(surf_cpu_model); surf_cpu_model = NULL; - xbt_swag_free - (cpu_running_action_set_that_does_not_need_being_checked); + xbt_swag_free(cpu_running_action_set_that_does_not_need_being_checked); cpu_running_action_set_that_does_not_need_being_checked = NULL; - if(cpu_action_heap) xbt_heap_free(cpu_action_heap); - if(cpu_modified_cpu) xbt_swag_free(cpu_modified_cpu); + if (cpu_action_heap) + xbt_heap_free(cpu_action_heap); + if (cpu_modified_cpu) + xbt_swag_free(cpu_modified_cpu); } static void surf_cpu_model_init_internal() @@ -668,12 +679,16 @@ static void surf_cpu_model_init_internal() surf_cpu_model->model_private->resource_used = cpu_resource_used; - if(cpu_update_mechanism == UM_LAZY) { - surf_cpu_model->model_private->share_resources = cpu_share_resources_lazy; - surf_cpu_model->model_private->update_actions_state = cpu_update_actions_state_lazy; + if (cpu_update_mechanism == UM_LAZY) { + surf_cpu_model->model_private->share_resources = + cpu_share_resources_lazy; + surf_cpu_model->model_private->update_actions_state = + cpu_update_actions_state_lazy; } else if (cpu_update_mechanism == UM_FULL) { - surf_cpu_model->model_private->share_resources = cpu_share_resources_full; - surf_cpu_model->model_private->update_actions_state = cpu_update_actions_state_full; + surf_cpu_model->model_private->share_resources = + cpu_share_resources_full; + surf_cpu_model->model_private->update_actions_state = + cpu_update_actions_state_full; } else xbt_die("Invalid update mechanism!"); @@ -704,7 +719,7 @@ static void surf_cpu_model_init_internal() if (!cpu_maxmin_system) { cpu_maxmin_system = lmm_system_new(cpu_selective_update); } - if(cpu_update_mechanism == UM_LAZY){ + if (cpu_update_mechanism == UM_LAZY) { cpu_action_heap = xbt_heap_new(8, NULL); xbt_heap_set_update_callback(cpu_action_heap, cpu_action_update_index_heap); @@ -732,21 +747,25 @@ static void surf_cpu_model_init_internal() void surf_cpu_model_init_Cas01() { char *optim = xbt_cfg_get_string(_surf_cfg_set, "cpu/optim"); - int select = xbt_cfg_get_int(_surf_cfg_set, "cpu/maxmin_selective_update"); + int select = + xbt_cfg_get_int(_surf_cfg_set, "cpu/maxmin_selective_update"); - if(!strcmp(optim,"Full")) { + if (!strcmp(optim, "Full")) { cpu_update_mechanism = UM_FULL; cpu_selective_update = select; - } else if (!strcmp(optim,"Lazy")) { + } else if (!strcmp(optim, "Lazy")) { cpu_update_mechanism = UM_LAZY; cpu_selective_update = 1; - xbt_assert((select==1) || (xbt_cfg_is_default_value(_surf_cfg_set,"cpu/maxmin_selective_update")), - "Disabling selective update while using the lazy update mechanism is dumb!"); - } else if (!strcmp(optim,"TI")) { + xbt_assert((select == 1) + || + (xbt_cfg_is_default_value + (_surf_cfg_set, "cpu/maxmin_selective_update")), + "Disabling selective update while using the lazy update mechanism is dumb!"); + } else if (!strcmp(optim, "TI")) { surf_cpu_model_init_ti(); return; } else { - xbt_die("Unsupported optimization (%s) for this model",optim); + xbt_die("Unsupported optimization (%s) for this model", optim); } if (surf_cpu_model)