From: Arnaud Legrand Date: Mon, 5 Mar 2012 10:55:33 +0000 (+0100) Subject: Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot//simgrid/simgrid X-Git-Tag: v3_7~315^2~27^2~22 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/0d926831703326eda8eca16f898e892466d8d16a?hp=720107cdb8256b793387156add85dd3da859d4ac Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot//simgrid/simgrid --- diff --git a/src/surf/cpu_cas01.c b/src/surf/cpu_cas01.c index 6ba5ee425a..682f275ab7 100644 --- a/src/surf/cpu_cas01.c +++ b/src/surf/cpu_cas01.c @@ -12,7 +12,7 @@ lmm_system_t cpu_maxmin_system = NULL; e_UM_t cpu_update_mechanism = UM_UNDEFINED; static int cpu_selective_update = 0; -static xbt_swag_t cpu_modified_cpu = NULL; +static xbt_swag_t cpu_modified_set = NULL; static xbt_heap_t cpu_action_heap = NULL; #undef GENERIC_LMM_ACTION @@ -44,51 +44,53 @@ typedef struct cpu_Cas01 { } s_cpu_Cas01_t, *cpu_Cas01_t; XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu, surf, - "Logging specific to the SURF CPU IMPROVED module"); + "Logging specific to the SURF CPU IMPROVED module"); 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, - 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) +static void *cpu_create_resource(const 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) { 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); + "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 = - tmgr_history_add_trace(history, power_trace, 0.0, 0, cpu); + tmgr_history_add_trace(history, power_trace, 0.0, 0, cpu); cpu->state_current = state_initial; if (state_trace) cpu->state_event = - tmgr_history_add_trace(history, state_trace, 0.0, 0, cpu); + tmgr_history_add_trace(history, state_trace, 0.0, 0, cpu); cpu->constraint = lmm_constraint_new(cpu_maxmin_system, cpu, - cpu->core * cpu->power_scale * cpu->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) @@ -124,7 +125,7 @@ static void cpu_add_traces_cpu(void) xbt_assert(trace, "Trace %s undefined", trace_name); host->state_event = - tmgr_history_add_trace(history, trace, 0.0, 0, host); + tmgr_history_add_trace(history, trace, 0.0, 0, host); } xbt_dict_foreach(trace_connect_list_power, cursor, trace_name, elm) { @@ -135,7 +136,7 @@ static void cpu_add_traces_cpu(void) xbt_assert(trace, "Trace %s undefined", trace_name); host->power_event = - tmgr_history_add_trace(history, trace, 0.0, 0, host); + tmgr_history_add_trace(history, trace, 0.0, 0, host); } } @@ -148,7 +149,7 @@ static void cpu_define_callbacks() static int cpu_resource_used(void *resource) { return lmm_constraint_used(cpu_maxmin_system, - ((cpu_Cas01_t) resource)->constraint); + ((cpu_Cas01_t) resource)->constraint); } static int cpu_action_unref(surf_action_t action) @@ -158,14 +159,12 @@ static int cpu_action_unref(surf_action_t action) xbt_swag_remove(action, action->state_set); 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); + ((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_modified_set); } #ifdef HAVE_TRACING xbt_free(action->category); @@ -179,17 +178,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) { */ @@ -209,7 +208,7 @@ static void cpu_update_remains(cpu_Cas01_t cpu, double now) return; xbt_swag_foreach(action, cpu->action_set) { if (GENERIC_ACTION(action).state_set != - surf_cpu_model->states.running_action_set) + surf_cpu_model->states.running_action_set) continue; /* bogus priority, skip it */ @@ -218,24 +217,24 @@ static void cpu_update_remains(cpu_Cas01_t cpu, double now) if (GENERIC_ACTION(action).remains > 0) { double_update(&(GENERIC_ACTION(action).remains), - lmm_variable_getvalue(GENERIC_LMM_ACTION - (action).variable) * (now - - cpu->last_update)); + lmm_variable_getvalue(GENERIC_LMM_ACTION + (action).variable) * (now - + 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, - lmm_variable_getvalue - (GENERIC_LMM_ACTION - (action).variable), - cpu->last_update, - now - cpu->last_update); + 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); } #endif XBT_DEBUG("Update action(%p) remains %lf", action, - GENERIC_ACTION(action).remains); + GENERIC_ACTION(action).remains); } } cpu->last_update = now; @@ -244,58 +243,64 @@ static void cpu_update_remains(cpu_Cas01_t cpu, double now) static double cpu_share_resources_lazy(double now) { surf_action_cpu_Cas01_t action; - double min; + double min = -1.0; double value; - cpu_Cas01_t cpu, cpu_next; - xbt_swag_foreach(cpu, cpu_modified_cpu) - cpu_update_remains(cpu, 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); lmm_solve(cpu_maxmin_system); - xbt_swag_foreach_safe(cpu, cpu_next, cpu_modified_cpu) { - xbt_swag_foreach(action, cpu->action_set) { + XBT_DEBUG + ("After share resources, The size of modified actions set is %d", + xbt_swag_size(cpu_modified_set)); + + xbt_swag_foreach(action, cpu_modified_set) { + int max_dur_flag = 0; + if (GENERIC_ACTION(action).state_set != - surf_cpu_model->states.running_action_set) - continue; + surf_cpu_model->states.running_action_set) + continue; /* bogus priority, skip it */ if (GENERIC_ACTION(action).priority <= 0) - continue; + continue; min = -1; value = lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable); if (value > 0) { - if (GENERIC_ACTION(action).remains > 0) { - value = GENERIC_ACTION(action).remains / value; - min = now + value; - } else { - value = 0.0; - min = now; - } + if (GENERIC_ACTION(action).remains > 0) { + value = GENERIC_ACTION(action).remains / value; + min = now + value; + } else { + value = 0.0; + min = now; + } } if ((GENERIC_ACTION(action).max_duration != NO_MAX_DURATION) - && (min == -1 - || GENERIC_ACTION(action).start + - GENERIC_ACTION(action).max_duration < min)) - min = - GENERIC_ACTION(action).start + - GENERIC_ACTION(action).max_duration; + && (min == -1 + || GENERIC_ACTION(action).start + + GENERIC_ACTION(action).max_duration < min)) + min = + GENERIC_ACTION(action).start + + 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 = - xbt_heap_remove(cpu_action_heap, action->index_heap); - if (heap_act != action) - DIE_IMPOSSIBLE; + 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_action_heap, action, min); - XBT_DEBUG("Insert at heap action(%p) min %lf", 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_modified_cpu); @@ -304,31 +309,37 @@ 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) { +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); + 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) { surf_action_cpu_Cas01_t action; while ((xbt_heap_size(cpu_action_heap) > 0) - && (double_equals(xbt_heap_maxkey(cpu_action_heap), now))) { + && (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_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,16 +355,16 @@ 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]){ - cpu = data[SURF_CPU_LEVEL]; - if (smaller < 0){ - smaller = cpu->last_update; - continue; - } - if (cpu->last_update < smaller){ - smaller = cpu->last_update; - } + xbt_lib_foreach(host_lib, cursor, key, data) { + if (data[SURF_CPU_LEVEL]) { + cpu = data[SURF_CPU_LEVEL]; + if (smaller < 0) { + smaller = cpu->last_update; + continue; + } + if (cpu->last_update < smaller) { + smaller = cpu->last_update; + } } } if (smaller > 0) { @@ -373,28 +384,32 @@ 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_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; } #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) && - (GENERIC_ACTION(action).max_duration <= 0)) { + (GENERIC_ACTION(action).max_duration <= 0)) { GENERIC_ACTION(action).finish = surf_get_clock(); cpu_cpu_action_state_set((surf_action_t) action, SURF_ACTION_DONE); } @@ -404,8 +419,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 +429,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); + (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) + if (cpu_update_mechanism == UM_LAZY) xbt_swag_insert(cpu, cpu_modified_cpu); if (tmgr_trace_event_free(event_type)) cpu->power_event = NULL; @@ -437,17 +455,16 @@ static void cpu_update_resource_state(void *id, cpu->state_current = SURF_RESOURCE_OFF; - 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 || - surf_action_state_get(action) == SURF_ACTION_READY || - surf_action_state_get(action) == - SURF_ACTION_NOT_IN_THE_SYSTEM) { - action->finish = date; - cpu_cpu_action_state_set(action, SURF_ACTION_FAILED); - } + 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 || + surf_action_state_get(action) == SURF_ACTION_READY || + surf_action_state_get(action) == + SURF_ACTION_NOT_IN_THE_SYSTEM) { + action->finish = date; + cpu_cpu_action_state_set(action, SURF_ACTION_FAILED); + } } } if (tmgr_trace_event_free(event_type)) @@ -468,23 +485,24 @@ static surf_action_t cpu_execute(void *cpu, double size) XBT_IN("(%s,%g)", surf_resource_name(CPU), size); action = surf_action_new(sizeof(s_surf_action_cpu_Cas01_t), size, - surf_cpu_model, - CPU->state_current != SURF_RESOURCE_ON); + surf_cpu_model, + CPU->state_current != SURF_RESOURCE_ON); - GENERIC_LMM_ACTION(action).suspended = 0; /* Should be useless because of the - calloc but it seems to help valgrind... */ + GENERIC_LMM_ACTION(action).suspended = 0; /* Should be useless because of the + calloc but it seems to help valgrind... */ 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); xbt_swag_insert(action, CPU->action_set); } lmm_expand(cpu_maxmin_system, CPU->constraint, - GENERIC_LMM_ACTION(action).variable, 1.0); + GENERIC_LMM_ACTION(action).variable, 1.0); XBT_OUT(); return (surf_action_t) action; } @@ -505,13 +523,13 @@ static surf_action_t cpu_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_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_maxmin_system, - GENERIC_LMM_ACTION(action).variable, 0.0); - if(cpu_update_mechanism == UM_LAZY) + GENERIC_LMM_ACTION(action).variable, 0.0); + if (cpu_update_mechanism == UM_LAZY) xbt_swag_insert(cpu, cpu_modified_cpu); XBT_OUT(); return (surf_action_t) action; @@ -522,12 +540,12 @@ 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_maxmin_system, - ((surf_action_lmm_t) action)->variable, - 0.0); + ((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); + ((surf_action_cpu_Cas01_t) action)->index_heap); xbt_swag_insert(ACTION_GET_CPU(action), cpu_modified_cpu); } } @@ -540,10 +558,10 @@ 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_maxmin_system, - ((surf_action_lmm_t) action)->variable, - action->priority); + ((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(); @@ -555,37 +573,36 @@ 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; lmm_update_variable_weight(cpu_maxmin_system, - ((surf_action_lmm_t) action)->variable, - priority); + ((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 @@ -594,7 +611,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; @@ -627,11 +644,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); } } @@ -641,11 +657,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() @@ -666,12 +683,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!"); @@ -702,12 +723,12 @@ 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); - cpu_modified_cpu = - xbt_swag_new(xbt_swag_offset(cpu, modified_cpu_hookup)); + cpu_action_update_index_heap); + cpu_modified_set = xbt_swag_new(xbt_swag_offset(action, action_list_hookup)); + cpu_maxmin_system->keep_track = cpu_modified_set; } } @@ -730,21 +751,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) diff --git a/src/surf/network.c b/src/surf/network.c index af6e1ed707..f26732817b 100644 --- a/src/surf/network.c +++ b/src/surf/network.c @@ -38,8 +38,8 @@ xbt_dynar_t smpi_lat_factor = NULL; typedef struct s_smpi_factor *smpi_factor_t; typedef struct s_smpi_factor { - long factor; - double value; + long factor; + double value; } s_smpi_factor_t; double sg_sender_gap = 0.0; @@ -56,7 +56,7 @@ e_UM_t network_update_mechanism = UM_UNDEFINED; static int net_selective_update = 0; static int net_action_is_suspended(surf_action_t action); -static void update_action_remaining(double now); +static void update_action_remaining_lazy(double now); static xbt_swag_t net_modified_set = NULL; static xbt_heap_t net_action_heap = NULL; @@ -74,15 +74,18 @@ static void net_action_update_index_heap(void *action, int i) * 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_network_CM02_t action, double key, enum heap_action_type hat){ +static void heap_insert(surf_action_network_CM02_t action, double key, + enum heap_action_type hat) +{ action->hat = hat; xbt_heap_push(net_action_heap, action, key); } -static void heap_remove(surf_action_network_CM02_t action){ +static void heap_remove(surf_action_network_CM02_t action) +{ action->hat = NOTSET; - if(((surf_action_network_CM02_t) action)->index_heap >= 0){ - xbt_heap_remove(net_action_heap,action->index_heap); + if (((surf_action_network_CM02_t) action)->index_heap >= 0) { + xbt_heap_remove(net_action_heap, action->index_heap); } } @@ -110,61 +113,64 @@ static double constant_bandwidth_constraint(double rate, double bound, /**********************/ static xbt_dynar_t parse_factor(const char *smpi_coef_string) { - char *value = NULL; - unsigned int iter = 0; - s_smpi_factor_t fact; - xbt_dynar_t smpi_factor, radical_elements, radical_elements2 = NULL; - - smpi_factor = xbt_dynar_new(sizeof(s_smpi_factor_t), NULL); - radical_elements = xbt_str_split(smpi_coef_string, ";"); - xbt_dynar_foreach(radical_elements, iter, value) { - - radical_elements2 = xbt_str_split(value, ":"); - if(xbt_dynar_length(radical_elements2) != 2) - xbt_die("Malformed radical for smpi factor!"); - fact.factor = atol(xbt_dynar_get_as(radical_elements2,0,char*)); - fact.value = atof(xbt_dynar_get_as(radical_elements2,1,char*)); - xbt_dynar_push_as(smpi_factor,s_smpi_factor_t,fact); - XBT_DEBUG("smpi_factor:\t%ld : %f",fact.factor,fact.value); - xbt_dynar_free(&radical_elements2); - } - xbt_dynar_free(&radical_elements); - return smpi_factor; + char *value = NULL; + unsigned int iter = 0; + s_smpi_factor_t fact; + xbt_dynar_t smpi_factor, radical_elements, radical_elements2 = NULL; + + smpi_factor = xbt_dynar_new(sizeof(s_smpi_factor_t), NULL); + radical_elements = xbt_str_split(smpi_coef_string, ";"); + xbt_dynar_foreach(radical_elements, iter, value) { + + radical_elements2 = xbt_str_split(value, ":"); + if (xbt_dynar_length(radical_elements2) != 2) + xbt_die("Malformed radical for smpi factor!"); + fact.factor = atol(xbt_dynar_get_as(radical_elements2, 0, char *)); + fact.value = atof(xbt_dynar_get_as(radical_elements2, 1, char *)); + xbt_dynar_push_as(smpi_factor, s_smpi_factor_t, fact); + XBT_DEBUG("smpi_factor:\t%ld : %f", fact.factor, fact.value); + xbt_dynar_free(&radical_elements2); + } + xbt_dynar_free(&radical_elements); + return smpi_factor; } static double smpi_bandwidth_factor(double size) { - if(!smpi_bw_factor) - smpi_bw_factor = parse_factor( xbt_cfg_get_string(_surf_cfg_set,"smpi/bw_factor") ); - - unsigned int iter = 0; - s_smpi_factor_t fact; - xbt_dynar_foreach(smpi_bw_factor, iter, fact) { - if(size >= fact.factor){ - XBT_DEBUG("%lf >= %ld return %f",size,fact.factor,fact.value); - return fact.value; - } - } - - return 1.0; + if (!smpi_bw_factor) + smpi_bw_factor = + parse_factor(xbt_cfg_get_string(_surf_cfg_set, "smpi/bw_factor")); + + unsigned int iter = 0; + s_smpi_factor_t fact; + xbt_dynar_foreach(smpi_bw_factor, iter, fact) { + if (size >= fact.factor) { + XBT_DEBUG("%lf >= %ld return %f", size, fact.factor, fact.value); + return fact.value; + } + } + + return 1.0; } static double smpi_latency_factor(double size) { - if(!smpi_lat_factor) - smpi_lat_factor = parse_factor( xbt_cfg_get_string(_surf_cfg_set,"smpi/lat_factor") ); - - unsigned int iter = 0; - s_smpi_factor_t fact; - xbt_dynar_foreach(smpi_lat_factor, iter, fact) { - if(size >= fact.factor){ - XBT_DEBUG("%lf >= %ld return %f",size,fact.factor,fact.value); - return fact.value; - } - } - - return 1.0; + if (!smpi_lat_factor) + smpi_lat_factor = + parse_factor(xbt_cfg_get_string(_surf_cfg_set, "smpi/lat_factor")); + + unsigned int iter = 0; + s_smpi_factor_t fact; + xbt_dynar_foreach(smpi_lat_factor, iter, fact) { + if (size >= fact.factor) { + XBT_DEBUG("%lf >= %ld return %f", size, fact.factor, fact.value); + return fact.value; + } + } + + return 1.0; } + /**--------- -----------*/ static double smpi_bandwidth_constraint(double rate, double bound, @@ -180,19 +186,20 @@ static double (*bandwidth_factor_callback) (double) = static double (*bandwidth_constraint_callback) (double, double, double) = &constant_bandwidth_constraint; -static void (*gap_append) (double, const link_CM02_t, surf_action_network_CM02_t) = NULL; +static void (*gap_append) (double, const link_CM02_t, + surf_action_network_CM02_t) = NULL; static void (*gap_remove) (surf_action_network_CM02_t) = NULL; -static void* net_create_resource(const char *name, - double bw_initial, - tmgr_trace_t bw_trace, - double lat_initial, - tmgr_trace_t lat_trace, - e_surf_resource_state_t - state_initial, - tmgr_trace_t state_trace, - e_surf_link_sharing_policy_t - policy, xbt_dict_t properties) +static void *net_create_resource(const char *name, + double bw_initial, + tmgr_trace_t bw_trace, + double lat_initial, + tmgr_trace_t lat_trace, + e_surf_resource_state_t + state_initial, + tmgr_trace_t state_trace, + e_surf_link_sharing_policy_t + policy, xbt_dict_t properties) { link_CM02_t nw_link = (link_CM02_t) surf_resource_lmm_new(sizeof(s_link_CM02_t), @@ -204,8 +211,8 @@ static void* net_create_resource(const char *name, bw_initial, bw_trace); xbt_assert(!xbt_lib_get_or_null(link_lib, name, SURF_LINK_LEVEL), - "Link '%s' declared several times in the platform file.", - name); + "Link '%s' declared several times in the platform file.", + name); nw_link->lat_current = lat_initial; if (lat_trace) @@ -222,19 +229,17 @@ static void* net_create_resource(const char *name, static void net_parse_link_init(sg_platf_link_cbarg_t link) { - if(link->policy == SURF_LINK_FULLDUPLEX){ + if (link->policy == SURF_LINK_FULLDUPLEX) { char *link_id; link_id = bprintf("%s_UP", link->id); - net_create_resource(link_id, - link->bandwidth, - link->bandwidth_trace, - link->latency, - link->latency_trace, - link->state, - link->state_trace, - link->policy, - link->properties); - xbt_free(link_id); + net_create_resource(link_id, + link->bandwidth, + link->bandwidth_trace, + link->latency, + link->latency_trace, + link->state, + link->state_trace, link->policy, link->properties); + xbt_free(link_id); link_id = bprintf("%s_DOWN", link->id); net_create_resource(link_id, link->bandwidth, @@ -242,21 +247,16 @@ static void net_parse_link_init(sg_platf_link_cbarg_t link) link->latency, link->latency_trace, link->state, - link->state_trace, - link->policy, - link->properties); + link->state_trace, link->policy, link->properties); xbt_free(link_id); - } - else{ + } else { net_create_resource(link->id, link->bandwidth, link->bandwidth_trace, link->latency, link->latency_trace, link->state, - link->state_trace, - link->policy, - link->properties); + link->state_trace, link->policy, link->properties); } } @@ -273,14 +273,13 @@ static void net_add_traces(void) /* connect all traces relative to network */ xbt_dict_foreach(trace_connect_list_link_avail, cursor, trace_name, elm) { tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name); - link_CM02_t link = - xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL); + link_CM02_t link = xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL); xbt_assert(link, "Cannot connect trace %s to link %s: link undefined", - trace_name, elm); + trace_name, elm); xbt_assert(trace, - "Cannot connect trace %s to link %s: trace undefined", - trace_name, elm); + "Cannot connect trace %s to link %s: trace undefined", + trace_name, elm); link->lmm_resource.state_event = tmgr_history_add_trace(history, trace, 0.0, 0, link); @@ -288,14 +287,13 @@ static void net_add_traces(void) xbt_dict_foreach(trace_connect_list_bandwidth, cursor, trace_name, elm) { tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name); - link_CM02_t link = - xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL); + link_CM02_t link = xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL); xbt_assert(link, "Cannot connect trace %s to link %s: link undefined", - trace_name, elm); + trace_name, elm); xbt_assert(trace, - "Cannot connect trace %s to link %s: trace undefined", - trace_name, elm); + "Cannot connect trace %s to link %s: trace undefined", + trace_name, elm); link->lmm_resource.power.event = tmgr_history_add_trace(history, trace, 0.0, 0, link); @@ -303,14 +301,13 @@ static void net_add_traces(void) xbt_dict_foreach(trace_connect_list_latency, cursor, trace_name, elm) { tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name); - link_CM02_t link = - xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL); + link_CM02_t link = xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL); xbt_assert(link, "Cannot connect trace %s to link %s: link undefined", - trace_name, elm); + trace_name, elm); xbt_assert(trace, - "Cannot connect trace %s to link %s: trace undefined", - trace_name, elm); + "Cannot connect trace %s to link %s: trace undefined", + trace_name, elm); link->lat_event = tmgr_history_add_trace(history, trace, 0.0, 0, link); } @@ -325,9 +322,9 @@ static void net_define_callbacks(void) static int net_resource_used(void *resource_id) { - return lmm_constraint_used(network_maxmin_system, - ((surf_resource_lmm_t) - resource_id)->constraint); + return lmm_constraint_used(network_maxmin_system, ((surf_resource_lmm_t) + resource_id)-> + constraint); } static int net_action_unref(surf_action_t action) @@ -335,11 +332,11 @@ static int net_action_unref(surf_action_t action) action->refcount--; if (!action->refcount) { xbt_swag_remove(action, action->state_set); - if (((surf_action_network_CM02_t) action)->variable){ + if (((surf_action_network_CM02_t) action)->variable) { lmm_variable_free(network_maxmin_system, ((surf_action_network_CM02_t) action)->variable); } - if(network_update_mechanism == UM_LAZY){// remove action from the heap + if (network_update_mechanism == UM_LAZY) { // remove action from the heap heap_remove((surf_action_network_CM02_t) action); xbt_swag_remove(action, net_modified_set); } @@ -358,9 +355,9 @@ static int net_action_unref(surf_action_t action) static void net_action_cancel(surf_action_t action) { - XBT_DEBUG("cancel action %p",action); + XBT_DEBUG("cancel action %p", action); surf_network_model->action_state_set(action, SURF_ACTION_FAILED); - if(network_update_mechanism == UM_LAZY){// remove action from the heap + if (network_update_mechanism == UM_LAZY) { // remove action from the heap xbt_swag_remove(action, net_modified_set); heap_remove((surf_action_network_CM02_t) action); } @@ -380,19 +377,20 @@ int net_get_link_latency_limited(surf_action_t action) double net_action_get_remains(surf_action_t action) { - if(network_update_mechanism == UM_LAZY)/* update remains before return it */ - update_action_remaining(surf_get_clock()); + if (network_update_mechanism == UM_LAZY) /* update remains before return it */ + update_action_remaining_lazy(surf_get_clock()); return action->remains; } -static void update_action_remaining(double now){ +static void update_action_remaining_lazy(double now) +{ surf_action_network_CM02_t action = NULL; double delta = 0.0; xbt_swag_foreach(action, net_modified_set) { - if(action->suspended != 0){ - continue; + if (action->suspended != 0) { + continue; } delta = now - action->last_update; @@ -446,7 +444,7 @@ static double net_share_resources_full(double now) } #endif if (action->latency > 0) { - min = (min<0)?action->latency:min(min,action->latency); + min = (min < 0) ? action->latency : min(min, action->latency); } } @@ -458,25 +456,30 @@ static double net_share_resources_full(double now) static double net_share_resources_lazy(double now) { surf_action_network_CM02_t action = NULL; - double min=-1; + double min = -1.0; double value; - XBT_DEBUG("Before share resources, the size of modified actions set is %d", xbt_swag_size(net_modified_set)); - update_action_remaining(now); + XBT_DEBUG + ("Before share resources, the size of modified actions set is %d", + xbt_swag_size(net_modified_set)); + update_action_remaining_lazy(now); lmm_solve(network_maxmin_system); - XBT_DEBUG("After share resources, The size of modified actions set is %d", xbt_swag_size(net_modified_set)); + XBT_DEBUG + ("After share resources, The size of modified actions set is %d", + xbt_swag_size(net_modified_set)); xbt_swag_foreach(action, net_modified_set) { int max_dur_flag = 0; - if (GENERIC_ACTION(action).state_set != surf_network_model->states.running_action_set){ + if (GENERIC_ACTION(action).state_set != + surf_network_model->states.running_action_set) { continue; } /* bogus priority, skip it */ - if (GENERIC_ACTION(action).priority <= 0){ + if (GENERIC_ACTION(action).priority <= 0) { continue; } @@ -495,30 +498,32 @@ static double net_share_resources_lazy(double now) if ((GENERIC_ACTION(action).max_duration != NO_MAX_DURATION) && (min == -1 || GENERIC_ACTION(action).start + - GENERIC_ACTION(action).max_duration < min)){ - min = GENERIC_ACTION(action).start + + GENERIC_ACTION(action).max_duration < min)) { + min = GENERIC_ACTION(action).start + GENERIC_ACTION(action).max_duration; max_dur_flag = 1; } 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) { heap_remove((surf_action_network_CM02_t) action); } if (min != -1) { - heap_insert((surf_action_network_CM02_t) action, min, max_dur_flag?MAX_DURATION:NORMAL); - XBT_DEBUG("Insert at heap action(%p) min %lf now %lf", action, min, now); + heap_insert((surf_action_network_CM02_t) action, min, + max_dur_flag ? MAX_DURATION : NORMAL); + XBT_DEBUG("Insert at heap action(%p) min %lf now %lf", action, min, + now); } } //hereafter must have already the min value for this resource model - if(xbt_heap_size(net_action_heap) > 0 ){ - min = xbt_heap_maxkey(net_action_heap) - now ; - }else{ + if (xbt_heap_size(net_action_heap) > 0) { + min = xbt_heap_maxkey(net_action_heap) - now; + } else { min = -1; } @@ -555,27 +560,30 @@ static void net_update_actions_state_full(double now, double delta) } #ifdef HAVE_TRACING if (TRACE_is_enabled()) { - xbt_dynar_t route=NULL; - routing_get_route_and_latency(action->src_name, action->dst_name,&route,NULL); + xbt_dynar_t route = NULL; + routing_get_route_and_latency(action->src_name, action->dst_name, + &route, NULL); link_CM02_t link; unsigned int i; xbt_dynar_foreach(route, i, link) { - TRACE_surf_link_set_utilization(link->lmm_resource.generic_resource.name, + TRACE_surf_link_set_utilization(link->lmm_resource. + generic_resource.name, action->generic_action.data, (surf_action_t) action, - lmm_variable_getvalue - (action->variable), now - delta, - delta); + lmm_variable_getvalue(action-> + variable), + now - delta, delta); } } #endif - if(!lmm_get_number_of_cnst_from_var(network_maxmin_system, action->variable)) { - /* There is actually no link used, hence an infinite bandwidth. - * This happens often when using models like vivaldi. - * In such case, just make sure that the action completes immediately. - */ + if (!lmm_get_number_of_cnst_from_var + (network_maxmin_system, action->variable)) { + /* There is actually no link used, hence an infinite bandwidth. + * This happens often when using models like vivaldi. + * In such case, just make sure that the action completes immediately. + */ double_update(&(action->generic_action.remains), - action->generic_action.remains); + action->generic_action.remains); } double_update(&(action->generic_action.remains), lmm_variable_getvalue(action->variable) * deltap); @@ -588,13 +596,15 @@ static void net_update_actions_state_full(double now, double delta) surf_network_model->action_state_set((surf_action_t) action, SURF_ACTION_DONE); - if(gap_remove) gap_remove(action); + if (gap_remove) + gap_remove(action); } else if ((action->generic_action.max_duration != NO_MAX_DURATION) && (action->generic_action.max_duration <= 0)) { action->generic_action.finish = surf_get_clock(); surf_network_model->action_state_set((surf_action_t) action, SURF_ACTION_DONE); - if(gap_remove) gap_remove(action); + if (gap_remove) + gap_remove(action); } } @@ -612,21 +622,21 @@ static void net_update_actions_state_lazy(double now, double delta) GENERIC_ACTION(action).finish = surf_get_clock(); // if I am wearing a latency hat - if( action->hat == LATENCY){ - lmm_update_variable_weight(network_maxmin_system, action->variable, - action->weight); - heap_remove(action); - action->last_update = surf_get_clock(); - - // if I am wearing a max_duration or normal hat - }else if( action->hat == MAX_DURATION || action->hat == NORMAL ){ - // no need to communicate anymore - // assume that flows that reached max_duration have remaining of 0 - GENERIC_ACTION(action).remains = 0; - action->generic_action.finish = surf_get_clock(); - surf_network_model->action_state_set((surf_action_t) action, - SURF_ACTION_DONE); - heap_remove(action); + if (action->hat == LATENCY) { + lmm_update_variable_weight(network_maxmin_system, action->variable, + action->weight); + heap_remove(action); + action->last_update = surf_get_clock(); + + // if I am wearing a max_duration or normal hat + } else if (action->hat == MAX_DURATION || action->hat == NORMAL) { + // no need to communicate anymore + // assume that flows that reached max_duration have remaining of 0 + GENERIC_ACTION(action).remains = 0; + action->generic_action.finish = surf_get_clock(); + surf_network_model->action_state_set((surf_action_t) action, + SURF_ACTION_DONE); + heap_remove(action); } } return; @@ -657,7 +667,10 @@ static void net_update_resource_state(void *id, (nw_link->lmm_resource.power.peak * nw_link->lmm_resource.power.scale)); #ifdef HAVE_TRACING - TRACE_surf_link_set_bandwidth(date, (char *)(((nw_link->lmm_resource).generic_resource).name), + TRACE_surf_link_set_bandwidth(date, + (char + *) (((nw_link->lmm_resource). + generic_resource).name), sg_bandwidth_factor * (nw_link->lmm_resource.power.peak * nw_link->lmm_resource.power.scale)); @@ -696,13 +709,14 @@ static void net_update_resource_state(void *id, lmm_update_variable_bound(network_maxmin_system, action->variable, min(action->rate, sg_tcp_gamma / (2.0 * - action->lat_current))); + action-> + lat_current))); if (action->rate < sg_tcp_gamma / (2.0 * action->lat_current)) { XBT_INFO("Flow is limited BYBANDWIDTH"); } else { XBT_INFO("Flow is limited BYLATENCY, latency of flow is %f", - action->lat_current); + action->lat_current); } } if (!(action->suspended)) @@ -739,7 +753,9 @@ static void net_update_resource_state(void *id, xbt_abort(); } - XBT_DEBUG("There were a resource state event, need to update actions related to the constraint (%p)", nw_link->lmm_resource.constraint); + XBT_DEBUG + ("There were a resource state event, need to update actions related to the constraint (%p)", + nw_link->lmm_resource.constraint); return; } @@ -753,18 +769,18 @@ static surf_action_t net_communicate(const char *src_name, int failed = 0; surf_action_network_CM02_t action = NULL; double bandwidth_bound; - double latency=0.0; + double latency = 0.0; xbt_dynar_t back_route = NULL; int constraints_per_variable = 0; - xbt_dynar_t route=xbt_dynar_new(global_routing->size_of_link,NULL); + xbt_dynar_t route = xbt_dynar_new(global_routing->size_of_link, NULL); XBT_IN("(%s,%s,%g,%g)", src_name, dst_name, size, rate); routing_get_route_and_latency(src_name, dst_name, &route, &latency); xbt_assert(!xbt_dynar_is_empty(route) || latency, - "You're trying to send data from %s to %s but there is no connection at all between these two hosts.", - src_name, dst_name); + "You're trying to send data from %s to %s but there is no connection at all between these two hosts.", + src_name, dst_name); xbt_dynar_foreach(route, i, link) { if (link->lmm_resource.state_current == SURF_RESOURCE_OFF) { @@ -773,7 +789,7 @@ static surf_action_t net_communicate(const char *src_name, } } if (sg_network_crosstraffic == 1) { - routing_get_route_and_latency(dst_name, src_name, &back_route,NULL); + routing_get_route_and_latency(dst_name, src_name, &back_route, NULL); xbt_dynar_foreach(back_route, i, link) { if (link->lmm_resource.state_current == SURF_RESOURCE_OFF) { failed = 1; @@ -792,13 +808,13 @@ static surf_action_t net_communicate(const char *src_name, xbt_swag_insert(action, action->generic_action.state_set); action->rate = rate; - if(network_update_mechanism == UM_LAZY){ + if (network_update_mechanism == UM_LAZY) { action->index_heap = -1; action->last_update = surf_get_clock(); } bandwidth_bound = -1.0; - if(sg_weight_S_parameter>0) { + if (sg_weight_S_parameter > 0) { xbt_dynar_foreach(route, i, link) { action->weight += sg_weight_S_parameter / @@ -808,35 +824,39 @@ static surf_action_t net_communicate(const char *src_name, xbt_dynar_foreach(route, i, link) { double bb = bandwidth_factor_callback(size) * (link->lmm_resource.power.peak * link->lmm_resource.power.scale); - bandwidth_bound = (bandwidth_bound < 0.0)?bb:min(bandwidth_bound,bb); + bandwidth_bound = + (bandwidth_bound < 0.0) ? bb : min(bandwidth_bound, bb); } action->lat_current = action->latency; action->latency *= latency_factor_callback(size); action->rate = - bandwidth_constraint_callback(action->rate, bandwidth_bound, - size); - if(gap_append) { - xbt_assert(!xbt_dynar_is_empty(route),"Using a model with a gap (e.g., SMPI) with a platform without links (e.g. vivaldi)!!!"); + bandwidth_constraint_callback(action->rate, bandwidth_bound, size); + if (gap_append) { + xbt_assert(!xbt_dynar_is_empty(route), + "Using a model with a gap (e.g., SMPI) with a platform without links (e.g. vivaldi)!!!"); - link = *(link_CM02_t*)xbt_dynar_get_ptr(route, 0); + link = *(link_CM02_t *) xbt_dynar_get_ptr(route, 0); gap_append(size, link, action); XBT_DEBUG("Comm %p: %s -> %s gap=%f (lat=%f)", - action, src_name, dst_name, action->sender.gap, action->latency); + action, src_name, dst_name, action->sender.gap, + action->latency); } constraints_per_variable = xbt_dynar_length(route); if (back_route != NULL) constraints_per_variable += xbt_dynar_length(back_route); - if (action->latency > 0){ - action->variable = + if (action->latency > 0) { + action->variable = lmm_variable_new(network_maxmin_system, action, 0.0, -1.0, constraints_per_variable); - if(network_update_mechanism == UM_LAZY){ + if (network_update_mechanism == UM_LAZY) { // add to the heap the event when the latency is payed - XBT_DEBUG("Added action (%p) one latency event at date %f", action, action->latency + action->last_update); - heap_insert(action, action->latency + action->last_update, xbt_dynar_is_empty(route)?NORMAL:LATENCY); + XBT_DEBUG("Added action (%p) one latency event at date %f", action, + action->latency + action->last_update); + heap_insert(action, action->latency + action->last_update, + xbt_dynar_is_empty(route) ? NORMAL : LATENCY); } } else action->variable = @@ -845,13 +865,16 @@ static surf_action_t net_communicate(const char *src_name, if (action->rate < 0) { lmm_update_variable_bound(network_maxmin_system, action->variable, - (action->lat_current > 0)? - sg_tcp_gamma / (2.0 * action->lat_current) :-1.0); + (action->lat_current > 0) ? + sg_tcp_gamma / (2.0 * + action->lat_current) : -1.0); } else { lmm_update_variable_bound(network_maxmin_system, action->variable, - (action->lat_current > 0)? - min(action->rate, sg_tcp_gamma / (2.0 * action->lat_current)) - :action->rate); + (action->lat_current > 0) ? + min(action->rate, + sg_tcp_gamma / (2.0 * + action->lat_current)) + : action->rate); } xbt_dynar_foreach(route, i, link) { @@ -866,7 +889,6 @@ static surf_action_t net_communicate(const char *src_name, action->variable, .05); } } - #ifdef HAVE_TRACING if (TRACE_is_enabled()) { action->src_name = xbt_strdup(src_name); @@ -884,8 +906,8 @@ static surf_action_t net_communicate(const char *src_name, static xbt_dynar_t net_get_route(const char *src, const char *dst) { - xbt_dynar_t route=NULL; - routing_get_route_and_latency(src, dst,&route,NULL); + xbt_dynar_t route = NULL; + routing_get_route_and_latency(src, dst, &route, NULL); return route; } @@ -913,7 +935,7 @@ static void net_action_suspend(surf_action_t action) ((surf_action_network_CM02_t) action)->variable, 0.0); - if(network_update_mechanism == UM_LAZY)// remove action from the heap + if (network_update_mechanism == UM_LAZY) // remove action from the heap heap_remove((surf_action_network_CM02_t) action); } @@ -926,7 +948,7 @@ static void net_action_resume(surf_action_t action) ((surf_action_network_CM02_t) action)->weight); ((surf_action_network_CM02_t) action)->suspended = 0; - if(network_update_mechanism == UM_LAZY)// remove action from the heap + if (network_update_mechanism == UM_LAZY) // remove action from the heap heap_remove((surf_action_network_CM02_t) action); } } @@ -939,14 +961,15 @@ static int net_action_is_suspended(surf_action_t action) void net_action_set_max_duration(surf_action_t action, double duration) { action->max_duration = duration; - if(network_update_mechanism == UM_LAZY)// remove action from the heap + if (network_update_mechanism == UM_LAZY) // remove action from the heap heap_remove((surf_action_network_CM02_t) action); } #ifdef HAVE_TRACING -static void net_action_set_category(surf_action_t action, const char *category) +static void net_action_set_category(surf_action_t action, + const char *category) { - action->category = xbt_strdup (category); + action->category = xbt_strdup(category); } #endif @@ -958,65 +981,76 @@ static void net_finalize(void) lmm_system_free(network_maxmin_system); network_maxmin_system = NULL; - if(network_update_mechanism == UM_LAZY){ + if (network_update_mechanism == UM_LAZY) { xbt_heap_free(net_action_heap); xbt_swag_free(net_modified_set); } - if(smpi_bw_factor) - xbt_dynar_free(&smpi_bw_factor); - if(smpi_lat_factor) - xbt_dynar_free(&smpi_lat_factor); + if (smpi_bw_factor) + xbt_dynar_free(&smpi_bw_factor); + if (smpi_lat_factor) + xbt_dynar_free(&smpi_lat_factor); } -static void smpi_gap_append(double size, const link_CM02_t link, surf_action_network_CM02_t action) { - const char* src = link->lmm_resource.generic_resource.name; - xbt_fifo_t fifo; - surf_action_network_CM02_t last_action; - double bw; - - if(sg_sender_gap > 0.0) { - if(!gap_lookup) { - gap_lookup = xbt_dict_new(); - } - fifo = (xbt_fifo_t)xbt_dict_get_or_null(gap_lookup, src); - action->sender.gap = 0.0; - if(fifo && xbt_fifo_size(fifo) > 0) { - /* Compute gap from last send */ - last_action = (surf_action_network_CM02_t)xbt_fifo_get_item_content(xbt_fifo_get_last_item(fifo)); - bw = net_get_link_bandwidth(link); - action->sender.gap = last_action->sender.gap + max(sg_sender_gap, last_action->sender.size / bw); - action->latency += action->sender.gap; - } - /* Append action as last send */ - action->sender.link_name = link->lmm_resource.generic_resource.name; - fifo = (xbt_fifo_t)xbt_dict_get_or_null(gap_lookup, action->sender.link_name); - if(!fifo) { - fifo = xbt_fifo_new(); - xbt_dict_set(gap_lookup, action->sender.link_name, fifo, NULL); - } - action->sender.fifo_item = xbt_fifo_push(fifo, action); - action->sender.size = size; - } +static void smpi_gap_append(double size, const link_CM02_t link, + surf_action_network_CM02_t action) +{ + const char *src = link->lmm_resource.generic_resource.name; + xbt_fifo_t fifo; + surf_action_network_CM02_t last_action; + double bw; + + if (sg_sender_gap > 0.0) { + if (!gap_lookup) { + gap_lookup = xbt_dict_new(); + } + fifo = (xbt_fifo_t) xbt_dict_get_or_null(gap_lookup, src); + action->sender.gap = 0.0; + if (fifo && xbt_fifo_size(fifo) > 0) { + /* Compute gap from last send */ + last_action = (surf_action_network_CM02_t) + xbt_fifo_get_item_content(xbt_fifo_get_last_item(fifo)); + bw = net_get_link_bandwidth(link); + action->sender.gap = + last_action->sender.gap + max(sg_sender_gap, + last_action->sender.size / bw); + action->latency += action->sender.gap; + } + /* Append action as last send */ + action->sender.link_name = link->lmm_resource.generic_resource.name; + fifo = + (xbt_fifo_t) xbt_dict_get_or_null(gap_lookup, + action->sender.link_name); + if (!fifo) { + fifo = xbt_fifo_new(); + xbt_dict_set(gap_lookup, action->sender.link_name, fifo, NULL); + } + action->sender.fifo_item = xbt_fifo_push(fifo, action); + action->sender.size = size; + } } -static void smpi_gap_remove(surf_action_network_CM02_t action) { - xbt_fifo_t fifo; - size_t size; - - if(sg_sender_gap > 0.0 && action->sender.link_name && action->sender.fifo_item) { - fifo = (xbt_fifo_t)xbt_dict_get_or_null(gap_lookup, action->sender.link_name); - xbt_fifo_remove_item(fifo, action->sender.fifo_item); - size = xbt_fifo_size(fifo); - if(size == 0) { - xbt_fifo_free(fifo); - xbt_dict_remove(gap_lookup, action->sender.link_name); - size = xbt_dict_length(gap_lookup); - if(size == 0) { - xbt_dict_free(&gap_lookup); - } +static void smpi_gap_remove(surf_action_network_CM02_t action) +{ + xbt_fifo_t fifo; + size_t size; + + if (sg_sender_gap > 0.0 && action->sender.link_name + && action->sender.fifo_item) { + fifo = + (xbt_fifo_t) xbt_dict_get_or_null(gap_lookup, + action->sender.link_name); + xbt_fifo_remove_item(fifo, action->sender.fifo_item); + size = xbt_fifo_size(fifo); + if (size == 0) { + xbt_fifo_free(fifo); + xbt_dict_remove(gap_lookup, action->sender.link_name); + size = xbt_dict_length(gap_lookup); + if (size == 0) { + xbt_dict_free(&gap_lookup); } - } + } + } } static void surf_network_model_init_internal(void) @@ -1037,16 +1071,20 @@ static void surf_network_model_init_internal(void) #endif surf_network_model->model_private->resource_used = net_resource_used; - if(network_update_mechanism == UM_LAZY) { - surf_network_model->model_private->share_resources = net_share_resources_lazy; - surf_network_model->model_private->update_actions_state = net_update_actions_state_lazy; - } else if(network_update_mechanism == UM_FULL) { - surf_network_model->model_private->share_resources = net_share_resources_full; - surf_network_model->model_private->update_actions_state = net_update_actions_state_full; + if (network_update_mechanism == UM_LAZY) { + surf_network_model->model_private->share_resources = + net_share_resources_lazy; + surf_network_model->model_private->update_actions_state = + net_update_actions_state_lazy; + } else if (network_update_mechanism == UM_FULL) { + surf_network_model->model_private->share_resources = + net_share_resources_full; + surf_network_model->model_private->update_actions_state = + net_update_actions_state_full; } surf_network_model->model_private->update_resource_state = - net_update_resource_state; + net_update_resource_state; surf_network_model->model_private->finalize = net_finalize; surf_network_model->suspend = net_action_suspend; @@ -1057,49 +1095,56 @@ static void surf_network_model_init_internal(void) surf_network_model->extension.network.communicate = net_communicate; surf_network_model->extension.network.get_route = net_get_route; surf_network_model->extension.network.get_link_bandwidth = - net_get_link_bandwidth; + net_get_link_bandwidth; surf_network_model->extension.network.get_link_latency = - net_get_link_latency; + net_get_link_latency; surf_network_model->extension.network.link_shared = net_link_shared; surf_network_model->extension.network.add_traces = net_add_traces; surf_network_model->extension.network.create_resource = - net_create_resource; + net_create_resource; - if (!network_maxmin_system) + if (!network_maxmin_system) network_maxmin_system = lmm_system_new(net_selective_update); - routing_model_create(sizeof(link_CM02_t), - net_create_resource("__loopback__", - 498000000, NULL, 0.000015, NULL, - SURF_RESOURCE_ON, NULL, - SURF_LINK_FATPIPE, NULL)); - - if(network_update_mechanism == UM_LAZY){ - net_action_heap = xbt_heap_new(8,NULL); - xbt_heap_set_update_callback(net_action_heap, net_action_update_index_heap); - net_modified_set = xbt_swag_new(xbt_swag_offset(comm, action_list_hookup)); + routing_model_create(sizeof(link_CM02_t), + net_create_resource("__loopback__", + 498000000, NULL, 0.000015, NULL, + SURF_RESOURCE_ON, NULL, + SURF_LINK_FATPIPE, NULL)); + + if (network_update_mechanism == UM_LAZY) { + net_action_heap = xbt_heap_new(8, NULL); + xbt_heap_set_update_callback(net_action_heap, + net_action_update_index_heap); + net_modified_set = + xbt_swag_new(xbt_swag_offset(comm, action_list_hookup)); network_maxmin_system->keep_track = net_modified_set; } } -static void set_update_mechanism(void) { +static void set_update_mechanism(void) +{ #ifdef HAVE_TRACING - TRACE_set_network_update_mechanism (); + TRACE_set_network_update_mechanism(); #endif char *optim = xbt_cfg_get_string(_surf_cfg_set, "network/optim"); - int select = xbt_cfg_get_int(_surf_cfg_set, "network/maxmin_selective_update"); + int select = + xbt_cfg_get_int(_surf_cfg_set, "network/maxmin_selective_update"); - if(!strcmp(optim,"Full")) { + if (!strcmp(optim, "Full")) { network_update_mechanism = UM_FULL; net_selective_update = select; - } else if (!strcmp(optim,"Lazy")) { + } else if (!strcmp(optim, "Lazy")) { network_update_mechanism = UM_LAZY; net_selective_update = 1; - xbt_assert((select==1) || (xbt_cfg_is_default_value(_surf_cfg_set,"network/maxmin_selective_update")), - "Disabling selective update while using the lazy update mechanism is dumb!"); + xbt_assert((select == 1) + || + (xbt_cfg_is_default_value + (_surf_cfg_set, "network/maxmin_selective_update")), + "Disabling selective update while using the lazy update mechanism is dumb!"); } else { - xbt_die("Unsupported optimization (%s) for this model",optim); + xbt_die("Unsupported optimization (%s) for this model", optim); } } @@ -1161,8 +1206,10 @@ void surf_network_model_init_LegrandVelho(void) xbt_dynar_push(model_list, &surf_network_model); network_solve = lmm_solve; - xbt_cfg_setdefault_double(_surf_cfg_set, "network/latency_factor", 13.01); - xbt_cfg_setdefault_double(_surf_cfg_set, "network/bandwidth_factor",0.97); + xbt_cfg_setdefault_double(_surf_cfg_set, "network/latency_factor", + 13.01); + xbt_cfg_setdefault_double(_surf_cfg_set, "network/bandwidth_factor", + 0.97); xbt_cfg_setdefault_double(_surf_cfg_set, "network/weight_S", 20537); } @@ -1190,7 +1237,8 @@ void surf_network_model_init_CM02(void) network_solve = lmm_solve; xbt_cfg_setdefault_double(_surf_cfg_set, "network/latency_factor", 1.0); - xbt_cfg_setdefault_double(_surf_cfg_set, "network/bandwidth_factor", 1.0); + xbt_cfg_setdefault_double(_surf_cfg_set, "network/bandwidth_factor", + 1.0); xbt_cfg_setdefault_double(_surf_cfg_set, "network/weight_S", 0.0); }