X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6a6157abf9619875297ff1d16c1e5c63c526d4c1..1ba1897117e2815dbadab50c538dad87427aef14:/src/surf/network_im.c diff --git a/src/surf/network_im.c b/src/surf/network_im.c index 86e53b4e91..162adb95c7 100644 --- a/src/surf/network_im.c +++ b/src/surf/network_im.c @@ -12,48 +12,41 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ +#include "network_private.h" #include "xbt/log.h" #include "xbt/str.h" + #include "surf_private.h" #include "xbt/dict.h" #include "maxmin_private.h" +#include "surf/surfxml_parse_values.h" +#include "surf/surf_resource.h" +#include "surf/surf_resource_lmm.h" + #undef GENERIC_ACTION #define GENERIC_ACTION(action) action->generic_action -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network_im, surf, +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network, surf, "Logging specific to the SURF network module"); +surf_model_t surf_network_model = NULL; +static lmm_system_t network_im_maxmin_system = NULL; +static void (*network_im_solve) (lmm_system_t) = NULL; -enum heap_action_type{ - LATENCY = 100, - MAX_DURATION, - NORMAL, - NOTSET -}; +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 */ -typedef struct surf_action_network_CM02_im { - s_surf_action_t generic_action; - s_xbt_swag_hookup_t action_list_hookup; - double latency; - double lat_current; - double weight; - lmm_variable_t variable; - double rate; -#ifdef HAVE_LATENCY_BOUND_TRACKING - int latency_limited; -#endif - int suspended; -#ifdef HAVE_TRACING - char *src_name; - char *dst_name; -#endif - int index_heap; - enum heap_action_type hat; - double last_update; -} s_surf_action_network_CM02_im_t, *surf_action_network_CM02_im_t; +double sg_tcp_gamma = 0.0; +int sg_network_crosstraffic = 0; +xbt_dict_t gap_lookup = NULL; + +e_UM_t network_update_mechanism = UM_UNDEFINED; +static int selective_update = 0; typedef struct network_link_CM02_im { s_surf_resource_lmm_t lmm_resource; /* must remain first to be added to a trace */ @@ -64,31 +57,7 @@ typedef struct network_link_CM02_im { tmgr_trace_event_t lat_event; } s_link_CM02_im_t, *link_CM02_im_t; - - - - - - - -extern surf_model_t surf_network_model; -static lmm_system_t network_im_maxmin_system = NULL; -static void (*network_im_solve) (lmm_system_t) = NULL; - -extern double sg_latency_factor; -extern double sg_bandwidth_factor; -extern double sg_weight_S_parameter; - -extern double sg_tcp_gamma; -extern int sg_network_fullduplex; - - -static void im_net_action_recycle(surf_action_t action); -static int im_net_get_link_latency_limited(surf_action_t action); static int im_net_action_is_suspended(surf_action_t action); -static double im_net_action_get_remains(surf_action_t action); -static void im_net_action_set_max_duration(surf_action_t action, double duration); -static void surf_network_model_init_CM02_im(const char *filename); static void im_net_update_actions_state(double now, double delta); static void update_action_remaining(double now); @@ -97,6 +66,12 @@ static xbt_heap_t im_net_action_heap = NULL; xbt_swag_t keep_track = NULL; extern int sg_maxmin_selective_update; +#ifdef HAVE_SMPI +static void gap_append(double size, const link_CM02_im_t link, surf_action_network_CM02_im_t action); +static void gap_unknown(surf_action_network_CM02_im_t action); +static void gap_remove(surf_action_network_CM02_im_t action); +#endif + /* added to manage the communication action's heap */ static void im_net_action_update_index_heap(void *action, int i) { @@ -142,6 +117,47 @@ static double im_constant_bandwidth_constraint(double rate, double bound, } +/**********************/ +/* SMPI callbacks */ +/**********************/ +static double smpi_latency_factor(double size) +{ + /* 1 B <= size <= 1 KiB */ + if (size <= 1024.0) { + return 1.0056; + } + + /* 2 KiB <= size <= 32 KiB */ + if (size <= 32768.0) { + return 1.8805; + } + + /* 64 KiB <= size <= 4 MiB */ + return 22.7111; +} + +static double smpi_bandwidth_factor(double size) +{ + /* 1 B <= size <= 1 KiB */ + if (size <= 1024.0) { + return 0.2758; + } + + /* 2 KiB <= size <= 32 KiB */ + if (size <= 32768.0) { + return 0.5477; + } + + /* 64 KiB <= size <= 4 MiB */ + return 0.9359; +} + +static double smpi_bandwidth_constraint(double rate, double bound, + double size) +{ + return rate < 0 ? bound : min(bound, rate * smpi_bandwidth_factor(size)); +} + static double (*im_latency_factor_callback) (double) = &im_constant_latency_factor; static double (*im_bandwidth_factor_callback) (double) = @@ -150,7 +166,7 @@ static double (*im_bandwidth_constraint_callback) (double, double, double) = &im_constant_bandwidth_constraint; -static link_CM02_im_t im_net_link_new(char *name, +static void* im_net_create_resource(const char *name, double bw_initial, tmgr_trace_t bw_trace, double lat_initial, @@ -170,8 +186,7 @@ static link_CM02_im_t im_net_link_new(char *name, state_initial, state_trace, bw_initial, bw_trace); - xbt_assert1(!xbt_dict_get_or_null - (surf_network_model->resource_set, name), + xbt_assert(!xbt_lib_get_or_null(link_lib, name, SURF_LINK_LEVEL), "Link '%s' declared several times in the platform file.", name); @@ -183,82 +198,49 @@ static link_CM02_im_t im_net_link_new(char *name, 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); - + xbt_lib_set(link_lib, name, SURF_LINK_LEVEL, nw_link); return nw_link; } -static void im_net_parse_link_init(void) -{ - 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; - XBT_DEBUG("link_CM02_im"); - 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); - surf_parse_get_double(&lat_initial, A_surfxml_link_latency); - lat_trace = tmgr_trace_new(A_surfxml_link_latency_file); - - xbt_assert0((A_surfxml_link_state == A_surfxml_link_state_ON) - || (A_surfxml_link_state == - A_surfxml_link_state_OFF), "Invalid state"); - if (A_surfxml_link_state == A_surfxml_link_state_ON) - state_initial_link = SURF_RESOURCE_ON; - else if (A_surfxml_link_state == A_surfxml_link_state_OFF) - state_initial_link = SURF_RESOURCE_OFF; - - 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_FULLDUPLEX) - policy_initial_link = SURF_LINK_FULLDUPLEX; - } - - state_trace = tmgr_trace_new(A_surfxml_link_state_file); - - if(policy_initial_link == SURF_LINK_FULLDUPLEX) - { - im_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()); - im_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()); +static void im_net_parse_link_init(sg_platf_link_cbarg_t link) +{ + if(link->policy == SURF_LINK_FULLDUPLEX){ + char *link_id; + link_id = bprintf("%s_UP", link->id); + im_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); + im_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); } - else - { - im_net_link_new(name_link, bw_initial, bw_trace, - lat_initial, lat_trace, state_initial_link, state_trace, - policy_initial_link, xbt_dict_new()); + else{ + im_net_create_resource(link->id, + link->bandwidth, + link->bandwidth_trace, + link->latency, + link->latency_trace, + link->state, + link->state_trace, + link->policy, + link->properties); } - -} - -static void im_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) -{ - im_net_link_new(name, bw_initial, bw_trace, - lat_initial, lat_trace, state_initial, state_trace, - policy, xbt_dict_new()); } static void im_net_add_traces(void) @@ -275,11 +257,11 @@ static void im_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_im_t link = - xbt_dict_get_or_null(surf_network_model->resource_set, elm); + xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL); - xbt_assert2(link, "Cannot connect trace %s to link %s: link undefined", + xbt_assert(link, "Cannot connect trace %s to link %s: link undefined", trace_name, elm); - xbt_assert2(trace, + xbt_assert(trace, "Cannot connect trace %s to link %s: trace undefined", trace_name, elm); @@ -290,11 +272,11 @@ static void im_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_im_t link = - xbt_dict_get_or_null(surf_network_model->resource_set, elm); + xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL); - xbt_assert2(link, "Cannot connect trace %s to link %s: link undefined", + xbt_assert(link, "Cannot connect trace %s to link %s: link undefined", trace_name, elm); - xbt_assert2(trace, + xbt_assert(trace, "Cannot connect trace %s to link %s: trace undefined", trace_name, elm); @@ -305,11 +287,11 @@ static void im_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_im_t link = - xbt_dict_get_or_null(surf_network_model->resource_set, elm); + xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL); - xbt_assert2(link, "Cannot connect trace %s to link %s: link undefined", + xbt_assert(link, "Cannot connect trace %s to link %s: link undefined", trace_name, elm); - xbt_assert2(trace, + xbt_assert(trace, "Cannot connect trace %s to link %s: trace undefined", trace_name, elm); @@ -317,11 +299,11 @@ static void im_net_add_traces(void) } } -static void im_net_define_callbacks(const char *file) +static void im_net_define_callbacks(void) { /* Figuring out the network links */ - surfxml_add_callback(STag_surfxml_link_cb_list, &im_net_parse_link_init); - surfxml_add_callback(ETag_surfxml_platform_cb_list, &im_net_add_traces); + sg_platf_link_add_cb(im_net_parse_link_init); + sg_platf_postparse_add_cb(im_net_add_traces); } static int im_net_resource_used(void *resource_id) @@ -340,15 +322,14 @@ static int im_net_action_unref(surf_action_t action) lmm_variable_free(network_im_maxmin_system, ((surf_action_network_CM02_im_t) action)->variable); } - // remove action from the heap - heap_remove((surf_action_network_CM02_im_t) action); - - xbt_swag_remove(action, im_net_modified_set); + if(network_update_mechanism == UM_LAZY){// remove action from the heap + heap_remove((surf_action_network_CM02_im_t) action); + xbt_swag_remove(action, im_net_modified_set); + } #ifdef HAVE_TRACING xbt_free(((surf_action_network_CM02_im_t) action)->src_name); xbt_free(((surf_action_network_CM02_im_t) action)->dst_name); - if (action->category) - xbt_free(action->category); + xbt_free(action->category); #endif surf_action_free(&action); return 1; @@ -361,10 +342,10 @@ static int im_net_action_unref(surf_action_t action) static void im_net_action_cancel(surf_action_t action) { surf_network_model->action_state_set(action, SURF_ACTION_FAILED); - - xbt_swag_remove(action, im_net_modified_set); - // remove action from the heap - heap_remove((surf_action_network_CM02_im_t) action); + if(network_update_mechanism == UM_LAZY){// remove action from the heap + xbt_swag_remove(action, im_net_modified_set); + heap_remove((surf_action_network_CM02_im_t) action); + } } void im_net_action_recycle(surf_action_t action) @@ -373,7 +354,7 @@ void im_net_action_recycle(surf_action_t action) } #ifdef HAVE_LATENCY_BOUND_TRACKING -int im_net_get_link_latency_limited(surf_action_t action) +static int im_net_get_link_latency_limited(surf_action_t action) { return action->latency_limited; } @@ -381,8 +362,8 @@ int im_net_get_link_latency_limited(surf_action_t action) double im_net_action_get_remains(surf_action_t action) { - /* 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(surf_get_clock()); return action->remains; } @@ -422,7 +403,44 @@ static void update_action_remaining(double now){ } } -static double im_net_share_resources(double now) +static double net_share_resources_full(double now) +{ + s_surf_action_network_CM02_im_t s_action; + surf_action_network_CM02_im_t action = NULL; + 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_im_maxmin_system, + network_im_solve); + +#define VARIABLE(action) (*((lmm_variable_t*)(((char *) (action)) + xbt_swag_offset(s_action, variable) ))) + + xbt_swag_foreach(action, running_actions) { +#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; + else if (action->latency < min) + min = action->latency; + } + } + + XBT_DEBUG("Min of share resources %f", min); + + return min; +} + +static double net_share_resources_lazy(double now) { surf_action_network_CM02_im_t action = NULL; double min=-1; @@ -431,7 +449,9 @@ static double im_net_share_resources(double now) XBT_DEBUG("Before share resources, the size of modified actions set is %d", xbt_swag_size(im_net_modified_set)); update_action_remaining(now); + keep_track = im_net_modified_set; lmm_solve(network_im_maxmin_system); + keep_track = NULL; XBT_DEBUG("After share resources, The size of modified actions set is %d", xbt_swag_size(im_net_modified_set)); @@ -494,7 +514,84 @@ static double im_net_share_resources(double now) return min; } -static void im_net_update_actions_state(double now, double delta) +static void net_update_actions_state_full(double now, double delta) +{ + double deltap = 0.0; + surf_action_network_CM02_im_t action = NULL; + surf_action_network_CM02_im_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) && !(action->suspended)) + lmm_update_variable_weight(network_im_maxmin_system, action->variable, + action->weight); + } +#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); + link_CM02_im_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, + (surf_action_t) action, + lmm_variable_getvalue + (action->variable), now - delta, + delta); + } + } +#endif + if(!lmm_get_number_of_cnst_from_var(network_im_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) + double_update(&(action->generic_action.max_duration), delta); + + if ((action->generic_action.remains <= 0) && + (lmm_get_variable_weight(action->variable) > 0)) { + action->generic_action.finish = surf_get_clock(); + surf_network_model->action_state_set((surf_action_t) action, + SURF_ACTION_DONE); +#ifdef HAVE_SMPI + gap_remove(action); +#endif + } 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); +#ifdef HAVE_SMPI + gap_remove(action); +#endif + } + } + + return; +} + +static void net_update_actions_state_lazy(double now, double delta) { surf_action_network_CM02_im_t action = NULL; @@ -530,7 +627,7 @@ static void im_net_update_actions_state(double now, double delta) return; } -static void im_net_update_resource_state(void *id, +static void net_update_resource_state(void *id, tmgr_trace_event_t event_type, double value, double date) { @@ -651,18 +748,20 @@ static surf_action_t im_net_communicate(const char *src_name, int failed = 0; surf_action_network_CM02_im_t action = NULL; double bandwidth_bound; + double latency=0.0; /* LARGE PLATFORMS HACK: Add a link_CM02_im_t *link and a int link_nb to network_card_CM02_im_t. It will represent local links for this node Use the cluster_id for ->id */ 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); - + // I need to have the forward and backward routes at the same time, so allocate "route". That way, the routing wont clean it up + xbt_dynar_t route=xbt_dynar_new(global_routing->size_of_link,NULL); + routing_get_route_and_latency(src_name, dst_name, &route, &latency); - if (sg_network_fullduplex == 1) { - back_route = global_routing->get_route(dst_name, src_name); + if (sg_network_crosstraffic == 1) { + // FIXME: fill route directly (unclear: check with blame who put the FIXME) + routing_get_route_and_latency(dst_name, src_name, &back_route,NULL); } /* LARGE PLATFORMS HACK: @@ -671,8 +770,8 @@ static surf_action_t im_net_communicate(const char *src_name, 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.", + 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); xbt_dynar_foreach(route, i, link) { @@ -681,47 +780,65 @@ static surf_action_t im_net_communicate(const char *src_name, break; } } + if (sg_network_crosstraffic == 1) { + xbt_dynar_foreach(back_route, i, link) { + if (link->lmm_resource.state_current == SURF_RESOURCE_OFF) { + failed = 1; + break; + } + } + } + action = surf_action_new(sizeof(s_surf_action_network_CM02_im_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->index_heap = -1; - action->latency = 0.0; - action->weight = 0.0; - action->last_update = surf_get_clock(); + if(network_update_mechanism == UM_LAZY){ + action->index_heap = -1; + action->latency = 0.0; + action->weight = 0.0; + action->last_update = surf_get_clock(); + } 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 = - (*im_bandwidth_factor_callback) (size) * + im_bandwidth_factor_callback(size) * (link->lmm_resource.power.peak * link->lmm_resource.power.scale); else bandwidth_bound = min(bandwidth_bound, - (*im_bandwidth_factor_callback) (size) * + im_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 *= (*im_latency_factor_callback) (size); + action->latency *= im_latency_factor_callback(size); action->rate = - (*im_bandwidth_constraint_callback) (action->rate, bandwidth_bound, + im_bandwidth_constraint_callback(action->rate, bandwidth_bound, size); +#ifdef HAVE_SMPI + if(!xbt_dynar_is_empty(route)) { + link = *(link_CM02_im_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); + } +#endif /* LARGE PLATFORMS HACK: lmm_variable_new(..., total_route_size) */ @@ -736,9 +853,11 @@ static surf_action_t im_net_communicate(const char *src_name, action->variable = lmm_variable_new(network_im_maxmin_system, action, 0.0, -1.0, constraints_per_variable); - // 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, LATENCY); + 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, LATENCY); + } #ifdef HAVE_LATENCY_BOUND_TRACKING (action->generic_action).latency_limited = 1; #endif @@ -772,7 +891,7 @@ static surf_action_t im_net_communicate(const char *src_name, action->variable, 1.0); } - if (sg_network_fullduplex == 1) { + if (sg_network_crosstraffic == 1) { XBT_DEBUG("Fullduplex active adding backward flow using 5%c", '%'); xbt_dynar_foreach(back_route, i, link) { lmm_expand(network_im_maxmin_system, link->lmm_resource.constraint, @@ -783,11 +902,12 @@ static surf_action_t im_net_communicate(const char *src_name, /* LARGE PLATFORMS HACK: expand also with src->link and dst->link */ #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); + if (TRACE_is_enabled()) { + action->src_name = xbt_strdup(src_name); + action->dst_name = xbt_strdup(dst_name); + } else { + action->src_name = action->dst_name = NULL; + } #endif xbt_dynar_free(&route); @@ -798,7 +918,9 @@ static surf_action_t im_net_communicate(const char *src_name, static xbt_dynar_t im_net_get_route(const char *src, const char *dst) { - return global_routing->get_route(src, dst); + xbt_dynar_t route=NULL; + routing_get_route_and_latency(src, dst,&route,NULL); + return route; } static double im_net_get_link_bandwidth(const void *link) @@ -825,8 +947,8 @@ static void im_net_action_suspend(surf_action_t action) ((surf_action_network_CM02_im_t) action)->variable, 0.0); - // remove action from the heap - heap_remove((surf_action_network_CM02_im_t) action); + if(network_update_mechanism == UM_LAZY)// remove action from the heap + heap_remove((surf_action_network_CM02_im_t) action); } static void im_net_action_resume(surf_action_t action) @@ -838,8 +960,8 @@ static void im_net_action_resume(surf_action_t action) ((surf_action_network_CM02_im_t) action)->weight); ((surf_action_network_CM02_im_t) action)->suspended = 0; - // remove action from the heap - heap_remove((surf_action_network_CM02_im_t) action); + if(network_update_mechanism == UM_LAZY)// remove action from the heap + heap_remove((surf_action_network_CM02_im_t) action); } } @@ -851,32 +973,93 @@ static int im_net_action_is_suspended(surf_action_t action) void im_net_action_set_max_duration(surf_action_t action, double duration) { action->max_duration = duration; - // remove action from the heap - heap_remove((surf_action_network_CM02_im_t) action); + if(network_update_mechanism == UM_LAZY)// remove action from the heap + heap_remove((surf_action_network_CM02_im_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 im_net_finalize(void) { surf_model_exit(surf_network_model); surf_network_model = NULL; - global_routing->finalize(); - lmm_system_free(network_im_maxmin_system); network_im_maxmin_system = NULL; - xbt_heap_free(im_net_action_heap); - xbt_swag_free(im_net_modified_set); + if(network_update_mechanism == UM_LAZY){ + xbt_heap_free(im_net_action_heap); + xbt_swag_free(im_net_modified_set); + } +} + +#ifdef HAVE_SMPI +static void gap_append(double size, const link_CM02_im_t link, surf_action_network_CM02_im_t action) { + const char* src = link->lmm_resource.generic_resource.name; + xbt_fifo_t fifo; + surf_action_network_CM02_im_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_im_t)xbt_fifo_get_item_content(xbt_fifo_get_last_item(fifo)); + bw = im_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_im_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_im_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); + } + } + } } +#endif static void im_surf_network_model_init_internal(void) { s_surf_action_network_CM02_im_t comm; - XBT_INFO("You are using the UNSAFE lazy management optimization, I hope you know what you are doing."); - XBT_INFO("====> For now this optimization is only available for LV08_im network model."); - surf_network_model = surf_model_init(); surf_network_model->name = "network"; @@ -889,11 +1072,16 @@ static void im_surf_network_model_init_internal(void) #endif surf_network_model->model_private->resource_used = im_net_resource_used; - surf_network_model->model_private->share_resources = im_net_share_resources; - surf_network_model->model_private->update_actions_state = - im_net_update_actions_state; + 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 = - im_net_update_resource_state; + net_update_resource_state; surf_network_model->model_private->finalize = im_net_finalize; surf_network_model->suspend = im_net_action_suspend; @@ -912,48 +1100,202 @@ static void im_surf_network_model_init_internal(void) surf_network_model->extension.network.create_resource = im_net_create_resource; + if (!network_im_maxmin_system) + network_im_maxmin_system = lmm_system_new(selective_update); - if (!network_im_maxmin_system){ - sg_maxmin_selective_update = 1; - network_im_maxmin_system = lmm_system_new(); - } - im_net_action_heap = xbt_heap_new(8,NULL); + routing_model_create(sizeof(link_CM02_im_t), + im_net_create_resource("__loopback__", + 498000000, NULL, 0.000015, NULL, + SURF_RESOURCE_ON, NULL, + SURF_LINK_FATPIPE, NULL)); - xbt_heap_set_update_callback(im_net_action_heap, im_net_action_update_index_heap); + if(network_update_mechanism == UM_LAZY){ + im_net_action_heap = xbt_heap_new(8,NULL); + xbt_heap_set_update_callback(im_net_action_heap, im_net_action_update_index_heap); + im_net_modified_set = + xbt_swag_new(xbt_swag_offset(comm, action_list_hookup)); + } +} - routing_model_create(sizeof(link_CM02_im_t), im_net_link_new(xbt_strdup("__loopback__"), - 498000000, NULL, 0.000015, NULL, - SURF_RESOURCE_ON, NULL, - SURF_LINK_FATPIPE, NULL), - im_net_get_link_latency); - im_net_modified_set = - xbt_swag_new(xbt_swag_offset(comm, action_list_hookup)); - keep_track = im_net_modified_set; +static void set_update_mechanism(void) { + char *optim = xbt_cfg_get_string(_surf_cfg_set, "network/optim"); + int select = xbt_cfg_get_int(_surf_cfg_set, "network/maxmin_selective_update"); + + if(!strcmp(optim,"Full")) { + network_update_mechanism = UM_FULL; + selective_update = select; + } else if (!strcmp(optim,"Lazy")) { + network_update_mechanism = UM_LAZY; + 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!"); + } else { + xbt_die("Unsupported optimization (%s) for this model",optim); + } } +/************************************************************************/ +/* New model based on LV08 and experimental results of MPI ping-pongs */ +/************************************************************************/ +/* @Inproceedings{smpi_ipdps, */ +/* author={Pierre-Nicolas Clauss and Mark Stillwell and Stéphane Genaud and Frédéric Suter and Henri Casanova and Martin Quinson}, */ +/* title={Single Node On-Line Simulation of {MPI} Applications with SMPI}, */ +/* booktitle={25th IEEE International Parallel and Distributed Processing Symposium (IPDPS'11)}, */ +/* address={Anchorage (Alaska) USA}, */ +/* month=may, */ +/* year={2011} */ +/* } */ +void surf_network_model_init_SMPI(void) +{ + if (surf_network_model) + return; + set_update_mechanism(); + + im_surf_network_model_init_internal(); + im_latency_factor_callback = &smpi_latency_factor; + im_bandwidth_factor_callback = &smpi_bandwidth_factor; + im_bandwidth_constraint_callback = &smpi_bandwidth_constraint; + im_net_define_callbacks(); + xbt_dynar_push(model_list, &surf_network_model); + network_im_solve = lmm_solve; + + xbt_cfg_setdefault_double(_surf_cfg_set, "network/sender_gap", 10e-6); + xbt_cfg_setdefault_double(_surf_cfg_set, "network/weight_S", 8775); +} /************************************************************************/ -/* New model based on optimizations discussed during this thesis */ +/* New model based on optimizations discussed during Pedro Velho's thesis*/ /************************************************************************/ -void im_surf_network_model_init_LegrandVelho(const char *filename) +/* @techreport{VELHO:2011:HAL-00646896:1, */ +/* url = {http://hal.inria.fr/hal-00646896/en/}, */ +/* title = {{Flow-level network models: have we reached the limits?}}, */ +/* author = {Velho, Pedro and Schnorr, Lucas and Casanova, Henri and Legrand, Arnaud}, */ +/* type = {Rapport de recherche}, */ +/* institution = {INRIA}, */ +/* number = {RR-7821}, */ +/* year = {2011}, */ +/* month = Nov, */ +/* pdf = {http://hal.inria.fr/hal-00646896/PDF/rr-validity.pdf}, */ +/* } */ +void im_surf_network_model_init_LegrandVelho(void) +{ + char *model = xbt_cfg_get_string(_surf_cfg_set, "network/model"); + + if (surf_network_model) + return; + + if(!strcmp(model,"LV08_fullupdate")) { + XBT_WARN("[*Deprecated*. Use --cfg=network/model:LV08 with option --cfg=network/optim:Full instead.]"); + } + set_update_mechanism(); + + im_surf_network_model_init_internal(); + im_net_define_callbacks(); + xbt_dynar_push(model_list, &surf_network_model); + network_im_solve = lmm_solve; + + xbt_cfg_setdefault_double(_surf_cfg_set, "network/latency_factor", 10.4); // 13.01 when callibration is done without phase effects + xbt_cfg_setdefault_double(_surf_cfg_set, "network/bandwidth_factor",0.92);// 0.97 when callibration is done without phase effects + xbt_cfg_setdefault_double(_surf_cfg_set, "network/weight_S", 8775); // 20537 when callibration is done without phase effects +} + +/***************************************************************************/ +/* The nice TCP sharing model designed by Loris Marchal and Henri Casanova */ +/***************************************************************************/ +/* @TechReport{ rr-lip2002-40, */ +/* author = {Henri Casanova and Loris Marchal}, */ +/* institution = {LIP}, */ +/* title = {A Network Model for Simulation of Grid Application}, */ +/* number = {2002-40}, */ +/* month = {oct}, */ +/* year = {2002} */ +/* } */ +void surf_network_model_init_CM02(void) { if (surf_network_model) return; + + set_update_mechanism(); im_surf_network_model_init_internal(); - im_net_define_callbacks(filename); + im_net_define_callbacks(); xbt_dynar_push(model_list, &surf_network_model); network_im_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/weight_S", 0.0); +} + +/***************************************************************************/ +/* The models from Steven H. Low */ +/***************************************************************************/ +/* @article{Low03, */ +/* author={Steven H. Low}, */ +/* title={A Duality Model of {TCP} and Queue Management Algorithms}, */ +/* year={2003}, */ +/* journal={{IEEE/ACM} Transactions on Networking}, */ +/* volume={11}, number={4}, */ +/* } */ +void surf_network_model_init_Reno(void) +{ + if (surf_network_model) + return; + + set_update_mechanism(); + im_surf_network_model_init_internal(); + im_net_define_callbacks(); + + xbt_dynar_push(model_list, &surf_network_model); + lmm_set_default_protocol_function(func_reno_f, func_reno_fp, + func_reno_fpi); + network_im_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); +} + + +void surf_network_model_init_Reno2(void) +{ + if (surf_network_model) + return; + + set_update_mechanism(); + im_surf_network_model_init_internal(); + im_net_define_callbacks(); - update_model_description(surf_network_model_description, - "LV08_im", surf_network_model); + xbt_dynar_push(model_list, &surf_network_model); + lmm_set_default_protocol_function(func_reno2_f, func_reno2_fp, + func_reno2_fpi); + network_im_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); } +void surf_network_model_init_Vegas(void) +{ + if (surf_network_model) + return; + set_update_mechanism(); + im_surf_network_model_init_internal(); + im_net_define_callbacks(); + xbt_dynar_push(model_list, &surf_network_model); + lmm_set_default_protocol_function(func_vegas_f, func_vegas_fp, + func_vegas_fpi); + network_im_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); +}