X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a1fa4f192a490a340c59ed77ab7c3c2ed1c76bd1..6c053c9587e3a72153e0cc2c4494dbded6b4c788:/src/surf/network.c diff --git a/src/surf/network.c b/src/surf/network.c index 80a48680d8..de8096361a 100644 --- a/src/surf/network.c +++ b/src/surf/network.c @@ -20,6 +20,7 @@ double sg_bandwidth_factor = 1.0; /* default value; can be set by model or from 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; /******************************************************************************/ @@ -165,6 +166,21 @@ static void net_parse_link_init(void) } +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()); +} static void net_add_traces(void) { xbt_dict_cursor_t cursor = NULL; @@ -239,6 +255,10 @@ 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); +#ifdef HAVE_TRACING + xbt_free (((surf_action_network_CM02_t)action)->src_name); + xbt_free (((surf_action_network_CM02_t)action)->dst_name); +#endif free(action); return 1; } @@ -247,17 +267,20 @@ static int net_action_unref(surf_action_t action) static void net_action_cancel(surf_action_t action) { - surf_network_model->action_state_set((surf_action_t) action, - SURF_ACTION_FAILED); - return; + surf_network_model->action_state_set(action, SURF_ACTION_FAILED); } -static void net_action_recycle(surf_action_t action) +void net_action_recycle(surf_action_t action) { return; } -static double net_action_get_remains(surf_action_t action) +int net_get_link_latency(surf_action_t action) +{ + return action->latency_limited; +} + +double net_action_get_remains(surf_action_t action) { return action->remains; } @@ -277,6 +300,11 @@ static double net_share_resources(double now) #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; + } if (action->latency > 0) { if (min < 0) min = action->latency; @@ -300,17 +328,6 @@ static void net_update_actions_state(double now, double delta) */ xbt_swag_foreach_safe(action, next_action, running_actions) { - -#ifdef HAVE_TRACING - xbt_dynar_t route = used_routing->get_route(action->src, action->dst); - 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) { @@ -324,6 +341,15 @@ static void net_update_actions_state(double now, double delta) lmm_update_variable_weight(network_maxmin_system, action->variable, action->weight); } +#ifdef HAVE_TRACING + xbt_dynar_t route = used_routing->get_route(action->src, action->dst); + 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 double_update(&(action->generic_action.remains), lmm_variable_getvalue(action->variable) * deltap); if (action->generic_action.max_duration != NO_MAX_DURATION) @@ -400,11 +426,18 @@ static void net_update_resource_state(void *id, if (action->rate < 0) lmm_update_variable_bound(network_maxmin_system, action->variable, sg_tcp_gamma / (2.0 * action->lat_current)); - else + 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->suspended)) lmm_update_variable_weight(network_maxmin_system, action->variable, action->weight); @@ -442,8 +475,9 @@ static void net_update_resource_state(void *id, return; } + static surf_action_t net_communicate(const char *src_name, const char *dst_name, - int src, int dst, double size, double rate) + double size, double rate) { unsigned int i; link_CM02_t link; @@ -453,7 +487,15 @@ static surf_action_t net_communicate(const char *src_name, const char *dst_name, /* 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 = used_routing->get_route(src, dst); + + xbt_dynar_t route = global_routing->get_route(src_name, dst_name); + xbt_dynar_t back_route = NULL; + int constraints_per_variable = 0; + + if( sg_network_fullduplex == 1){ + back_route = global_routing->get_route(src_name, dst_name); + } + /* LARGE PLATFORMS HACK: total_route_size = route_size + src->link_nb + dst->nb */ @@ -473,6 +515,7 @@ 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); + (action->generic_action).latency_limited = 0; xbt_swag_insert(action, action->generic_action.state_set); action->rate = rate; @@ -499,14 +542,18 @@ static surf_action_t net_communicate(const char *src_name, const char *dst_name, /* 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 (action->latency > 0) action->variable = - lmm_variable_new(network_maxmin_system, action, 0.0, -1.0, - xbt_dynar_length(route)); + 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, - xbt_dynar_length(route)); + lmm_variable_new(network_maxmin_system, action, 1.0, -1.0,constraints_per_variable); if (action->rate < 0) { if (action->lat_current > 0) @@ -530,12 +577,23 @@ static surf_action_t net_communicate(const char *src_name, const char *dst_name, lmm_expand(network_maxmin_system, link->lmm_resource.constraint, action->variable, 1.0); } - /* LARGE PLATFORMS HACK: + + 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: expand also with src->link and dst->link */ - /* saving the src and dst of this communication */ - action->src = src; - action->dst = dst; +#ifdef HAVE_TRACING + action->src_name = xbt_new (char, strlen(src_name)+1); + strncpy (action->src_name, src_name, strlen(src_name)+1); + + action->dst_name = xbt_new (char, strlen(dst_name)+1); + strncpy (action->dst_name, dst_name, strlen(dst_name)+1); +#endif XBT_OUT; @@ -548,11 +606,6 @@ static double net_get_link_bandwidth(const void *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); @@ -582,50 +635,18 @@ static int net_action_is_suspended(surf_action_t action) return ((surf_action_network_CM02_t) action)->suspended; } -static void net_action_set_max_duration(surf_action_t action, double duration) +void net_action_set_max_duration(surf_action_t action, double duration) { action->max_duration = duration; } - -/** - * FIXME : this should be done in the binding code !! - */ -void network_create_resource(char *name, - double initial_bandwidth,double initial_latency) -{ - - char *name_link; - double bw_initial; - tmgr_trace_t bw_trace; - double lat_initial; - tmgr_trace_t lat_trace; - 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; - - - name_link = (char*)name; - bw_initial = initial_bandwidth; - bw_trace = tmgr_trace_new(""); - lat_initial = initial_latency; - lat_trace = tmgr_trace_new(""); - // FIXME Hard Coded Values - state_initial_link = SURF_RESOURCE_ON; - policy_initial_link = SURF_LINK_SHARED; - state_trace = tmgr_trace_new(""); - - 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_finalize(void) { surf_model_exit(surf_network_model); surf_network_model = NULL; - - used_routing->finalize(); + + global_routing->finalize(); + lmm_system_free(network_maxmin_system); network_maxmin_system = NULL; } @@ -639,6 +660,7 @@ 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; surf_network_model->model_private->resource_used = net_resource_used; surf_network_model->model_private->share_resources = net_share_resources; @@ -656,10 +678,9 @@ static void surf_network_model_init_internal(void) surf_network_model->extension.network.communicate = net_communicate; surf_network_model->extension.network.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.create_resource = network_create_resource; surf_network_model->extension.network.add_traces = net_add_traces; + surf_network_model->extension.network.create_resource = net_create_resource; if (!network_maxmin_system) network_maxmin_system = lmm_system_new();