From: Navarrop Date: Mon, 12 Dec 2011 11:48:56 +0000 (+0100) Subject: Cleanup (no more _im_ but lazy or full when needed). X-Git-Tag: exp_20120216~237^2~30 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/7f4f93e9424b1a3923cb0b39863532ad601f4e74 Cleanup (no more _im_ but lazy or full when needed). --- diff --git a/src/surf/cpu_cas01.c b/src/surf/cpu_cas01.c index 74815e37a9..59c93c9392 100644 --- a/src/surf/cpu_cas01.c +++ b/src/surf/cpu_cas01.c @@ -9,23 +9,26 @@ surf_model_t surf_cpu_model = NULL; lmm_system_t cpu_maxmin_system = NULL; -e_UM_t cpu_update_mechanism = UM_FULL; +e_UM_t cpu_update_mechanism = UM_UNDEFINED; +static xbt_swag_t cpu_modified_cpu = NULL; +static xbt_heap_t cpu_action_heap = NULL; +extern int sg_maxmin_selective_update; #undef GENERIC_LMM_ACTION #undef GENERIC_ACTION #undef ACTION_GET_CPU #define GENERIC_LMM_ACTION(action) action->generic_lmm_action #define GENERIC_ACTION(action) GENERIC_LMM_ACTION(action).generic_action -#define ACTION_GET_CPU(action) ((surf_action_cpu_Cas01_im_t) action)->cpu +#define ACTION_GET_CPU(action) ((surf_action_cpu_Cas01_t) action)->cpu -typedef struct surf_action_cpu_cas01_im { +typedef struct surf_action_cpu_cas01 { s_surf_action_lmm_t generic_lmm_action; s_xbt_swag_hookup_t cpu_list_hookup; int index_heap; void *cpu; -} s_surf_action_cpu_Cas01_im_t, *surf_action_cpu_Cas01_im_t; +} s_surf_action_cpu_Cas01_t, *surf_action_cpu_Cas01_t; -typedef struct cpu_Cas01_im { +typedef struct cpu_Cas01 { s_surf_resource_t generic_resource; s_xbt_swag_hookup_t modified_cpu_hookup; double power_peak; @@ -37,21 +40,17 @@ typedef struct cpu_Cas01_im { lmm_constraint_t constraint; xbt_swag_t action_set; double last_update; -} s_cpu_Cas01_im_t, *cpu_Cas01_im_t; +} s_cpu_Cas01_t, *cpu_Cas01_t; -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_im, surf, +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu, surf, "Logging specific to the SURF CPU IMPROVED module"); -lmm_system_t cpu_im_maxmin_system = NULL; -static xbt_swag_t cpu_im_modified_cpu = NULL; -static xbt_heap_t cpu_im_action_heap = NULL; -extern int sg_maxmin_selective_update; static xbt_swag_t - cpu_im_running_action_set_that_does_not_need_being_checked = NULL; + cpu_running_action_set_that_does_not_need_being_checked = NULL; -static void* cpu_im_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, @@ -59,13 +58,13 @@ static void* cpu_im_create_resource(const char *name, double power_peak, tmgr_trace_t state_trace, xbt_dict_t cpu_properties) { - cpu_Cas01_im_t cpu = NULL; - s_surf_action_cpu_Cas01_im_t action; + cpu_Cas01_t cpu = NULL; + 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); - cpu = (cpu_Cas01_im_t) surf_resource_new(sizeof(s_cpu_Cas01_im_t), + cpu = (cpu_Cas01_t) surf_resource_new(sizeof(s_cpu_Cas01_t), surf_cpu_model, name,cpu_properties); cpu->power_peak = power_peak; xbt_assert(cpu->power_peak > 0, "Power has to be >0"); @@ -83,7 +82,7 @@ static void* cpu_im_create_resource(const char *name, double power_peak, tmgr_history_add_trace(history, state_trace, 0.0, 0, cpu); cpu->constraint = - lmm_constraint_new(cpu_im_maxmin_system, cpu, + lmm_constraint_new(cpu_maxmin_system, cpu, cpu->core * cpu->power_scale * cpu->power_peak); xbt_lib_set(host_lib, name, SURF_CPU_LEVEL, cpu); @@ -94,9 +93,9 @@ static void* cpu_im_create_resource(const char *name, double power_peak, } -static void parse_cpu_im_init(sg_platf_host_cbarg_t host) +static void parse_cpu_init(sg_platf_host_cbarg_t host) { - cpu_im_create_resource(host->id, + cpu_create_resource(host->id, host->power_peak, host->power_scale, host->power_trace, @@ -106,7 +105,7 @@ static void parse_cpu_im_init(sg_platf_host_cbarg_t host) host->properties); } -static void cpu_im_add_traces_cpu(void) +static void cpu_add_traces_cpu(void) { xbt_dict_cursor_t cursor = NULL; char *trace_name, *elm; @@ -118,7 +117,7 @@ static void cpu_im_add_traces_cpu(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_Cas01_im_t host = surf_cpu_resource_by_name(elm); + cpu_Cas01_t host = surf_cpu_resource_by_name(elm); xbt_assert(host, "Host %s undefined", elm); xbt_assert(trace, "Trace %s undefined", trace_name); @@ -129,7 +128,7 @@ static void cpu_im_add_traces_cpu(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_Cas01_im_t host = surf_cpu_resource_by_name(elm); + cpu_Cas01_t host = surf_cpu_resource_by_name(elm); xbt_assert(host, "Host %s undefined", elm); xbt_assert(trace, "Trace %s undefined", trace_name); @@ -139,33 +138,33 @@ static void cpu_im_add_traces_cpu(void) } } -static void cpu_im_define_callbacks() +static void cpu_define_callbacks() { - sg_platf_host_add_cb(parse_cpu_im_init); - sg_platf_postparse_add_cb(cpu_im_add_traces_cpu); + sg_platf_host_add_cb(parse_cpu_init); + sg_platf_postparse_add_cb(cpu_add_traces_cpu); } -static int cpu_im_resource_used(void *resource) +static int cpu_resource_used(void *resource) { - return lmm_constraint_used(cpu_im_maxmin_system, - ((cpu_Cas01_im_t) resource)->constraint); + return lmm_constraint_used(cpu_maxmin_system, + ((cpu_Cas01_t) resource)->constraint); } -static int cpu_im_action_unref(surf_action_t action) +static int cpu_action_unref(surf_action_t action) { action->refcount--; if (!action->refcount) { xbt_swag_remove(action, action->state_set); if (((surf_action_lmm_t) action)->variable) - lmm_variable_free(cpu_im_maxmin_system, + 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_im_action_heap, - ((surf_action_cpu_Cas01_im_t) action)->index_heap); + xbt_heap_remove(cpu_action_heap, + ((surf_action_cpu_Cas01_t) action)->index_heap); xbt_swag_remove(action, - ((cpu_Cas01_im_t) ACTION_GET_CPU(action))->action_set); - xbt_swag_insert(ACTION_GET_CPU(action), cpu_im_modified_cpu); + ((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); @@ -176,24 +175,24 @@ static int cpu_im_action_unref(surf_action_t action) return 0; } -static void cpu_im_action_cancel(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_im_action_heap, - ((surf_action_cpu_Cas01_im_t) action)->index_heap); + xbt_heap_remove(cpu_action_heap, + ((surf_action_cpu_Cas01_t) action)->index_heap); xbt_swag_remove(action, - ((cpu_Cas01_im_t) ACTION_GET_CPU(action))->action_set); + ((cpu_Cas01_t) ACTION_GET_CPU(action))->action_set); } return; } -static void cpu_im_cpu_action_state_set(surf_action_t action, +static void cpu_cpu_action_state_set(surf_action_t action, e_surf_action_state_t state) { /* if((state==SURF_ACTION_DONE) || (state==SURF_ACTION_FAILED)) */ /* if(((surf_action_lmm_t)action)->variable) { */ -/* lmm_variable_disable(cpu_im_maxmin_system, ((surf_action_lmm_t)action)->variable); */ +/* lmm_variable_disable(cpu_maxmin_system, ((surf_action_lmm_t)action)->variable); */ /* ((surf_action_lmm_t)action)->variable = NULL; */ /* } */ @@ -201,9 +200,9 @@ static void cpu_im_cpu_action_state_set(surf_action_t action, return; } -static void cpu_im_update_remains(cpu_Cas01_im_t cpu, double now) +static void cpu_update_remains(cpu_Cas01_t cpu, double now) { - surf_action_cpu_Cas01_im_t action; + surf_action_cpu_Cas01_t action; if (cpu->last_update >= now) return; @@ -241,19 +240,19 @@ static void cpu_im_update_remains(cpu_Cas01_im_t cpu, double now) cpu->last_update = now; } -static double cpu_im_share_resources(double now) +static double cpu_share_resources_lazy(double now) { - surf_action_cpu_Cas01_im_t action; + surf_action_cpu_Cas01_t action; double min; double value; - cpu_Cas01_im_t cpu, cpu_next; + cpu_Cas01_t cpu, cpu_next; - xbt_swag_foreach(cpu, cpu_im_modified_cpu) - cpu_im_update_remains(cpu, now); + xbt_swag_foreach(cpu, cpu_modified_cpu) + cpu_update_remains(cpu, now); - lmm_solve(cpu_im_maxmin_system); + lmm_solve(cpu_maxmin_system); - xbt_swag_foreach_safe(cpu, cpu_next, cpu_im_modified_cpu) { + xbt_swag_foreach_safe(cpu, cpu_next, cpu_modified_cpu) { xbt_swag_foreach(action, cpu->action_set) { if (GENERIC_ACTION(action).state_set != surf_cpu_model->states.running_action_set) @@ -288,34 +287,34 @@ static double cpu_im_share_resources(double now) GENERIC_ACTION(action).max_duration); if (action->index_heap >= 0) { - surf_action_cpu_Cas01_im_t heap_act = - xbt_heap_remove(cpu_im_action_heap, action->index_heap); + surf_action_cpu_Cas01_t heap_act = + xbt_heap_remove(cpu_action_heap, action->index_heap); if (heap_act != action) DIE_IMPOSSIBLE; } if (min != -1) { - xbt_heap_push(cpu_im_action_heap, action, min); + xbt_heap_push(cpu_action_heap, action, min); XBT_DEBUG("Insert at heap action(%p) min %lf", action, min); } } - xbt_swag_remove(cpu, cpu_im_modified_cpu); + xbt_swag_remove(cpu, cpu_modified_cpu); } - return xbt_heap_size(cpu_im_action_heap) > - 0 ? xbt_heap_maxkey(cpu_im_action_heap) - now : -1; + return xbt_heap_size(cpu_action_heap) > + 0 ? xbt_heap_maxkey(cpu_action_heap) - now : -1; } -static void cpu_im_update_actions_state(double now, double delta) +static void cpu_update_actions_state_lazy(double now, double delta) { - surf_action_cpu_Cas01_im_t action; - while ((xbt_heap_size(cpu_im_action_heap) > 0) - && (double_equals(xbt_heap_maxkey(cpu_im_action_heap), now))) { - action = xbt_heap_pop(cpu_im_action_heap); + surf_action_cpu_Cas01_t action; + while ((xbt_heap_size(cpu_action_heap) > 0) + && (double_equals(xbt_heap_maxkey(cpu_action_heap), now))) { + action = xbt_heap_pop(cpu_action_heap); XBT_DEBUG("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 */ #ifdef HAVE_TRACING if (TRACE_is_enabled()) { - cpu_Cas01_im_t cpu = ((cpu_Cas01_im_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, @@ -325,15 +324,15 @@ static void cpu_im_update_actions_state(double now, double delta) } #endif GENERIC_ACTION(action).remains = 0; - cpu_im_cpu_action_state_set((surf_action_t) action, SURF_ACTION_DONE); - cpu_im_update_remains(action->cpu, surf_get_clock()); + cpu_cpu_action_state_set((surf_action_t) action, SURF_ACTION_DONE); + cpu_update_remains(action->cpu, surf_get_clock()); } #ifdef HAVE_TRACING if (TRACE_is_enabled()) { //defining the last timestamp that we can safely dump to trace file //without losing the event ascending order (considering all CPU's) void **data; - cpu_Cas01_im_t cpu; + cpu_Cas01_t cpu; xbt_lib_cursor_t cursor; char *key; double smaller = -1; @@ -357,30 +356,30 @@ static void cpu_im_update_actions_state(double now, double delta) return; } -static void cpu_im_update_resource_state(void *id, +static void cpu_update_resource_state(void *id, tmgr_trace_event_t event_type, double value, double date) { - cpu_Cas01_im_t cpu = id; + cpu_Cas01_t cpu = id; lmm_variable_t var = NULL; lmm_element_t elem = NULL; if (event_type == cpu->power_event) { cpu->power_scale = value; - lmm_update_constraint_bound(cpu_im_maxmin_system, cpu->constraint, + lmm_update_constraint_bound(cpu_maxmin_system, cpu->constraint, 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); #endif while ((var = lmm_get_var_from_cnst - (cpu_im_maxmin_system, cpu->constraint, &elem))) { - surf_action_cpu_Cas01_im_t action = lmm_variable_id(var); - lmm_update_variable_bound(cpu_im_maxmin_system, GENERIC_LMM_ACTION(action).variable, + (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); } if(cpu_update_mechanism == UM_LAZY) - xbt_swag_insert(cpu, cpu_im_modified_cpu); + xbt_swag_insert(cpu, cpu_modified_cpu); if (tmgr_trace_event_free(event_type)) cpu->power_event = NULL; } else if (event_type == cpu->state_event) { @@ -394,7 +393,7 @@ static void cpu_im_update_resource_state(void *id, cpu->state_current = SURF_RESOURCE_OFF; while ((var = - lmm_get_var_from_cnst(cpu_im_maxmin_system, cnst, &elem))) { + 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 || @@ -402,7 +401,7 @@ static void cpu_im_update_resource_state(void *id, surf_action_state_get(action) == SURF_ACTION_NOT_IN_THE_SYSTEM) { action->finish = date; - cpu_im_cpu_action_state_set(action, SURF_ACTION_FAILED); + cpu_cpu_action_state_set(action, SURF_ACTION_FAILED); } } } @@ -416,14 +415,14 @@ static void cpu_im_update_resource_state(void *id, return; } -static surf_action_t cpu_im_execute(void *cpu, double size) +static surf_action_t cpu_execute(void *cpu, double size) { - surf_action_cpu_Cas01_im_t action = NULL; - cpu_Cas01_im_t CPU = cpu; + surf_action_cpu_Cas01_t action = NULL; + cpu_Cas01_t CPU = cpu; XBT_IN("(%s,%g)", surf_resource_name(CPU), size); action = - surf_action_new(sizeof(s_surf_action_cpu_Cas01_im_t), size, + surf_action_new(sizeof(s_surf_action_cpu_Cas01_t), size, surf_cpu_model, CPU->state_current != SURF_RESOURCE_ON); @@ -431,29 +430,29 @@ static surf_action_t cpu_im_execute(void *cpu, double size) calloc but it seems to help valgrind... */ GENERIC_LMM_ACTION(action).variable = - lmm_variable_new(cpu_im_maxmin_system, action, + lmm_variable_new(cpu_maxmin_system, action, 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_im_modified_cpu); + xbt_swag_insert(CPU, cpu_modified_cpu); xbt_swag_insert(action, CPU->action_set); } - lmm_expand(cpu_im_maxmin_system, CPU->constraint, + lmm_expand(cpu_maxmin_system, CPU->constraint, GENERIC_LMM_ACTION(action).variable, 1.0); XBT_OUT(); return (surf_action_t) action; } -static surf_action_t cpu_im_action_sleep(void *cpu, double duration) +static surf_action_t cpu_action_sleep(void *cpu, double duration) { - surf_action_cpu_Cas01_im_t action = NULL; + surf_action_cpu_Cas01_t action = NULL; if (duration > 0) duration = MAX(duration, MAXMIN_PRECISION); XBT_IN("(%s,%g)", surf_resource_name(cpu), duration); - action = (surf_action_cpu_Cas01_im_t) cpu_im_execute(cpu, 1.0); + action = (surf_action_cpu_Cas01_t) cpu_execute(cpu, 1.0); GENERIC_ACTION(action).max_duration = duration; GENERIC_LMM_ACTION(action).suspended = 2; if (duration == NO_MAX_DURATION) { @@ -461,56 +460,56 @@ static surf_action_t cpu_im_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 = - cpu_im_running_action_set_that_does_not_need_being_checked; + cpu_running_action_set_that_does_not_need_being_checked; xbt_swag_insert(action, ((surf_action_t) action)->state_set); } - lmm_update_variable_weight(cpu_im_maxmin_system, + lmm_update_variable_weight(cpu_maxmin_system, GENERIC_LMM_ACTION(action).variable, 0.0); if(cpu_update_mechanism == UM_LAZY) - xbt_swag_insert(cpu, cpu_im_modified_cpu); + xbt_swag_insert(cpu, cpu_modified_cpu); XBT_OUT(); return (surf_action_t) action; } -static void cpu_im_action_suspend(surf_action_t action) +static void cpu_action_suspend(surf_action_t action) { XBT_IN("(%p)", action); if (((surf_action_lmm_t) action)->suspended != 2) { - lmm_update_variable_weight(cpu_im_maxmin_system, + lmm_update_variable_weight(cpu_maxmin_system, ((surf_action_lmm_t) action)->variable, 0.0); ((surf_action_lmm_t) action)->suspended = 1; if(cpu_update_mechanism == UM_LAZY){ - xbt_heap_remove(cpu_im_action_heap, - ((surf_action_cpu_Cas01_im_t) action)->index_heap); - xbt_swag_insert(ACTION_GET_CPU(action), cpu_im_modified_cpu); + xbt_heap_remove(cpu_action_heap, + ((surf_action_cpu_Cas01_t) action)->index_heap); + xbt_swag_insert(ACTION_GET_CPU(action), cpu_modified_cpu); } } XBT_OUT(); } -static void cpu_im_action_resume(surf_action_t action) +static void cpu_action_resume(surf_action_t action) { XBT_IN("(%p)", action); if (((surf_action_lmm_t) action)->suspended != 2) { - lmm_update_variable_weight(cpu_im_maxmin_system, + lmm_update_variable_weight(cpu_maxmin_system, ((surf_action_lmm_t) action)->variable, action->priority); ((surf_action_lmm_t) action)->suspended = 0; if(cpu_update_mechanism == UM_LAZY) - xbt_swag_insert(ACTION_GET_CPU(action), cpu_im_modified_cpu); + xbt_swag_insert(ACTION_GET_CPU(action), cpu_modified_cpu); } XBT_OUT(); } -static int cpu_im_action_is_suspended(surf_action_t action) +static int cpu_action_is_suspended(surf_action_t action) { return (((surf_action_lmm_t) action)->suspended == 1); } -static void cpu_im_action_set_max_duration(surf_action_t action, +static void cpu_action_set_max_duration(surf_action_t action, double duration) { XBT_IN("(%p,%g)", action, duration); @@ -518,26 +517,26 @@ static void cpu_im_action_set_max_duration(surf_action_t action, action->max_duration = duration; /* insert cpu in modified_cpu set to notice the max duration change */ if(cpu_update_mechanism == UM_LAZY) - xbt_swag_insert(ACTION_GET_CPU(action), cpu_im_modified_cpu); + xbt_swag_insert(ACTION_GET_CPU(action), cpu_modified_cpu); XBT_OUT(); } -static void cpu_im_action_set_priority(surf_action_t action, +static void cpu_action_set_priority(surf_action_t action, double priority) { XBT_IN("(%p,%g)", action, priority); action->priority = priority; - lmm_update_variable_weight(cpu_im_maxmin_system, + lmm_update_variable_weight(cpu_maxmin_system, ((surf_action_lmm_t) action)->variable, priority); if(cpu_update_mechanism == UM_LAZY) - xbt_swag_insert(ACTION_GET_CPU(action), cpu_im_modified_cpu); + xbt_swag_insert(ACTION_GET_CPU(action), cpu_modified_cpu); XBT_OUT(); } #ifdef HAVE_TRACING -static void cpu_im_action_set_category(surf_action_t action, +static void cpu_action_set_category(surf_action_t action, const char *category) { XBT_IN("(%p,%s)", action, category); @@ -546,38 +545,38 @@ static void cpu_im_action_set_category(surf_action_t action, } #endif -static double cpu_im_action_get_remains(surf_action_t action) +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) - cpu_im_update_remains(ACTION_GET_CPU(action), surf_get_clock()); + cpu_update_remains(ACTION_GET_CPU(action), surf_get_clock()); return action->remains; XBT_OUT(); } -static e_surf_resource_state_t cpu_im_get_state(void *cpu) +static e_surf_resource_state_t cpu_get_state(void *cpu) { - return ((cpu_Cas01_im_t) cpu)->state_current; + return ((cpu_Cas01_t) cpu)->state_current; } -static double cpu_im_get_speed(void *cpu, double load) +static double cpu_get_speed(void *cpu, double load) { - return load * (((cpu_Cas01_im_t) cpu)->power_peak); + return load * (((cpu_Cas01_t) cpu)->power_peak); } -static double cpu_im_get_available_speed(void *cpu) +static double cpu_get_available_speed(void *cpu) { /* number between 0 and 1 */ - return ((cpu_Cas01_im_t) cpu)->power_scale; + return ((cpu_Cas01_t) cpu)->power_scale; } -static void cpu_im_action_update_index_heap(void *action, int i) +static void cpu_action_update_index_heap(void *action, int i) { - ((surf_action_cpu_Cas01_im_t) action)->index_heap = i; + ((surf_action_cpu_Cas01_t) action)->index_heap = i; } -static void cpu_im_finalize(void) +static void cpu_finalize(void) { void **cpu; xbt_lib_cursor_t cursor; @@ -586,77 +585,77 @@ static void cpu_im_finalize(void) xbt_lib_foreach(host_lib, cursor, key, cpu){ if(cpu[SURF_CPU_LEVEL]) { - cpu_Cas01_im_t CPU = cpu[SURF_CPU_LEVEL]; + cpu_Cas01_t CPU = cpu[SURF_CPU_LEVEL]; xbt_swag_free(CPU->action_set); } } - lmm_system_free(cpu_im_maxmin_system); - cpu_im_maxmin_system = NULL; + lmm_system_free(cpu_maxmin_system); + cpu_maxmin_system = NULL; surf_model_exit(surf_cpu_model); surf_cpu_model = NULL; xbt_swag_free - (cpu_im_running_action_set_that_does_not_need_being_checked); - cpu_im_running_action_set_that_does_not_need_being_checked = NULL; - if(cpu_im_action_heap) xbt_heap_free(cpu_im_action_heap); - if(cpu_im_modified_cpu) xbt_swag_free(cpu_im_modified_cpu); + (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); } -static void surf_cpu_im_model_init_internal(const char* name) +static void surf_cpu_model_init_internal(const char* name) { s_surf_action_t action; - s_cpu_Cas01_im_t cpu; + s_cpu_Cas01_t cpu; surf_cpu_model = surf_model_init(); - cpu_im_running_action_set_that_does_not_need_being_checked = + cpu_running_action_set_that_does_not_need_being_checked = xbt_swag_new(xbt_swag_offset(action, state_hookup)); surf_cpu_model->name = name; - surf_cpu_model->action_unref = cpu_im_action_unref; - surf_cpu_model->action_cancel = cpu_im_action_cancel; - surf_cpu_model->action_state_set = cpu_im_cpu_action_state_set; + surf_cpu_model->action_unref = cpu_action_unref; + surf_cpu_model->action_cancel = cpu_action_cancel; + surf_cpu_model->action_state_set = cpu_cpu_action_state_set; - surf_cpu_model->model_private->resource_used = cpu_im_resource_used; + surf_cpu_model->model_private->resource_used = cpu_resource_used; surf_cpu_model->model_private->share_resources = generic_share_resources; surf_cpu_model->model_private->update_actions_state = - generic_update_actions_state;//ok + generic_update_actions_state; surf_cpu_model->model_private->update_resource_state = - cpu_im_update_resource_state;//ok - surf_cpu_model->model_private->finalize = cpu_im_finalize; - - surf_cpu_model->suspend = cpu_im_action_suspend; - surf_cpu_model->resume = cpu_im_action_resume; - surf_cpu_model->is_suspended = cpu_im_action_is_suspended; - surf_cpu_model->set_max_duration = cpu_im_action_set_max_duration; - surf_cpu_model->set_priority = cpu_im_action_set_priority; + cpu_update_resource_state; + surf_cpu_model->model_private->finalize = cpu_finalize; + + surf_cpu_model->suspend = cpu_action_suspend; + surf_cpu_model->resume = cpu_action_resume; + surf_cpu_model->is_suspended = cpu_action_is_suspended; + surf_cpu_model->set_max_duration = cpu_action_set_max_duration; + surf_cpu_model->set_priority = cpu_action_set_priority; #ifdef HAVE_TRACING - surf_cpu_model->set_category = cpu_im_action_set_category; + surf_cpu_model->set_category = cpu_action_set_category; #endif - surf_cpu_model->get_remains = cpu_im_action_get_remains; + surf_cpu_model->get_remains = cpu_action_get_remains; - surf_cpu_model->extension.cpu.execute = cpu_im_execute; - surf_cpu_model->extension.cpu.sleep = cpu_im_action_sleep; + surf_cpu_model->extension.cpu.execute = cpu_execute; + surf_cpu_model->extension.cpu.sleep = cpu_action_sleep; - surf_cpu_model->extension.cpu.get_state = cpu_im_get_state; - surf_cpu_model->extension.cpu.get_speed = cpu_im_get_speed; + surf_cpu_model->extension.cpu.get_state = cpu_get_state; + surf_cpu_model->extension.cpu.get_speed = cpu_get_speed; surf_cpu_model->extension.cpu.get_available_speed = - cpu_im_get_available_speed; - surf_cpu_model->extension.cpu.create_resource = cpu_im_create_resource; - surf_cpu_model->extension.cpu.add_traces = cpu_im_add_traces_cpu; + cpu_get_available_speed; + surf_cpu_model->extension.cpu.create_resource = cpu_create_resource; + surf_cpu_model->extension.cpu.add_traces = cpu_add_traces_cpu; - if (!cpu_im_maxmin_system) { + if (!cpu_maxmin_system) { sg_maxmin_selective_update = 1; - cpu_im_maxmin_system = lmm_system_new(); + cpu_maxmin_system = lmm_system_new(); } if(cpu_update_mechanism == UM_LAZY){ - cpu_im_action_heap = xbt_heap_new(8, NULL); - xbt_heap_set_update_callback(cpu_im_action_heap, - cpu_im_action_update_index_heap); - cpu_im_modified_cpu = + cpu_action_heap = xbt_heap_new(8, NULL); + xbt_heap_set_update_callback(cpu_action_heap, + cpu_action_update_index_heap); + cpu_modified_cpu = xbt_swag_new(xbt_swag_offset(cpu, modified_cpu_hookup)); } } @@ -701,36 +700,35 @@ void surf_cpu_model_init_Cas01() if (surf_cpu_model) return; - surf_cpu_im_model_init_internal("CPU"); - cpu_im_define_callbacks(); + surf_cpu_model_init_internal("CPU"); + cpu_define_callbacks(); xbt_dynar_push(model_list, &surf_cpu_model); } double generic_share_resources(double now) { - surf_action_cpu_Cas01_im_t action; + surf_action_cpu_Cas01_t action; if(cpu_update_mechanism == UM_LAZY) - return cpu_im_share_resources(now); + return cpu_share_resources_lazy(now); else if (cpu_update_mechanism == UM_FULL) - { return generic_maxmin_share_resources(surf_cpu_model->states.running_action_set, xbt_swag_offset(*action, generic_lmm_action.variable), - cpu_im_maxmin_system, lmm_solve); - } else { + cpu_maxmin_system, lmm_solve); + else xbt_die("Invalide update mechanism!"); - return 0; - } + + return 0; } -static void cpu_update_actions_state(double now, double delta) +static void cpu_update_actions_state_full(double now, double delta) { - surf_action_cpu_Cas01_im_t action = NULL; - surf_action_cpu_Cas01_im_t next_action = NULL; + surf_action_cpu_Cas01_t action = NULL; + surf_action_cpu_Cas01_t next_action = NULL; xbt_swag_t running_actions = surf_cpu_model->states.running_action_set; xbt_swag_foreach_safe(action, next_action, running_actions) { #ifdef HAVE_TRACING if (TRACE_is_enabled()) { - cpu_Cas01_im_t x = + cpu_Cas01_t x = lmm_constraint_id(lmm_get_cnst_from_var (cpu_maxmin_system, GENERIC_LMM_ACTION(action).variable, 0)); @@ -750,11 +748,11 @@ static void cpu_update_actions_state(double now, double delta) if ((GENERIC_ACTION(action).remains <= 0) && (lmm_get_variable_weight(GENERIC_LMM_ACTION(action).variable) > 0)) { GENERIC_ACTION(action).finish = surf_get_clock(); - cpu_im_cpu_action_state_set((surf_action_t) action, SURF_ACTION_DONE); + cpu_cpu_action_state_set((surf_action_t) action, SURF_ACTION_DONE); } else if ((GENERIC_ACTION(action).max_duration != NO_MAX_DURATION) && (GENERIC_ACTION(action).max_duration <= 0)) { GENERIC_ACTION(action).finish = surf_get_clock(); - cpu_im_cpu_action_state_set((surf_action_t) action, SURF_ACTION_DONE); + cpu_cpu_action_state_set((surf_action_t) action, SURF_ACTION_DONE); } } @@ -764,11 +762,9 @@ static void cpu_update_actions_state(double now, double delta) void generic_update_actions_state(double now, double delta) { if(cpu_update_mechanism == UM_LAZY) - cpu_im_update_actions_state(now, delta); + cpu_update_actions_state_lazy(now, delta); else if(cpu_update_mechanism == UM_FULL) - { - cpu_update_actions_state(now, delta); - } + cpu_update_actions_state_full(now, delta); else xbt_die("Not recognized surf cpu model!"); }