X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a56eb951f2c264a3a1c8d8955c64903b75f62c02..23e3b951a5bc0e18ab5de0edbed5be9d5e334ef7:/src/surf/cpu_cas01.c diff --git a/src/surf/cpu_cas01.c b/src/surf/cpu_cas01.c index 3d00787367..9998f863ad 100644 --- a/src/surf/cpu_cas01.c +++ b/src/surf/cpu_cas01.c @@ -25,10 +25,6 @@ static xbt_heap_t cpu_action_heap = NULL; typedef struct surf_action_cpu_cas01 { s_surf_action_lmm_t generic_lmm_action; - s_xbt_swag_hookup_t action_list_hookup; - int index_heap; - double last_update; - enum heap_action_type hat; } s_surf_action_cpu_Cas01_t, *surf_action_cpu_Cas01_t; typedef struct cpu_Cas01 { @@ -51,33 +47,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu, surf, static xbt_swag_t cpu_running_action_set_that_does_not_need_being_checked = NULL; -/* added to manage the communication action's heap */ -static void net_action_update_index_heap(void *action, int i) -{ - ((surf_action_cpu_Cas01_t) action)->index_heap = i; -} - -/* insert action on heap using a given key and a hat (heap_action_type) - * a hat can be of three types for communications: - * - * NORMAL = this is a normal heap entry stating the date to finish transmitting - * LATENCY = this is a heap entry to warn us when the latency is payed - * MAX_DURATION =this is a heap entry to warn us when the max_duration limit is reached - */ -static void heap_insert(surf_action_cpu_Cas01_t action, double key, - enum heap_action_type hat) -{ - action->hat = hat; - xbt_heap_push(cpu_action_heap, action, key); -} - -static void heap_remove(surf_action_cpu_Cas01_t action) -{ - action->hat = NOTSET; - if (((surf_action_cpu_Cas01_t) action)->index_heap >= 0) { - xbt_heap_remove(cpu_action_heap, action->index_heap); - } -} static void *cpu_create_resource(const char *name, double power_peak, double power_scale, @@ -186,7 +155,7 @@ static int cpu_action_unref(surf_action_t action) ((surf_action_lmm_t) action)->variable); if (cpu_update_mechanism == UM_LAZY) { /* remove from heap */ - heap_remove((surf_action_cpu_Cas01_t) action); + surf_action_lmm_heap_remove(cpu_action_heap,(surf_action_lmm_t)action); xbt_swag_remove(action, cpu_modified_set); } #ifdef HAVE_TRACING @@ -203,7 +172,7 @@ static void cpu_action_cancel(surf_action_t action) surf_action_state_set(action, SURF_ACTION_FAILED); if (cpu_update_mechanism == UM_LAZY) { xbt_swag_remove(action, cpu_modified_set); - heap_remove((surf_action_cpu_Cas01_t) action); + surf_action_lmm_heap_remove(cpu_action_heap,(surf_action_lmm_t)action); } return; } @@ -221,7 +190,7 @@ static void cpu_action_state_set(surf_action_t action, return; } -static void update_action_remaining_lazy(double now) +static void cpu_update_action_remaining_lazy(double now) { surf_action_cpu_Cas01_t action; double delta = 0.0; @@ -235,7 +204,7 @@ static void update_action_remaining_lazy(double now) if (GENERIC_ACTION(action).priority <= 0) continue; - delta = now - action->last_update; + delta = now - GENERIC_LMM_ACTION(action).last_update; if (GENERIC_ACTION(action).remains > 0) { double_update(&(GENERIC_ACTION(action).remains), @@ -243,20 +212,21 @@ static void update_action_remaining_lazy(double now) #ifdef HAVE_TRACING if (TRACE_is_enabled()) { + cpu_Cas01_t cpu = + lmm_constraint_id(lmm_get_cnst_from_var + (cpu_maxmin_system, + GENERIC_LMM_ACTION(action).variable, 0)); TRACE_surf_host_set_utilization(cpu->generic_resource.name, - action->generic_lmm_action. - generic_action.data, - (surf_action_t) action, - lmm_variable_getvalue - (GENERIC_LMM_ACTION(action). - variable), cpu->last_update, - now - cpu->last_update); + ((surf_action_t)action)->category, + lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable), + GENERIC_LMM_ACTION(action).last_update, + now - GENERIC_LMM_ACTION(action).last_update); } #endif XBT_DEBUG("Update action(%p) remains %lf", action, GENERIC_ACTION(action).remains); } - action->last_update = now; + GENERIC_LMM_ACTION(action).last_update = now; } } @@ -270,7 +240,7 @@ static double cpu_share_resources_lazy(double now) XBT_DEBUG ("Before share resources, the size of modified actions set is %d", xbt_swag_size(cpu_modified_set)); - update_action_remaining_lazy(now); + cpu_update_action_remaining_lazy(now); lmm_solve(cpu_maxmin_system); @@ -315,8 +285,8 @@ static double cpu_share_resources_lazy(double now) GENERIC_ACTION(action).max_duration); if (min != -1) { - heap_remove(action); - heap_insert(action, min, max_dur_flag ? MAX_DURATION : NORMAL); + surf_action_lmm_heap_remove(cpu_action_heap,(surf_action_lmm_t)action); + surf_action_lmm_heap_insert(cpu_action_heap,(surf_action_lmm_t)action, min, max_dur_flag ? MAX_DURATION : NORMAL); XBT_DEBUG("Insert at heap action(%p) min %lf now %lf", action, min, now); } else DIE_IMPOSSIBLE; @@ -352,44 +322,38 @@ static void cpu_update_actions_state_lazy(double now, double delta) 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_t cpu = ((cpu_Cas01_t) (action->cpu)); + cpu_Cas01_t cpu = + lmm_constraint_id(lmm_get_cnst_from_var + (cpu_maxmin_system, + GENERIC_LMM_ACTION(action).variable, 0)); 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); + ((surf_action_t)action)->category, + lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable), + GENERIC_LMM_ACTION(action).last_update, + now - GENERIC_LMM_ACTION(action).last_update); } #endif + /* 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); -// heap_remove(action); //FIXME heap + surf_action_lmm_heap_remove(cpu_action_heap,(surf_action_lmm_t)action); } #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_t cpu; - xbt_lib_cursor_t cursor; - char *key; double smaller = -1; - xbt_lib_foreach(host_lib, cursor, key, data) { - if (data[SURF_CPU_LEVEL]) { - cpu = data[SURF_CPU_LEVEL]; + xbt_swag_t running_actions = surf_cpu_model->states.running_action_set; + xbt_swag_foreach(action, running_actions) { if (smaller < 0) { - smaller = cpu->last_update; + smaller = GENERIC_LMM_ACTION(action).last_update; continue; } - if (cpu->last_update < smaller) { - smaller = cpu->last_update; + if (GENERIC_LMM_ACTION(action).last_update < smaller) { + smaller = GENERIC_LMM_ACTION(action).last_update; } - } } if (smaller > 0) { TRACE_last_timestamp_to_dump = smaller; @@ -413,11 +377,11 @@ static void cpu_update_actions_state_full(double now, double delta) 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); + ((surf_action_t)action)->category, + lmm_variable_getvalue(GENERIC_LMM_ACTION(action). + variable), + now - delta, + delta); TRACE_last_timestamp_to_dump = now - delta; } #endif @@ -518,8 +482,8 @@ static surf_action_t cpu_execute(void *cpu, double size) GENERIC_ACTION(action).priority, CPU->power_scale * CPU->power_peak, 1); if (cpu_update_mechanism == UM_LAZY) { - action->index_heap = -1; - action->last_update = surf_get_clock(); + GENERIC_LMM_ACTION(action).index_heap = -1; + GENERIC_LMM_ACTION(action).last_update = surf_get_clock(); } lmm_expand(cpu_maxmin_system, CPU->constraint, GENERIC_LMM_ACTION(action).variable, 1.0); @@ -549,8 +513,13 @@ 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) // remove action from the heap - heap_remove((surf_action_cpu_Cas01_t) action); + if (cpu_update_mechanism == UM_LAZY) { // remove action from the heap + surf_action_lmm_heap_remove(cpu_action_heap,(surf_action_lmm_t)action); + // this is necessary for a variable with weight 0 since such + // variables are ignored in lmm and we need to set its max_duration + // correctly at the next call to share_resources + xbt_swag_insert_at_head(action,cpu_modified_set); + } XBT_OUT(); return (surf_action_t) action; @@ -565,7 +534,7 @@ static void cpu_action_suspend(surf_action_t action) 0.0); ((surf_action_lmm_t) action)->suspended = 1; if (cpu_update_mechanism == UM_LAZY) - heap_remove((surf_action_cpu_Cas01_t) action); + surf_action_lmm_heap_remove(cpu_action_heap,(surf_action_lmm_t)action); } XBT_OUT(); } @@ -580,7 +549,7 @@ static void cpu_action_resume(surf_action_t action) action->priority); ((surf_action_lmm_t) action)->suspended = 0; if (cpu_update_mechanism == UM_LAZY) - heap_remove((surf_action_cpu_Cas01_t) action); + surf_action_lmm_heap_remove(cpu_action_heap,(surf_action_lmm_t)action); } XBT_OUT(); } @@ -596,9 +565,8 @@ static void cpu_action_set_max_duration(surf_action_t action, 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) - heap_remove((surf_action_cpu_Cas01_t) action); + surf_action_lmm_heap_remove(cpu_action_heap,(surf_action_lmm_t)action); XBT_OUT(); } @@ -611,7 +579,7 @@ static void cpu_action_set_priority(surf_action_t action, double priority) priority); if (cpu_update_mechanism == UM_LAZY) - heap_remove((surf_action_cpu_Cas01_t) action); + surf_action_lmm_heap_remove(cpu_action_heap,(surf_action_lmm_t)action); XBT_OUT(); } @@ -630,7 +598,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) - update_action_remaining_lazy(surf_get_clock()); + cpu_update_action_remaining_lazy(surf_get_clock()); XBT_OUT(); return action->remains; } @@ -651,11 +619,6 @@ static double cpu_get_available_speed(void *cpu) return ((cpu_Cas01_t) cpu)->power_scale; } -static void cpu_action_update_index_heap(void *action, int i) -{ - ((surf_action_cpu_Cas01_t) action)->index_heap = i; -} - static void cpu_finalize(void) { lmm_system_free(cpu_maxmin_system); @@ -731,9 +694,9 @@ static void surf_cpu_model_init_internal() 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); + surf_action_lmm_update_index_heap); cpu_modified_set = - xbt_swag_new(xbt_swag_offset(comp, action_list_hookup)); + xbt_swag_new(xbt_swag_offset(comp, generic_lmm_action.action_list_hookup)); cpu_maxmin_system->keep_track = cpu_modified_set; } }