X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/71a5e1d7943f1ee568b39c6975f1129229fb943b..4d9370faea9fdff22188cf32f2488b89b2bb4472:/src/surf/network.c diff --git a/src/surf/network.c b/src/surf/network.c index 9ba7180747..d5b647e697 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 */ /******************************************************************************/ @@ -157,7 +154,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, @@ -297,40 +293,6 @@ static int net_resource_used(void *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->model_private->maxmin_system, - ((surf_action_lmm_t) action)->variable); - } - if (surf_network_model->model_private->update_mechanism == UM_LAZY) { // remove action from the heap - surf_action_lmm_heap_remove(surf_network_model->model_private->action_heap,(surf_action_lmm_t) action); - xbt_swag_remove(action, surf_network_model->model_private->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->model_private->update_mechanism == UM_LAZY) { // remove action from the heap - xbt_swag_remove(action, surf_network_model->model_private->modified_set); - surf_action_lmm_heap_remove(surf_network_model->model_private->action_heap,(surf_action_lmm_t) action); - } -} - void net_action_recycle(surf_action_t action) { return; @@ -343,51 +305,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->model_private->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->model_private->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->model_private->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; @@ -424,208 +341,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->model_private->modified_set)); - - lmm_solve(surf_network_model->model_private->maxmin_system); - - XBT_DEBUG - ("After share resources, The size of modified actions set is %d", - xbt_swag_size(surf_network_model->model_private->modified_set)); - - while((action = xbt_swag_extract(surf_network_model->model_private->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->model_private->action_heap,(surf_action_lmm_t)action); - surf_action_lmm_heap_insert(surf_network_model->model_private->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->model_private->action_heap) > 0) - min = xbt_heap_maxkey(surf_network_model->model_private->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->model_private->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(surf_network_model->model_private->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(surf_network_model->model_private->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(surf_network_model->model_private->maxmin_system, - GENERIC_LMM_ACTION(action).variable, - i)), - now - delta, - delta); - } - } -#endif - if (!lmm_get_number_of_cnst_from_var - (surf_network_model->model_private->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->model_private->action_heap) > 0) - && (double_equals(xbt_heap_maxkey(surf_network_model->model_private->action_heap), now))) { - action = xbt_heap_pop(surf_network_model->model_private->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(surf_network_model->model_private->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(surf_network_model->model_private->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(surf_network_model->model_private->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->model_private->maxmin_system, GENERIC_LMM_ACTION(action).variable, - action->weight); - surf_action_lmm_heap_remove(surf_network_model->model_private->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->model_private->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, @@ -906,51 +632,6 @@ 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->model_private->maxmin_system, - ((surf_action_network_CM02_t) - action)->generic_lmm_action.variable, 0.0); - - if (surf_network_model->model_private->update_mechanism == UM_LAZY) // remove action from the heap - surf_action_lmm_heap_remove(surf_network_model->model_private->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->model_private->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->model_private->update_mechanism == UM_LAZY) // remove action from the heap - surf_action_lmm_heap_remove(surf_network_model->model_private->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->model_private->update_mechanism == UM_LAZY) // remove action from the heap - surf_action_lmm_heap_remove(surf_network_model->model_private->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->model_private->maxmin_system); @@ -991,8 +672,7 @@ static void smpi_gap_append(double size, const link_CM02_t link, 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); + max(sg_sender_gap,last_action->sender.size / bw); action->latency += action->sender.gap; } /* Append action as last send */ @@ -1009,10 +689,11 @@ static void smpi_gap_append(double size, const link_CM02_t link, } } -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) { @@ -1062,15 +743,17 @@ 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; @@ -1090,10 +773,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; @@ -1122,6 +805,8 @@ static void surf_network_model_init_internal(void) xbt_swag_new(xbt_swag_offset(comm, generic_lmm_action.action_list_hookup)); surf_network_model->model_private->maxmin_system->keep_track = surf_network_model->model_private->modified_set; } + + surf_network_model->gap_remove = NULL; } /************************************************************************/ @@ -1146,7 +831,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;