X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8f3f851daa42c5485ec0fedf68b24c639e43aee5..5b78fc9f704153c9832230883dfd847f2bcf791d:/src/surf/network.c diff --git a/src/surf/network.c b/src/surf/network.c index 9664b6b8e8..3864fd918e 100644 --- a/src/surf/network.c +++ b/src/surf/network.c @@ -15,17 +15,78 @@ surf_model_t surf_network_model = NULL; static lmm_system_t network_maxmin_system = NULL; static void (*network_solve) (lmm_system_t) = NULL; -double sg_latency_factor = 1.0; /* default value; can be set by model or from command line */ -double sg_bandwidth_factor = 1.0; /* default value; can be set by model or from command line */ -double sg_weight_S_parameter = 0.0;/* default value; can be set by model or from command line */ +double sg_sender_gap = 0.0; +double sg_latency_factor = 1.0; /* default value; can be set by model or from command line */ +double sg_bandwidth_factor = 1.0; /* default value; can be set by model or from command line */ +double sg_weight_S_parameter = 0.0; /* default value; can be set by model or from command line */ double sg_tcp_gamma = 0.0; int sg_network_fullduplex = 0; +xbt_dict_t gap_lookup = NULL; + +static double net_get_link_bandwidth(const void *link); + +static void 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 gap_unknown(surf_action_network_CM02_t action) { + action->sender.gap = 0.0; + action->sender.link_name = NULL; + action->sender.fifo_item = NULL; + action->sender.size = 0.0; +} + +static void 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_size(gap_lookup); + if(size == 0) { + xbt_dict_free(&gap_lookup); + } + } + } +} /******************************************************************************/ /* Factors callbacks */ -/******************************************************************************/ +/******************************************************************************/ static double constant_latency_factor(double size) { return sg_latency_factor; @@ -36,7 +97,8 @@ static double constant_bandwidth_factor(double size) return sg_bandwidth_factor; } -static double constant_bandwidth_constraint(double rate, double bound, double size) +static double constant_bandwidth_constraint(double rate, double bound, + double size) { return rate; } @@ -76,53 +138,56 @@ static double smpi_bandwidth_factor(double size) return 0.9359; } -static double smpi_bandwidth_constraint(double rate, double bound, double size) +static double smpi_bandwidth_constraint(double rate, double bound, + double size) { return rate < 0 ? bound : min(bound, rate * smpi_bandwidth_factor(size)); } -static double (*latency_factor_callback)(double) = &constant_latency_factor; -static double (*bandwidth_factor_callback)(double) = &constant_bandwidth_factor; -static double (*bandwidth_constraint_callback)(double, double, double) = &constant_bandwidth_constraint; +static double (*latency_factor_callback) (double) = + &constant_latency_factor; +static double (*bandwidth_factor_callback) (double) = + &constant_bandwidth_factor; +static double (*bandwidth_constraint_callback) (double, double, double) = + &constant_bandwidth_constraint; static link_CM02_t net_link_new(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) + 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), - surf_network_model, name, properties, - network_maxmin_system, - sg_bandwidth_factor * bw_initial, - history, - state_initial, state_trace, - bw_initial, bw_trace); - - xbt_assert1(!xbt_dict_get_or_null(surf_network_model->resource_set, name), - "Link '%s' declared several times in the platform file.", name); + surf_resource_lmm_new(sizeof(s_link_CM02_t), + surf_network_model, name, properties, + network_maxmin_system, + sg_bandwidth_factor * bw_initial, + history, + state_initial, state_trace, + bw_initial, bw_trace); + + xbt_assert1(!xbt_dict_get_or_null + (surf_network_model->resource_set, name), + "Link '%s' declared several times in the platform file.", + name); nw_link->lat_current = lat_initial; if (lat_trace) nw_link->lat_event = - tmgr_history_add_trace(history, lat_trace, 0.0, 0, nw_link); + tmgr_history_add_trace(history, lat_trace, 0.0, 0, nw_link); if (policy == SURF_LINK_FATPIPE) lmm_constraint_shared(nw_link->lmm_resource.constraint); xbt_dict_set(surf_network_model->resource_set, name, nw_link, surf_resource_free); -#ifdef HAVE_TRACING - TRACE_surf_link_declaration (name, bw_initial, lat_initial); -#endif return nw_link; } @@ -137,7 +202,7 @@ static void net_parse_link_init(void) e_surf_resource_state_t state_initial_link = SURF_RESOURCE_ON; e_surf_link_sharing_policy_t policy_initial_link = SURF_LINK_SHARED; tmgr_trace_t state_trace; - + XBT_DEBUG("link_CM02"); name_link = xbt_strdup(A_surfxml_link_id); surf_parse_get_double(&bw_initial, A_surfxml_link_bandwidth); bw_trace = tmgr_trace_new(A_surfxml_link_bandwidth_file); @@ -154,33 +219,50 @@ static void net_parse_link_init(void) if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_SHARED) policy_initial_link = SURF_LINK_SHARED; - else if (A_surfxml_link_sharing_policy == - A_surfxml_link_sharing_policy_FATPIPE) - policy_initial_link = SURF_LINK_FATPIPE; + else + { + if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FATPIPE) + policy_initial_link = SURF_LINK_FATPIPE; + else if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FULLDUPLEX) + policy_initial_link = SURF_LINK_FULLDUPLEX; + } state_trace = tmgr_trace_new(A_surfxml_link_state_file); - net_link_new(name_link, bw_initial, bw_trace, - lat_initial, lat_trace, state_initial_link, state_trace, - policy_initial_link, xbt_dict_new()); + if(policy_initial_link == SURF_LINK_FULLDUPLEX) + { + net_link_new(bprintf("%s_UP",name_link), bw_initial, bw_trace, + lat_initial, lat_trace, state_initial_link, state_trace, + policy_initial_link, xbt_dict_new()); + net_link_new(bprintf("%s_DOWN",name_link), bw_initial, bw_trace, + lat_initial, lat_trace, state_initial_link, state_trace, + policy_initial_link, xbt_dict_new()); + } + else + { + net_link_new(name_link, bw_initial, bw_trace, + lat_initial, lat_trace, state_initial_link, state_trace, + policy_initial_link, xbt_dict_new()); + } } static void net_create_resource(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) -{ - net_link_new(name, bw_initial, bw_trace, - lat_initial, lat_trace, state_initial, state_trace, - policy, xbt_dict_new()); + 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) +{ + net_link_new(name, bw_initial, bw_trace, + lat_initial, lat_trace, state_initial, state_trace, + policy, xbt_dict_new()); } + static void net_add_traces(void) { xbt_dict_cursor_t cursor = NULL; @@ -195,39 +277,42 @@ static void net_add_traces(void) 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_dict_get_or_null(surf_network_model->resource_set, elm); + xbt_dict_get_or_null(surf_network_model->resource_set, elm); xbt_assert2(link, "Cannot connect trace %s to link %s: link undefined", trace_name, elm); - xbt_assert2(trace, "Cannot connect trace %s to link %s: trace undefined", + xbt_assert2(trace, + "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); + tmgr_history_add_trace(history, trace, 0.0, 0, link); } 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_dict_get_or_null(surf_network_model->resource_set, elm); + xbt_dict_get_or_null(surf_network_model->resource_set, elm); xbt_assert2(link, "Cannot connect trace %s to link %s: link undefined", trace_name, elm); - xbt_assert2(trace, "Cannot connect trace %s to link %s: trace undefined", + xbt_assert2(trace, + "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); + tmgr_history_add_trace(history, trace, 0.0, 0, link); } 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_dict_get_or_null(surf_network_model->resource_set, elm); + xbt_dict_get_or_null(surf_network_model->resource_set, elm); xbt_assert2(link, "Cannot connect trace %s to link %s: link undefined", trace_name, elm); - xbt_assert2(trace, "Cannot connect trace %s to link %s: trace undefined", + xbt_assert2(trace, + "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); @@ -244,7 +329,8 @@ static void net_define_callbacks(const char *file) static int net_resource_used(void *resource_id) { return lmm_constraint_used(network_maxmin_system, - ((surf_resource_lmm_t) resource_id)->constraint); + ((surf_resource_lmm_t) + resource_id)->constraint); } static int net_action_unref(surf_action_t action) @@ -255,7 +341,13 @@ static int net_action_unref(surf_action_t action) if (((surf_action_network_CM02_t) action)->variable) lmm_variable_free(network_maxmin_system, ((surf_action_network_CM02_t) action)->variable); - free(action); +#ifdef HAVE_TRACING + xbt_free(((surf_action_network_CM02_t) action)->src_name); + xbt_free(((surf_action_network_CM02_t) action)->dst_name); + if (action->category) + xbt_free(action->category); +#endif + surf_action_free(&action); return 1; } return 0; @@ -271,10 +363,12 @@ void net_action_recycle(surf_action_t action) return; } -int net_get_link_latency(surf_action_t action) +#ifdef HAVE_LATENCY_BOUND_TRACKING +int net_get_link_latency_limited(surf_action_t action) { return action->latency_limited; } +#endif double net_action_get_remains(surf_action_t action) { @@ -285,22 +379,26 @@ static double net_share_resources(double now) { s_surf_action_network_CM02_t s_action; surf_action_network_CM02_t action = NULL; - xbt_swag_t running_actions = surf_network_model->states.running_action_set; + xbt_swag_t running_actions = + surf_network_model->states.running_action_set; double min; min = generic_maxmin_share_resources(running_actions, xbt_swag_offset(s_action, variable), - network_maxmin_system, network_solve); + network_maxmin_system, + network_solve); #define VARIABLE(action) (*((lmm_variable_t*)(((char *) (action)) + xbt_swag_offset(s_action, variable) ))) xbt_swag_foreach(action, running_actions) { - if( lmm_is_variable_limited_by_latency(action->variable) ){ - (action->generic_action).latency_limited = 1; - }else{ - (action->generic_action).latency_limited = 0; - } +#ifdef HAVE_LATENCY_BOUND_TRACKING + if (lmm_is_variable_limited_by_latency(action->variable)) { + (action->generic_action).latency_limited = 1; + } else { + (action->generic_action).latency_limited = 0; + } +#endif if (action->latency > 0) { if (min < 0) min = action->latency; @@ -309,6 +407,8 @@ static double net_share_resources(double now) } } + XBT_DEBUG("Min of share resources %f", min); + return min; } @@ -317,24 +417,14 @@ static void net_update_actions_state(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 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) { -#ifdef HAVE_TRACING - // COMMENTED BY DAVID - xbt_dynar_t route = global_routing->get_route(action->src_name, action->dst_name); - - link_CM02_t link; - unsigned int i; - xbt_dynar_foreach(route, i, link) { - TRACE_surf_link_set_utilization (link->lmm_resource.generic_resource.name, - action->generic_action.data, lmm_variable_getvalue(action->variable), now-delta, delta); - } -#endif deltap = delta; if (action->latency > 0) { if (action->latency > deltap) { @@ -349,14 +439,27 @@ static void net_update_actions_state(double now, double delta) action->weight); } #ifdef HAVE_TRACING - xbt_dynar_t route = used_routing->get_route(action->src, action->dst); + xbt_dynar_t route = + global_routing->get_route(action->src_name, action->dst_name); link_CM02_t link; unsigned int i; xbt_dynar_foreach(route, i, link) { - TRACE_surf_link_set_utilization (link->lmm_resource.generic_resource.name, - action->generic_action.data, lmm_variable_getvalue(action->variable), now-delta, delta); + 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); } #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. + */ + double_update(&(action->generic_action.remains), + action->generic_action.remains); + } double_update(&(action->generic_action.remains), lmm_variable_getvalue(action->variable) * deltap); if (action->generic_action.max_duration != NO_MAX_DURATION) @@ -367,11 +470,13 @@ static void net_update_actions_state(double now, double delta) action->generic_action.finish = surf_get_clock(); surf_network_model->action_state_set((surf_action_t) action, SURF_ACTION_DONE); + 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); + gap_remove(action); } } @@ -379,8 +484,8 @@ static void net_update_actions_state(double now, double delta) } static void net_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) { link_CM02_t nw_link = id; /* printf("[" "%lg" "] Asking to update network card \"%s\" with value " */ @@ -389,8 +494,9 @@ static void net_update_resource_state(void *id, if (event_type == nw_link->lmm_resource.power.event) { double delta = - sg_weight_S_parameter / value - sg_weight_S_parameter / - (nw_link->lmm_resource.power.peak * nw_link->lmm_resource.power.scale); + sg_weight_S_parameter / value - sg_weight_S_parameter / + (nw_link->lmm_resource.power.peak * + nw_link->lmm_resource.power.scale); lmm_variable_t var = NULL; lmm_element_t elem = NULL; surf_action_network_CM02_t action = NULL; @@ -402,7 +508,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, nw_link->lmm_resource.generic_resource.name, sg_bandwidth_factor * (nw_link->lmm_resource.power.peak * nw_link->lmm_resource.power.scale)); + TRACE_surf_link_set_bandwidth(date, nw_link->lmm_resource.generic_resource.name, + sg_bandwidth_factor * + (nw_link->lmm_resource.power.peak * + nw_link->lmm_resource.power.scale)); #endif if (sg_weight_S_parameter > 0) { while ((var = lmm_get_var_from_cnst @@ -411,8 +520,8 @@ static void net_update_resource_state(void *id, action = lmm_variable_id(var); action->weight += delta; if (!(action->suspended)) - lmm_update_variable_weight(network_maxmin_system, action->variable, - action->weight); + lmm_update_variable_weight(network_maxmin_system, + action->variable, action->weight); } } if (tmgr_trace_event_free(event_type)) @@ -432,17 +541,19 @@ static void net_update_resource_state(void *id, action->weight += delta; if (action->rate < 0) lmm_update_variable_bound(network_maxmin_system, action->variable, - sg_tcp_gamma / (2.0 * action->lat_current)); - else{ + sg_tcp_gamma / (2.0 * + action->lat_current)); + else { lmm_update_variable_bound(network_maxmin_system, action->variable, min(action->rate, sg_tcp_gamma / (2.0 * action->lat_current))); - if(action->rate < sg_tcp_gamma / (2.0 * action->lat_current) ){ - INFO0("Flow is limited BYBANDWIDTH"); - }else{ - INFO1("Flow is limited BYLATENCY, latency of flow is %f",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); } } if (!(action->suspended)) @@ -475,7 +586,7 @@ static void net_update_resource_state(void *id, if (tmgr_trace_event_free(event_type)) nw_link->lmm_resource.state_event = NULL; } else { - CRITICAL0("Unknown event ! \n"); + XBT_CRITICAL("Unknown event ! \n"); xbt_abort(); } @@ -483,34 +594,39 @@ static void net_update_resource_state(void *id, } -static surf_action_t net_communicate(const char *src_name, const char *dst_name, - double size, double rate) +static surf_action_t net_communicate(const char *src_name, + const char *dst_name, double size, + double rate) { unsigned int i; link_CM02_t link; int failed = 0; surf_action_network_CM02_t action = NULL; double bandwidth_bound; + double latency=0.0; /* LARGE PLATFORMS HACK: Add a link_CM02_t *link and a int link_nb to network_card_CM02_t. It will represent local links for this node Use the cluster_id for ->id */ - xbt_dynar_t route = global_routing->get_route(src_name, dst_name); xbt_dynar_t back_route = NULL; int constraints_per_variable = 0; + // I will need this route for some time so let's call get_route_no_cleanup + xbt_dynar_t route = global_routing->get_route_no_cleanup(src_name, dst_name); + - if( sg_network_fullduplex == 1){ - back_route = global_routing->get_route(src_name, dst_name); + if (sg_network_fullduplex == 1) { + back_route = global_routing->get_route(dst_name, src_name); } - + /* LARGE PLATFORMS HACK: total_route_size = route_size + src->link_nb + dst->nb */ - XBT_IN4("(%s,%s,%g,%g)", src_name, dst_name, size, rate); + XBT_IN("(%s,%s,%g,%g)", src_name, dst_name, size, rate); /* LARGE PLATFORMS HACK: assert on total_route_size */ - xbt_assert2(xbt_dynar_length(route), - "You're trying to send data from %s to %s but there is no connection between these two hosts.", + latency = global_routing->get_latency(src_name,dst_name); + xbt_assert2(xbt_dynar_length(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); xbt_dynar_foreach(route, i, link) { @@ -520,52 +636,74 @@ static surf_action_t net_communicate(const char *src_name, const char *dst_name, } } action = - surf_action_new(sizeof(s_surf_action_network_CM02_t), size, - surf_network_model, failed); + surf_action_new(sizeof(s_surf_action_network_CM02_t), size, + surf_network_model, failed); +#ifdef HAVE_LATENCY_BOUND_TRACKING (action->generic_action).latency_limited = 0; +#endif + action->weight = action->latency = latency; xbt_swag_insert(action, action->generic_action.state_set); action->rate = rate; - action->latency = 0.0; - action->weight = 0.0; bandwidth_bound = -1.0; + xbt_dynar_foreach(route, i, link) { - action->latency += link->lat_current; action->weight += - link->lat_current + - sg_weight_S_parameter / - (link->lmm_resource.power.peak * link->lmm_resource.power.scale); - if(bandwidth_bound < 0.0) - bandwidth_bound = (*bandwidth_factor_callback)(size) * (link->lmm_resource.power.peak * link->lmm_resource.power.scale); + sg_weight_S_parameter / + (link->lmm_resource.power.peak * link->lmm_resource.power.scale); + if (bandwidth_bound < 0.0) + bandwidth_bound = + (*bandwidth_factor_callback) (size) * + (link->lmm_resource.power.peak * link->lmm_resource.power.scale); else - bandwidth_bound = min(bandwidth_bound, (*bandwidth_factor_callback)(size) * (link->lmm_resource.power.peak * link->lmm_resource.power.scale)); + bandwidth_bound = + min(bandwidth_bound, + (*bandwidth_factor_callback) (size) * + (link->lmm_resource.power.peak * + link->lmm_resource.power.scale)); } /* LARGE PLATFORMS HACK: Add src->link and dst->link latencies */ action->lat_current = action->latency; - action->latency *= (*latency_factor_callback)(size); - action->rate = (*bandwidth_constraint_callback)(action->rate, bandwidth_bound, size); + action->latency *= (*latency_factor_callback) (size); + action->rate = + (*bandwidth_constraint_callback) (action->rate, bandwidth_bound, + size); + + if(xbt_dynar_length(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); + } else { + gap_unknown(action); + } + /* LARGE PLATFORMS HACK: lmm_variable_new(..., total_route_size) */ - if(back_route != NULL){ - constraints_per_variable = xbt_dynar_length(route)+xbt_dynar_length(back_route); - }else{ - constraints_per_variable = xbt_dynar_length(route); + if (back_route != NULL) { + constraints_per_variable = + xbt_dynar_length(route) + xbt_dynar_length(back_route); + } else { + constraints_per_variable = xbt_dynar_length(route); } if (action->latency > 0) action->variable = - lmm_variable_new(network_maxmin_system, action, 0.0, -1.0,constraints_per_variable); + lmm_variable_new(network_maxmin_system, action, 0.0, -1.0, + constraints_per_variable); else action->variable = - lmm_variable_new(network_maxmin_system, action, 1.0, -1.0,constraints_per_variable); + lmm_variable_new(network_maxmin_system, action, 1.0, -1.0, + constraints_per_variable); if (action->rate < 0) { if (action->lat_current > 0) lmm_update_variable_bound(network_maxmin_system, action->variable, - sg_tcp_gamma / (2.0 * action->lat_current)); + sg_tcp_gamma / (2.0 * + action->lat_current)); else lmm_update_variable_bound(network_maxmin_system, action->variable, -1.0); @@ -585,39 +723,55 @@ static surf_action_t net_communicate(const char *src_name, const char *dst_name, action->variable, 1.0); } - if( sg_network_fullduplex == 1){ - DEBUG1("Fullduplex active adding backward flow using 5%c", '%'); - xbt_dynar_foreach(back_route, i, link) { - lmm_expand(network_maxmin_system, link->lmm_resource.constraint, - action->variable, .05); - } - } /* LARGE PLATFORMS HACK: + if (sg_network_fullduplex == 1) { + XBT_DEBUG("Fullduplex active adding backward flow using 5%c", '%'); + xbt_dynar_foreach(back_route, i, link) { + lmm_expand(network_maxmin_system, link->lmm_resource.constraint, + action->variable, .05); + } + } + /* LARGE PLATFORMS HACK: expand also with src->link and dst->link */ +#ifdef HAVE_TRACING + action->src_name = xbt_strdup(src_name); + action->dst_name = xbt_strdup(dst_name); +#endif - - XBT_OUT; + xbt_dynar_free(&route); + XBT_OUT(); return (surf_action_t) action; } +static xbt_dynar_t net_get_route(const char *src, const char *dst) +{ + return global_routing->get_route(src, dst); +} + static double net_get_link_bandwidth(const void *link) { surf_resource_lmm_t lmm = (surf_resource_lmm_t) link; return lmm->power.peak * lmm->power.scale; } +static double net_get_link_latency(const void *link) +{ + return ((link_CM02_t) link)->lat_current; +} + static int net_link_shared(const void *link) { - return lmm_constraint_is_shared(((surf_resource_lmm_t) link)->constraint); + return + 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)->suspended = 1; lmm_update_variable_weight(network_maxmin_system, - ((surf_action_network_CM02_t) action)->variable, - 0.0); + ((surf_action_network_CM02_t) + action)->variable, 0.0); } static void net_action_resume(surf_action_t action) @@ -626,7 +780,8 @@ static void net_action_resume(surf_action_t action) lmm_update_variable_weight(network_maxmin_system, ((surf_action_network_CM02_t) action)->variable, - ((surf_action_network_CM02_t) action)->weight); + ((surf_action_network_CM02_t) + action)->weight); ((surf_action_network_CM02_t) action)->suspended = 0; } } @@ -641,13 +796,20 @@ void net_action_set_max_duration(surf_action_t action, double duration) action->max_duration = duration; } +#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) { surf_model_exit(surf_network_model); surf_network_model = NULL; - + global_routing->finalize(); - + lmm_system_free(network_maxmin_system); network_maxmin_system = NULL; } @@ -661,36 +823,46 @@ static void surf_network_model_init_internal(void) surf_network_model->action_cancel = net_action_cancel; surf_network_model->action_recycle = net_action_recycle; surf_network_model->get_remains = net_action_get_remains; - surf_network_model->get_latency_limited = net_get_link_latency; +#ifdef HAVE_LATENCY_BOUND_TRACKING + surf_network_model->get_latency_limited = net_get_link_latency_limited; +#endif surf_network_model->model_private->resource_used = net_resource_used; surf_network_model->model_private->share_resources = net_share_resources; surf_network_model->model_private->update_actions_state = - net_update_actions_state; + net_update_actions_state; 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; 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->set_max_duration = net_action_set_max_duration; +#ifdef HAVE_TRACING + surf_network_model->set_category = net_action_set_category; +#endif 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; 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; + surf_network_model->extension.network.create_resource = + net_create_resource; if (!network_maxmin_system) network_maxmin_system = lmm_system_new(); routing_model_create(sizeof(link_CM02_t), net_link_new(xbt_strdup("__loopback__"), - 498000000, NULL, 0.000015, NULL, - SURF_RESOURCE_ON, NULL, SURF_LINK_FATPIPE, - NULL)); + 498000000, NULL, 0.000015, NULL, + SURF_RESOURCE_ON, NULL, + SURF_LINK_FATPIPE, NULL), + net_get_link_latency); } @@ -711,7 +883,8 @@ void surf_network_model_init_SMPI(const char *filename) xbt_dynar_push(model_list, &surf_network_model); network_solve = lmm_solve; - xbt_cfg_setdefault_double(_surf_cfg_set,"network/weight_S", 8775); + xbt_cfg_setdefault_double(_surf_cfg_set, "network/sender_gap", 10e-6); + xbt_cfg_setdefault_double(_surf_cfg_set, "network/weight_S", 8775); update_model_description(surf_network_model_description, "SMPI", surf_network_model); @@ -730,9 +903,10 @@ void surf_network_model_init_LegrandVelho(const char *filename) xbt_dynar_push(model_list, &surf_network_model); network_solve = lmm_solve; - xbt_cfg_setdefault_double(_surf_cfg_set,"network/latency_factor",10.4); - xbt_cfg_setdefault_double(_surf_cfg_set,"network/bandwidth_factor", 0.92); - xbt_cfg_setdefault_double(_surf_cfg_set,"network/weight_S", 8775); + xbt_cfg_setdefault_double(_surf_cfg_set, "network/latency_factor", 10.4); + xbt_cfg_setdefault_double(_surf_cfg_set, "network/bandwidth_factor", + 0.92); + xbt_cfg_setdefault_double(_surf_cfg_set, "network/weight_S", 8775); update_model_description(surf_network_model_description, "LV08", surf_network_model); @@ -771,12 +945,14 @@ void surf_network_model_init_Reno(const char *filename) net_define_callbacks(filename); xbt_dynar_push(model_list, &surf_network_model); - lmm_set_default_protocol_function(func_reno_f, func_reno_fp, func_reno_fpi); + lmm_set_default_protocol_function(func_reno_f, func_reno_fp, + func_reno_fpi); network_solve = lagrange_solve; - xbt_cfg_setdefault_double(_surf_cfg_set,"network/latency_factor", 10.4); - xbt_cfg_setdefault_double(_surf_cfg_set,"network/bandwidth_factor", 0.92); - xbt_cfg_setdefault_double(_surf_cfg_set,"network/weight_S", 8775); + xbt_cfg_setdefault_double(_surf_cfg_set, "network/latency_factor", 10.4); + xbt_cfg_setdefault_double(_surf_cfg_set, "network/bandwidth_factor", + 0.92); + xbt_cfg_setdefault_double(_surf_cfg_set, "network/weight_S", 8775); update_model_description(surf_network_model_description, "Reno", surf_network_model); @@ -795,9 +971,11 @@ void surf_network_model_init_Reno2(const char *filename) func_reno2_fpi); network_solve = lagrange_solve; - xbt_cfg_setdefault_double(_surf_cfg_set,"network/latency_factor", 10.4); - xbt_cfg_setdefault_double(_surf_cfg_set,"network/bandwidth_factor", 0.92); - xbt_cfg_setdefault_double(_surf_cfg_set,"network/weight_S_parameter", 8775); + xbt_cfg_setdefault_double(_surf_cfg_set, "network/latency_factor", 10.4); + xbt_cfg_setdefault_double(_surf_cfg_set, "network/bandwidth_factor", + 0.92); + xbt_cfg_setdefault_double(_surf_cfg_set, "network/weight_S_parameter", + 8775); update_model_description(surf_network_model_description, "Reno2", surf_network_model); @@ -815,12 +993,11 @@ void surf_network_model_init_Vegas(const char *filename) func_vegas_fpi); network_solve = lagrange_solve; - xbt_cfg_setdefault_double(_surf_cfg_set,"network/latency_factor", 10.4); - xbt_cfg_setdefault_double(_surf_cfg_set,"network/bandwidth_factor", 0.92); - xbt_cfg_setdefault_double(_surf_cfg_set,"network/weight_S", 8775); + xbt_cfg_setdefault_double(_surf_cfg_set, "network/latency_factor", 10.4); + xbt_cfg_setdefault_double(_surf_cfg_set, "network/bandwidth_factor", + 0.92); + xbt_cfg_setdefault_double(_surf_cfg_set, "network/weight_S", 8775); update_model_description(surf_network_model_description, "Vegas", surf_network_model); } - -