X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/867ae3ddfab33175d0bce6d797b2f537396693aa..3604f04709e5e6f2abd0ee011b2f8e0e8f32a96a:/src/surf/network.c diff --git a/src/surf/network.c b/src/surf/network.c index 603474748f..db352085f7 100644 --- a/src/surf/network.c +++ b/src/surf/network.c @@ -55,9 +55,6 @@ int sg_network_crosstraffic = 0; xbt_dict_t gap_lookup = NULL; -static int net_action_is_suspended(surf_action_t action); -static void net_update_action_remaining_lazy(surf_action_network_CM02_t action, double now); - /******************************************************************************/ /* Factors callbacks */ /******************************************************************************/ @@ -80,6 +77,13 @@ static double constant_bandwidth_constraint(double rate, double bound, /**********************/ /* SMPI callbacks */ /**********************/ + +static int factor_cmp(const void *pa, const void *pb) +{ + return (((s_smpi_factor_t*)pa)->factor > ((s_smpi_factor_t*)pb)->factor); +} + + static xbt_dynar_t parse_factor(const char *smpi_coef_string) { char *value = NULL; @@ -101,6 +105,12 @@ static xbt_dynar_t parse_factor(const char *smpi_coef_string) xbt_dynar_free(&radical_elements2); } xbt_dynar_free(&radical_elements); + iter=0; + xbt_dynar_sort(smpi_factor, &factor_cmp); + xbt_dynar_foreach(smpi_factor, iter, fact) { + XBT_DEBUG("ordered smpi_factor:\t%ld : %f", fact.factor, fact.value); + + } return smpi_factor; } @@ -108,36 +118,42 @@ 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")); + parse_factor(surf_cfg_get_string("smpi/bw_factor")); unsigned int iter = 0; s_smpi_factor_t fact; + double current=1.0; 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; - } + if (size <= fact.factor) { + XBT_DEBUG("%lf <= %ld return %f", size, fact.factor, current); + return current; + }else + current=fact.value; } + XBT_DEBUG("%lf > %ld return %f", size, fact.factor, current); - return 1.0; + return current; } 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")); + parse_factor(surf_cfg_get_string("smpi/lat_factor")); unsigned int iter = 0; s_smpi_factor_t fact; + double current=1.0; 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; - } + if (size <= fact.factor) { + XBT_DEBUG("%lf <= %ld return %f", size, fact.factor, current); + return current; + }else + current=fact.value; } + XBT_DEBUG("%lf > %ld return %f", size, fact.factor, current); - return 1.0; + return current; } /**--------- -----------*/ @@ -157,7 +173,6 @@ static double (*bandwidth_constraint_callback) (double, double, double) = 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, @@ -173,7 +188,7 @@ static void *net_create_resource(const char *name, link_CM02_t nw_link = (link_CM02_t) surf_resource_lmm_new(sizeof(s_link_CM02_t), surf_network_model, name, properties, - surf_network_model->maxmin_system, + surf_network_model->model_private->maxmin_system, sg_bandwidth_factor * bw_initial, history, state_initial, state_trace, @@ -292,45 +307,11 @@ static void net_define_callbacks(void) static int net_resource_used(void *resource_id) { - return lmm_constraint_used(surf_network_model->maxmin_system, ((surf_resource_lmm_t) + return lmm_constraint_used(surf_network_model->model_private->maxmin_system, ((surf_resource_lmm_t) resource_id)-> constraint); } -static int net_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(surf_network_model->maxmin_system, - ((surf_action_lmm_t) action)->variable); - } - if (surf_network_model->update_mechanism == UM_LAZY) { // remove action from the heap - surf_action_lmm_heap_remove(surf_network_model->action_heap,(surf_action_lmm_t) action); - xbt_swag_remove(action, surf_network_model->modified_set); - } -#ifdef HAVE_TRACING - if (action->category) xbt_free (action->category); -#endif - surf_action_free(&action); - return 1; - } - return 0; -} - - - -static void net_action_cancel(surf_action_t action) -{ - XBT_DEBUG("cancel action %p", action); - surf_network_model->action_state_set(action, SURF_ACTION_FAILED); - if (surf_network_model->update_mechanism == UM_LAZY) { // remove action from the heap - xbt_swag_remove(action, surf_network_model->modified_set); - surf_action_lmm_heap_remove(surf_network_model->action_heap,(surf_action_lmm_t) action); - } -} - void net_action_recycle(surf_action_t action) { return; @@ -343,51 +324,6 @@ int net_get_link_latency_limited(surf_action_t action) } #endif -double net_action_get_remains(surf_action_t action) -{ - XBT_IN("(%p)", action); - /* update remains before return it */ - if (surf_network_model->update_mechanism == UM_LAZY) /* update remains before return it */ - net_update_action_remaining_lazy((surf_action_network_CM02_t)action, - surf_get_clock()); - XBT_OUT(); - return action->remains; -} - -static void net_update_action_remaining_lazy(surf_action_network_CM02_t action, double now) -{ - double delta = 0.0; - - if (GENERIC_LMM_ACTION(action).suspended != 0) - return; - - delta = now - GENERIC_LMM_ACTION(action).last_update; - - double_update(&(((surf_action_t)action)->remains), - GENERIC_LMM_ACTION(action).last_value * delta); - - if (((surf_action_t)action)->max_duration != NO_MAX_DURATION) - double_update(&(((surf_action_t)action)->max_duration), delta); - - if ((((surf_action_t)action)->remains <= 0) && - (lmm_get_variable_weight(GENERIC_LMM_ACTION(action).variable) > 0)) { - ((surf_action_t)action)->finish = surf_get_clock(); - surf_network_model->action_state_set((surf_action_t) action, - SURF_ACTION_DONE); - - surf_action_lmm_heap_remove(surf_network_model->action_heap,(surf_action_lmm_t)action); - } else if (((((surf_action_t)action)->max_duration != NO_MAX_DURATION) - && (((surf_action_t)action)->max_duration <= 0))) { - ((surf_action_t)action)->finish = surf_get_clock(); - surf_network_model->action_state_set((surf_action_t) action, - SURF_ACTION_DONE); - surf_action_lmm_heap_remove(surf_network_model->action_heap,(surf_action_lmm_t)action); - } - - GENERIC_LMM_ACTION(action).last_update = now; - GENERIC_LMM_ACTION(action).last_value = lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable); -} - static double net_share_resources_full(double now) { s_surf_action_lmm_t s_action; @@ -399,7 +335,7 @@ static double net_share_resources_full(double now) min = generic_maxmin_share_resources(running_actions, xbt_swag_offset(s_action, variable), - surf_network_model->maxmin_system, + surf_network_model->model_private->maxmin_system, network_solve); #define VARIABLE(action) (*((lmm_variable_t*)(((char *) (action)) + xbt_swag_offset(s_action, variable) ))) @@ -424,208 +360,17 @@ 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 value; - - XBT_DEBUG - ("Before share resources, the size of modified actions set is %d", - xbt_swag_size(surf_network_model->modified_set)); - - lmm_solve(surf_network_model->maxmin_system); - - XBT_DEBUG - ("After share resources, The size of modified actions set is %d", - xbt_swag_size(surf_network_model->modified_set)); - - while((action = xbt_swag_extract(surf_network_model->modified_set))) { - int max_dur_flag = 0; - - if (GENERIC_ACTION(action).state_set != - surf_network_model->states.running_action_set) - continue; - - /* bogus priority, skip it */ - if (GENERIC_ACTION(action).priority <= 0) - continue; - - net_update_action_remaining_lazy(action,now); - - 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).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; - 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); - - if (min != -1) { - surf_action_lmm_heap_remove(surf_network_model->action_heap,(surf_action_lmm_t)action); - surf_action_lmm_heap_insert(surf_network_model->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; - } - - //hereafter must have already the min value for this resource model - if (xbt_heap_size(surf_network_model->action_heap) > 0) - min = xbt_heap_maxkey(surf_network_model->action_heap) - now; - else - min = -1; - - XBT_DEBUG("The minimum with the HEAP %lf", min); - - return min; + return generic_share_resources_lazy(now, surf_network_model); } static void net_update_actions_state_full(double now, double delta) { - double deltap = 0.0; - surf_action_network_CM02_t action = NULL; - surf_action_network_CM02_t next_action = NULL; - xbt_swag_t running_actions = - surf_network_model->states.running_action_set; - /* - xbt_swag_t failed_actions = - surf_network_model->states.failed_action_set; - */ - - xbt_swag_foreach_safe(action, next_action, running_actions) { - deltap = delta; - if (action->latency > 0) { - if (action->latency > deltap) { - double_update(&(action->latency), deltap); - deltap = 0.0; - } else { - double_update(&(deltap), action->latency); - action->latency = 0.0; - } - if ((action->latency == 0.0) && !(GENERIC_LMM_ACTION(action).suspended)) - lmm_update_variable_weight(surf_network_model->maxmin_system, GENERIC_LMM_ACTION(action).variable, - action->weight); - } -#ifdef HAVE_TRACING - if (TRACE_is_enabled()) { - int n = lmm_get_number_of_cnst_from_var(network_maxmin_system, GENERIC_LMM_ACTION(action).variable); - unsigned int i; - for (i = 0; i < n; i++){ - lmm_constraint_t constraint = lmm_get_cnst_from_var(network_maxmin_system, - GENERIC_LMM_ACTION(action).variable, - i); - link_CM02_t link = lmm_constraint_id(constraint); - TRACE_surf_link_set_utilization(link->lmm_resource.generic_resource.name, - ((surf_action_t)action)->category, - (lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable)* - lmm_get_cnst_weight_from_var(network_maxmin_system, - GENERIC_LMM_ACTION(action).variable, - i)), - now - delta, - delta); - } - } -#endif - if (!lmm_get_number_of_cnst_from_var - (surf_network_model->maxmin_system, GENERIC_LMM_ACTION(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(&(GENERIC_ACTION(action).remains), - GENERIC_ACTION(action).remains); - } - double_update(&(GENERIC_ACTION(action).remains), - lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable) * deltap); - if (((surf_action_t)action)->max_duration != NO_MAX_DURATION) - double_update(&(((surf_action_t)action)->max_duration), delta); - - if ((GENERIC_ACTION(action).remains <= 0) && - (lmm_get_variable_weight(GENERIC_LMM_ACTION(action).variable) > 0)) { - ((surf_action_t)action)->finish = surf_get_clock(); - surf_network_model->action_state_set((surf_action_t) action, - SURF_ACTION_DONE); - - if (gap_remove) - gap_remove(action); - } else if ((((surf_action_t)action)->max_duration != NO_MAX_DURATION) - && (((surf_action_t)action)->max_duration <= 0)) { - ((surf_action_t)action)->finish = surf_get_clock(); - surf_network_model->action_state_set((surf_action_t) action, - SURF_ACTION_DONE); - if (gap_remove) - gap_remove(action); - } - } - - return; + generic_update_actions_state_full(now, delta, surf_network_model); } static void net_update_actions_state_lazy(double now, double delta) { - surf_action_network_CM02_t action = NULL; - - while ((xbt_heap_size(surf_network_model->action_heap) > 0) - && (double_equals(xbt_heap_maxkey(surf_network_model->action_heap), now))) { - action = xbt_heap_pop(surf_network_model->action_heap); - XBT_DEBUG("Action %p: finish", action); - GENERIC_ACTION(action).finish = surf_get_clock(); -#ifdef HAVE_TRACING - if (TRACE_is_enabled()) { - int n = lmm_get_number_of_cnst_from_var(network_maxmin_system, GENERIC_LMM_ACTION(action).variable); - unsigned int i; - for (i = 0; i < n; i++){ - lmm_constraint_t constraint = lmm_get_cnst_from_var(network_maxmin_system, - GENERIC_LMM_ACTION(action).variable, - i); - link_CM02_t link = lmm_constraint_id(constraint); - TRACE_surf_link_set_utilization(link->lmm_resource.generic_resource.name, - ((surf_action_t)action)->category, - (lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable)* - lmm_get_cnst_weight_from_var(network_maxmin_system, - GENERIC_LMM_ACTION(action).variable, - i)), - GENERIC_LMM_ACTION(action).last_update, - now - GENERIC_LMM_ACTION(action).last_update); - } - } -#endif - - // if I am wearing a latency hat - if (GENERIC_LMM_ACTION(action).hat == LATENCY) { - lmm_update_variable_weight(surf_network_model->maxmin_system, GENERIC_LMM_ACTION(action).variable, - action->weight); - surf_action_lmm_heap_remove(surf_network_model->action_heap,(surf_action_lmm_t)action); - GENERIC_LMM_ACTION(action).last_update = surf_get_clock(); - - // if I am wearing a max_duration or normal hat - } else if (GENERIC_LMM_ACTION(action).hat == MAX_DURATION || - GENERIC_LMM_ACTION(action).hat == NORMAL) { - // no need to communicate anymore - // assume that flows that reached max_duration have remaining of 0 - GENERIC_ACTION(action).remains = 0; - ((surf_action_t)action)->finish = surf_get_clock(); - surf_network_model->action_state_set((surf_action_t) action, - SURF_ACTION_DONE); - surf_action_lmm_heap_remove(surf_network_model->action_heap,(surf_action_lmm_t)action); - } - } - return; + generic_update_actions_state_lazy(now, delta, surf_network_model); } static void net_update_resource_state(void *id, @@ -647,7 +392,7 @@ static void net_update_resource_state(void *id, surf_action_network_CM02_t action = NULL; nw_link->lmm_resource.power.peak = value; - lmm_update_constraint_bound(surf_network_model->maxmin_system, + lmm_update_constraint_bound(surf_network_model->model_private->maxmin_system, nw_link->lmm_resource.constraint, sg_bandwidth_factor * (nw_link->lmm_resource.power.peak * @@ -663,12 +408,12 @@ static void net_update_resource_state(void *id, #endif if (sg_weight_S_parameter > 0) { while ((var = lmm_get_var_from_cnst - (surf_network_model->maxmin_system, nw_link->lmm_resource.constraint, + (surf_network_model->model_private->maxmin_system, nw_link->lmm_resource.constraint, &elem))) { action = lmm_variable_id(var); action->weight += delta; if (!(GENERIC_LMM_ACTION(action).suspended)) - lmm_update_variable_weight(surf_network_model->maxmin_system, + lmm_update_variable_weight(surf_network_model->model_private->maxmin_system, GENERIC_LMM_ACTION(action).variable, action->weight); } } @@ -682,17 +427,17 @@ static void net_update_resource_state(void *id, nw_link->lat_current = value; while ((var = lmm_get_var_from_cnst - (surf_network_model->maxmin_system, nw_link->lmm_resource.constraint, + (surf_network_model->model_private->maxmin_system, nw_link->lmm_resource.constraint, &elem))) { action = lmm_variable_id(var); action->lat_current += delta; action->weight += delta; if (action->rate < 0) - lmm_update_variable_bound(surf_network_model->maxmin_system, GENERIC_LMM_ACTION(action).variable, + lmm_update_variable_bound(surf_network_model->model_private->maxmin_system, GENERIC_LMM_ACTION(action).variable, sg_tcp_gamma / (2.0 * action->lat_current)); else { - lmm_update_variable_bound(surf_network_model->maxmin_system, GENERIC_LMM_ACTION(action).variable, + lmm_update_variable_bound(surf_network_model->model_private->maxmin_system, GENERIC_LMM_ACTION(action).variable, min(action->rate, sg_tcp_gamma / (2.0 * action-> @@ -706,7 +451,7 @@ static void net_update_resource_state(void *id, } } if (!(GENERIC_LMM_ACTION(action).suspended)) - lmm_update_variable_weight(surf_network_model->maxmin_system, GENERIC_LMM_ACTION(action).variable, + lmm_update_variable_weight(surf_network_model->model_private->maxmin_system, GENERIC_LMM_ACTION(action).variable, action->weight); } @@ -722,7 +467,7 @@ static void net_update_resource_state(void *id, nw_link->lmm_resource.state_current = SURF_RESOURCE_OFF; while ((var = lmm_get_var_from_cnst - (surf_network_model->maxmin_system, cnst, &elem))) { + (surf_network_model->model_private->maxmin_system, cnst, &elem))) { surf_action_t action = lmm_variable_id(var); if (surf_action_state_get(action) == SURF_ACTION_RUNNING || @@ -794,7 +539,7 @@ static surf_action_t net_communicate(sg_routing_edge_t src, xbt_swag_insert(action, ((surf_action_t)action)->state_set); action->rate = rate; - if (surf_network_model->update_mechanism == UM_LAZY) { + if (surf_network_model->model_private->update_mechanism == UM_LAZY) { GENERIC_LMM_ACTION(action).index_heap = -1; GENERIC_LMM_ACTION(action).last_update = surf_get_clock(); } @@ -835,27 +580,27 @@ static surf_action_t net_communicate(sg_routing_edge_t src, if (action->latency > 0) { GENERIC_LMM_ACTION(action).variable = - lmm_variable_new(surf_network_model->maxmin_system, action, 0.0, -1.0, + lmm_variable_new(surf_network_model->model_private->maxmin_system, action, 0.0, -1.0, constraints_per_variable); - if (surf_network_model->update_mechanism == UM_LAZY) { + if (surf_network_model->model_private->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 + GENERIC_LMM_ACTION(action).last_update); - surf_action_lmm_heap_insert(surf_network_model->action_heap,(surf_action_lmm_t)action, action->latency + GENERIC_LMM_ACTION(action).last_update, + surf_action_lmm_heap_insert(surf_network_model->model_private->action_heap,(surf_action_lmm_t)action, action->latency + GENERIC_LMM_ACTION(action).last_update, xbt_dynar_is_empty(route) ? NORMAL : LATENCY); } } else GENERIC_LMM_ACTION(action).variable = - lmm_variable_new(surf_network_model->maxmin_system, action, 1.0, -1.0, + lmm_variable_new(surf_network_model->model_private->maxmin_system, action, 1.0, -1.0, constraints_per_variable); if (action->rate < 0) { - lmm_update_variable_bound(surf_network_model->maxmin_system, GENERIC_LMM_ACTION(action).variable, + lmm_update_variable_bound(surf_network_model->model_private->maxmin_system, GENERIC_LMM_ACTION(action).variable, (action->lat_current > 0) ? sg_tcp_gamma / (2.0 * action->lat_current) : -1.0); } else { - lmm_update_variable_bound(surf_network_model->maxmin_system, GENERIC_LMM_ACTION(action).variable, + lmm_update_variable_bound(surf_network_model->model_private->maxmin_system, GENERIC_LMM_ACTION(action).variable, (action->lat_current > 0) ? min(action->rate, sg_tcp_gamma / (2.0 * @@ -864,14 +609,14 @@ static surf_action_t net_communicate(sg_routing_edge_t src, } xbt_dynar_foreach(route, i, link) { - lmm_expand(surf_network_model->maxmin_system, link->lmm_resource.constraint, + lmm_expand(surf_network_model->model_private->maxmin_system, link->lmm_resource.constraint, GENERIC_LMM_ACTION(action).variable, 1.0); } if (sg_network_crosstraffic == 1) { XBT_DEBUG("Fullduplex active adding backward flow using 5%%"); xbt_dynar_foreach(back_route, i, link) { - lmm_expand(surf_network_model->maxmin_system, link->lmm_resource.constraint, + lmm_expand(surf_network_model->model_private->maxmin_system, link->lmm_resource.constraint, GENERIC_LMM_ACTION(action).variable, .05); } } @@ -906,59 +651,14 @@ static int net_link_shared(const void *link) lmm_constraint_is_shared(((surf_resource_lmm_t) link)->constraint); } -static void net_action_suspend(surf_action_t action) -{ - ((surf_action_network_CM02_t) action)->generic_lmm_action.suspended = 1; - lmm_update_variable_weight(surf_network_model->maxmin_system, - ((surf_action_network_CM02_t) - action)->generic_lmm_action.variable, 0.0); - - if (surf_network_model->update_mechanism == UM_LAZY) // remove action from the heap - surf_action_lmm_heap_remove(surf_network_model->action_heap,(surf_action_lmm_t)action); -} - -static void net_action_resume(surf_action_t action) -{ - if (((surf_action_network_CM02_t) action)->generic_lmm_action.suspended) { - lmm_update_variable_weight(surf_network_model->maxmin_system, - ((surf_action_network_CM02_t) - action)->generic_lmm_action.variable, - ((surf_action_network_CM02_t) - action)->weight); - ((surf_action_network_CM02_t) action)->generic_lmm_action.suspended = 0; - if (surf_network_model->update_mechanism == UM_LAZY) // remove action from the heap - surf_action_lmm_heap_remove(surf_network_model->action_heap,(surf_action_lmm_t)action); - } -} - -static int net_action_is_suspended(surf_action_t action) -{ - return ((surf_action_network_CM02_t) action)->generic_lmm_action.suspended; -} - -void net_action_set_max_duration(surf_action_t action, double duration) -{ - action->max_duration = duration; - if (surf_network_model->update_mechanism == UM_LAZY) // remove action from the heap - surf_action_lmm_heap_remove(surf_network_model->action_heap,(surf_action_lmm_t)action); -} - -#ifdef HAVE_TRACING -static void net_action_set_category(surf_action_t action, - const char *category) -{ - action->category = xbt_strdup(category); -} -#endif - static void net_finalize(void) { - lmm_system_free(surf_network_model->maxmin_system); - surf_network_model->maxmin_system = NULL; + lmm_system_free(surf_network_model->model_private->maxmin_system); + surf_network_model->model_private->maxmin_system = NULL; - if (surf_network_model->update_mechanism == UM_LAZY) { - xbt_heap_free(surf_network_model->action_heap); - xbt_swag_free(surf_network_model->modified_set); + if (surf_network_model->model_private->update_mechanism == UM_LAZY) { + xbt_heap_free(surf_network_model->model_private->action_heap); + xbt_swag_free(surf_network_model->model_private->modified_set); } surf_model_exit(surf_network_model); @@ -975,8 +675,8 @@ static void smpi_gap_append(double size, const link_CM02_t link, { const char *src = link->lmm_resource.generic_resource.name; xbt_fifo_t fifo; - surf_action_network_CM02_t last_action; - double bw; + //surf_action_network_CM02_t last_action; + //double bw; if (sg_sender_gap > 0.0) { if (!gap_lookup) { @@ -986,17 +686,16 @@ static void smpi_gap_append(double size, const link_CM02_t link, action->sender.gap = 0.0; if (fifo && xbt_fifo_size(fifo) > 0) { /* Compute gap from last send */ - last_action = + /*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); + xbt_fifo_get_item_content(xbt_fifo_get_last_item(fifo));*/ + // bw = net_get_link_bandwidth(link); + action->sender.gap = sg_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; + /*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); @@ -1004,15 +703,16 @@ static void smpi_gap_append(double size, const link_CM02_t link, 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.fifo_item = xbt_fifo_push(fifo, action);*/ action->sender.size = size; } } -static void smpi_gap_remove(surf_action_network_CM02_t action) +static void smpi_gap_remove(surf_action_lmm_t lmm_action) { xbt_fifo_t fifo; size_t size; + surf_action_network_CM02_t action = (surf_action_network_CM02_t)(lmm_action); if (sg_sender_gap > 0.0 && action->sender.link_name && action->sender.fifo_item) { @@ -1039,11 +739,11 @@ static void set_update_mechanism(void) xbt_cfg_get_int(_surf_cfg_set, "network/maxmin_selective_update"); if (!strcmp(optim, "Full")) { - surf_network_model->update_mechanism = UM_FULL; - surf_network_model->selective_update = select; + surf_network_model->model_private->update_mechanism = UM_FULL; + surf_network_model->model_private->selective_update = select; } else if (!strcmp(optim, "Lazy")) { - surf_network_model->update_mechanism = UM_LAZY; - surf_network_model->selective_update = 1; + surf_network_model->model_private->update_mechanism = UM_LAZY; + surf_network_model->model_private->selective_update = 1; xbt_assert((select == 1) || (xbt_cfg_is_default_value @@ -1062,24 +762,26 @@ static void surf_network_model_init_internal(void) set_update_mechanism(); surf_network_model->name = "network"; - surf_network_model->action_unref = net_action_unref; - surf_network_model->action_cancel = net_action_cancel; + surf_network_model->action_unref = surf_action_unref; + surf_network_model->action_cancel = surf_action_cancel; surf_network_model->action_recycle = net_action_recycle; - surf_network_model->get_remains = net_action_get_remains; + + surf_network_model->get_remains = surf_action_get_remains; + #ifdef HAVE_LATENCY_BOUND_TRACKING surf_network_model->get_latency_limited = net_get_link_latency_limited; #endif #ifdef HAVE_TRACING - surf_network_model->set_category = net_action_set_category; + surf_network_model->set_category = surf_action_set_category; #endif surf_network_model->model_private->resource_used = net_resource_used; - if (surf_network_model->update_mechanism == UM_LAZY) { + if (surf_network_model->model_private->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 (surf_network_model->update_mechanism == UM_FULL) { + } else if (surf_network_model->model_private->update_mechanism == UM_FULL) { surf_network_model->model_private->share_resources = net_share_resources_full; surf_network_model->model_private->update_actions_state = @@ -1090,10 +792,10 @@ static void surf_network_model_init_internal(void) net_update_resource_state; surf_network_model->model_private->finalize = net_finalize; - surf_network_model->suspend = net_action_suspend; - surf_network_model->resume = net_action_resume; - surf_network_model->is_suspended = net_action_is_suspended; - surf_cpu_model->set_max_duration = net_action_set_max_duration; + surf_network_model->suspend = surf_action_suspend; + surf_network_model->resume = surf_action_resume; + surf_network_model->is_suspended = surf_action_is_suspended; + surf_cpu_model->set_max_duration = surf_action_set_max_duration; surf_network_model->extension.network.communicate = net_communicate; surf_network_model->extension.network.get_route = net_get_route; @@ -1106,22 +808,24 @@ static void surf_network_model_init_internal(void) surf_network_model->extension.network.create_resource = net_create_resource; - if (!surf_network_model->maxmin_system) - surf_network_model->maxmin_system = lmm_system_new(surf_network_model->selective_update); + if (!surf_network_model->model_private->maxmin_system) + surf_network_model->model_private->maxmin_system = lmm_system_new(surf_network_model->model_private->selective_update); routing_model_create(net_create_resource("__loopback__", 498000000, NULL, 0.000015, NULL, SURF_RESOURCE_ON, NULL, SURF_LINK_FATPIPE, NULL)); - if (surf_network_model->update_mechanism == UM_LAZY) { - surf_network_model->action_heap = xbt_heap_new(8, NULL); - xbt_heap_set_update_callback(surf_network_model->action_heap, + if (surf_network_model->model_private->update_mechanism == UM_LAZY) { + surf_network_model->model_private->action_heap = xbt_heap_new(8, NULL); + xbt_heap_set_update_callback(surf_network_model->model_private->action_heap, surf_action_lmm_update_index_heap); - surf_network_model->modified_set = + surf_network_model->model_private->modified_set = xbt_swag_new(xbt_swag_offset(comm, generic_lmm_action.action_list_hookup)); - surf_network_model->maxmin_system->keep_track = surf_network_model->modified_set; + surf_network_model->model_private->maxmin_system->keep_track = surf_network_model->model_private->modified_set; } + + surf_network_model->gap_remove = NULL; } /************************************************************************/ @@ -1146,7 +850,7 @@ void surf_network_model_init_SMPI(void) bandwidth_factor_callback = &smpi_bandwidth_factor; bandwidth_constraint_callback = &smpi_bandwidth_constraint; gap_append = &smpi_gap_append; - gap_remove = &smpi_gap_remove; + surf_network_model->gap_remove = &smpi_gap_remove; net_define_callbacks(); xbt_dynar_push(model_list, &surf_network_model); network_solve = lmm_solve;