X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e43a611d100f63b3dde3d4e551da1c9520892492..f5b15e157009dbaef93d579aaf5f093864fc7cc7:/src/surf/network.c diff --git a/src/surf/network.c b/src/surf/network.c index 158c4b388b..65c2fe4a0b 100644 --- a/src/surf/network.c +++ b/src/surf/network.c @@ -8,6 +8,8 @@ #include "xbt/log.h" #include "xbt/str.h" +#include "surf/surfxml_parse_values.h" + XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network, surf, "Logging specific to the SURF network module"); @@ -58,11 +60,18 @@ static void gap_append(double size, const link_CM02_t link, surf_action_network_ } } +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) { + 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); @@ -146,7 +155,7 @@ static double (*bandwidth_constraint_callback) (double, double, double) = &constant_bandwidth_constraint; -static link_CM02_t net_link_new(char *name, +static void* net_create_resource(const char *name, double bw_initial, tmgr_trace_t bw_trace, double lat_initial, @@ -166,8 +175,7 @@ static link_CM02_t 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); @@ -179,86 +187,33 @@ static link_CM02_t 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); -#ifdef HAVE_TRACING - TRACE_surf_link_declaration(nw_link, name, bw_initial, lat_initial); -#endif + xbt_lib_set(link_lib, name, SURF_LINK_LEVEL, nw_link); return nw_link; } -static void 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; - DEBUG0("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); - 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); +static void net_parse_link_init(sg_platf_link_cbarg_t link) +{ + XBT_DEBUG("link_CM02"); - if(policy_initial_link == SURF_LINK_FULLDUPLEX) + if(link->policy == 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()); + net_create_resource(bprintf("%s_UP",link->id), link->bandwidth, link->bandwidth_trace, + link->latency, link->latency_trace, link->state, link->state_trace, + link->policy, link->properties); + net_create_resource(bprintf("%s_DOWN",link->id), link->bandwidth, link->bandwidth_trace, + link->latency, link->latency_trace, link->state, link->state_trace, + link->policy, NULL); // FIXME: We need to deep copy the properties or we won't be able to free it } 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()); + net_create_resource(xbt_strdup(link->id), link->bandwidth, link->bandwidth_trace, + link->latency, link->latency_trace, link->state, link->state_trace, + link->policy, link->properties); } } -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; @@ -273,11 +228,11 @@ 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_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); @@ -288,11 +243,11 @@ static void 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_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); @@ -303,11 +258,11 @@ static void 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_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); @@ -315,11 +270,11 @@ static void net_add_traces(void) } } -static void net_define_callbacks(const char *file) +static void net_define_callbacks(void) { /* Figuring out the network links */ - surfxml_add_callback(STag_surfxml_link_cb_list, &net_parse_link_init); - surfxml_add_callback(ETag_surfxml_platform_cb_list, &net_add_traces); + sg_platf_link_add_cb(net_parse_link_init); + sg_platf_postparse_add_cb(net_add_traces); } static int net_resource_used(void *resource_id) @@ -343,7 +298,7 @@ static int net_action_unref(surf_action_t action) if (action->category) xbt_free(action->category); #endif - free(action); + surf_action_free(&action); return 1; } return 0; @@ -403,6 +358,8 @@ static double net_share_resources(double now) } } + XBT_DEBUG("Min of share resources %f", min); + return min; } @@ -433,17 +390,19 @@ static void net_update_actions_state(double now, double delta) action->weight); } #ifdef HAVE_TRACING - 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, - action->generic_action.data, - (surf_action_t) action, - lmm_variable_getvalue - (action->variable), now - delta, - delta); + if (TRACE_is_enabled()) { + 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, + (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)) { @@ -502,7 +461,7 @@ 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, + 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)); @@ -544,9 +503,9 @@ static void net_update_resource_state(void *id, action->lat_current))); if (action->rate < sg_tcp_gamma / (2.0 * action->lat_current)) { - INFO0("Flow is limited BYBANDWIDTH"); + XBT_INFO("Flow is limited BYBANDWIDTH"); } else { - INFO1("Flow is limited BYLATENCY, latency of flow is %f", + XBT_INFO("Flow is limited BYLATENCY, latency of flow is %f", action->lat_current); } } @@ -580,7 +539,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(); } @@ -604,9 +563,9 @@ static surf_action_t net_communicate(const char *src_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); - + xbt_dynar_t route; + // I will need this route for some time so require for no cleanup + global_routing->get_route_latency(src_name, dst_name, &route, &latency, 0); if (sg_network_fullduplex == 1) { back_route = global_routing->get_route(dst_name, src_name); @@ -615,11 +574,10 @@ static surf_action_t net_communicate(const char *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 */ - latency = global_routing->get_latency(src_name,dst_name); - xbt_assert2(xbt_dynar_length(route) || latency, + xbt_assert(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); @@ -665,10 +623,14 @@ static surf_action_t net_communicate(const char *src_name, (*bandwidth_constraint_callback) (action->rate, bandwidth_bound, size); - link = *(link_CM02_t*)xbt_dynar_get_ptr(route, 0); - gap_append(size, link, action); - DEBUG5("Comm %p: %s -> %s gap=%f (lat=%f)", - action, src_name, dst_name, action->sender.gap, action->latency); + 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: @@ -714,7 +676,7 @@ static surf_action_t net_communicate(const char *src_name, } if (sg_network_fullduplex == 1) { - DEBUG1("Fullduplex active adding backward flow using 5%c", '%'); + 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); @@ -723,15 +685,16 @@ static surf_action_t 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); - XBT_OUT; + XBT_OUT(); return (surf_action_t) action; } @@ -788,6 +751,13 @@ 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); @@ -823,7 +793,10 @@ static void surf_network_model_init_internal(void) 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; @@ -840,11 +813,11 @@ static void surf_network_model_init_internal(void) 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), - net_get_link_latency); + net_create_resource(xbt_strdup("__loopback__"), + 498000000, NULL, 0.000015, NULL, + SURF_RESOURCE_ON, NULL, + SURF_LINK_FATPIPE, NULL), + net_get_link_latency); } @@ -852,7 +825,7 @@ static void surf_network_model_init_internal(void) /************************************************************************/ /* New model based on LV08 and experimental results of MPI ping-pongs */ /************************************************************************/ -void surf_network_model_init_SMPI(const char *filename) +void surf_network_model_init_SMPI(void) { if (surf_network_model) @@ -861,7 +834,7 @@ void surf_network_model_init_SMPI(const char *filename) latency_factor_callback = &smpi_latency_factor; bandwidth_factor_callback = &smpi_bandwidth_factor; bandwidth_constraint_callback = &smpi_bandwidth_constraint; - net_define_callbacks(filename); + net_define_callbacks(); xbt_dynar_push(model_list, &surf_network_model); network_solve = lmm_solve; @@ -875,13 +848,13 @@ void surf_network_model_init_SMPI(const char *filename) /************************************************************************/ /* New model based on optimizations discussed during this thesis */ /************************************************************************/ -void surf_network_model_init_LegrandVelho(const char *filename) +void surf_network_model_init_LegrandVelho(void) { if (surf_network_model) return; surf_network_model_init_internal(); - net_define_callbacks(filename); + net_define_callbacks(); xbt_dynar_push(model_list, &surf_network_model); network_solve = lmm_solve; @@ -891,7 +864,7 @@ void surf_network_model_init_LegrandVelho(const char *filename) xbt_cfg_setdefault_double(_surf_cfg_set, "network/weight_S", 8775); update_model_description(surf_network_model_description, - "LV08", surf_network_model); + "LV08_fullupdate", surf_network_model); } /***************************************************************************/ @@ -905,13 +878,13 @@ void surf_network_model_init_LegrandVelho(const char *filename) /* month = {oct}, */ /* year = {2002} */ /* } */ -void surf_network_model_init_CM02(const char *filename) +void surf_network_model_init_CM02(void) { if (surf_network_model) return; surf_network_model_init_internal(); - net_define_callbacks(filename); + net_define_callbacks(); xbt_dynar_push(model_list, &surf_network_model); network_solve = lmm_solve; @@ -919,12 +892,12 @@ void surf_network_model_init_CM02(const char *filename) "CM02", surf_network_model); } -void surf_network_model_init_Reno(const char *filename) +void surf_network_model_init_Reno(void) { if (surf_network_model) return; surf_network_model_init_internal(); - net_define_callbacks(filename); + net_define_callbacks(); xbt_dynar_push(model_list, &surf_network_model); lmm_set_default_protocol_function(func_reno_f, func_reno_fp, @@ -941,12 +914,12 @@ void surf_network_model_init_Reno(const char *filename) } -void surf_network_model_init_Reno2(const char *filename) +void surf_network_model_init_Reno2(void) { if (surf_network_model) return; surf_network_model_init_internal(); - net_define_callbacks(filename); + net_define_callbacks(); xbt_dynar_push(model_list, &surf_network_model); lmm_set_default_protocol_function(func_reno2_f, func_reno2_fp, @@ -963,12 +936,12 @@ void surf_network_model_init_Reno2(const char *filename) "Reno2", surf_network_model); } -void surf_network_model_init_Vegas(const char *filename) +void surf_network_model_init_Vegas(void) { if (surf_network_model) return; surf_network_model_init_internal(); - net_define_callbacks(filename); + net_define_callbacks(); xbt_dynar_push(model_list, &surf_network_model); lmm_set_default_protocol_function(func_vegas_f, func_vegas_fp,