X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d8a555ee87a73f15989d8134ed157646e8dba3e9..6c053c9587e3a72153e0cc2c4494dbded6b4c788:/src/surf/network.c diff --git a/src/surf/network.c b/src/surf/network.c index c63e89d447..de8096361a 100644 --- a/src/surf/network.c +++ b/src/surf/network.c @@ -1,437 +1,472 @@ -/* $Id$ */ - -/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */ +/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team. + * All rights reserved. */ /* 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" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network, surf, - "Logging specific to the SURF network module"); + "Logging specific to the SURF network module"); -surf_network_model_t surf_network_model = NULL; +surf_model_t surf_network_model = NULL; static lmm_system_t network_maxmin_system = NULL; static void (*network_solve) (lmm_system_t) = NULL; -xbt_dict_t link_set = NULL; -xbt_dict_t network_card_set = 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_tcp_gamma = 0.0; +int sg_network_fullduplex = 0; -int card_number = 0; -int host_number = 0; -link_CM02_t **routing_table = NULL; -int *routing_table_size = NULL; -static link_CM02_t loopback = NULL; -static void create_routing_table(void) +/******************************************************************************/ +/* Factors callbacks */ +/******************************************************************************/ +static double constant_latency_factor(double size) { - routing_table = - xbt_new0(link_CM02_t *, /*card_number * card_number */ host_number * host_number); - routing_table_size = xbt_new0(int, /*card_number * card_number*/ host_number * host_number); + return sg_latency_factor; } -static void link_free(void *nw_link) +static double constant_bandwidth_factor(double size) { - free(((link_CM02_t) nw_link)->name); - free(nw_link); + return sg_bandwidth_factor; } -static link_CM02_t link_new(char *name, - double bw_initial, - tmgr_trace_t bw_trace, - double lat_initial, - tmgr_trace_t lat_trace, - e_surf_link_state_t - state_initial, - tmgr_trace_t state_trace, - e_surf_link_sharing_policy_t - policy, xbt_dict_t properties) +static double constant_bandwidth_constraint(double rate, double bound, double size) { - link_CM02_t nw_link = xbt_new0(s_link_CM02_t, 1); - xbt_assert1(!xbt_dict_get_or_null(link_set, name), - "Link '%s' declared several times in the platform file.", name); - - nw_link->model = (surf_model_t) surf_network_model; - nw_link->name = name; - nw_link->bw_current = bw_initial; - if (bw_trace) - nw_link->bw_event = - tmgr_history_add_trace(history, bw_trace, 0.0, 0, nw_link); - 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); - nw_link->state_current = state_initial; - if (state_trace) - nw_link->state_event = - tmgr_history_add_trace(history, state_trace, 0.0, 0, nw_link); + return rate; +} - nw_link->constraint = - lmm_constraint_new(network_maxmin_system, nw_link, - nw_link->bw_current); +/**********************/ +/* SMPI callbacks */ +/**********************/ +static double smpi_latency_factor(double size) +{ + /* 1 B <= size <= 1 KiB */ + if (size <= 1024.0) { + return 1.0056; + } - if (policy == SURF_LINK_FATPIPE) - lmm_constraint_shared(nw_link->constraint); + /* 2 KiB <= size <= 32 KiB */ + if (size <= 32768.0) { + return 1.8805; + } - nw_link->properties = properties; + /* 64 KiB <= size <= 4 MiB */ + return 22.7111; +} - current_property_set = properties; +static double smpi_bandwidth_factor(double size) +{ + /* 1 B <= size <= 1 KiB */ + if (size <= 1024.0) { + return 0.2758; + } - xbt_dict_set(link_set, name, nw_link, link_free); + /* 2 KiB <= size <= 32 KiB */ + if (size <= 32768.0) { + return 0.5477; + } - return nw_link; + /* 64 KiB <= size <= 4 MiB */ + return 0.9359; } -static void network_card_free(void *nw_card) +static double smpi_bandwidth_constraint(double rate, double bound, double size) { - free(((network_card_CM02_t) nw_card)->name); - free(nw_card); + return rate < 0 ? bound : min(bound, rate * smpi_bandwidth_factor(size)); } -static int network_card_new(const char *card_name) -{ - network_card_CM02_t card = - xbt_dict_get_or_null(network_card_set, card_name); - if (!card) { - card = xbt_new0(s_network_card_CM02_t, 1); - card->name = xbt_strdup(card_name); - card->id = card_number++; - xbt_dict_set(network_card_set, card_name, card, network_card_free); - } - return card->id; -} +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 void route_new(int src_id, int dst_id, - link_CM02_t * link_list, int nb_link) +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) { - ROUTE_SIZE(src_id, dst_id) = nb_link; - ROUTE(src_id, dst_id) = link_list = - xbt_realloc(link_list, sizeof(link_CM02_t) * nb_link); + 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); + + 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); + + 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; } -static void parse_link_init(void) +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_link_state_t state_initial_link = SURF_LINK_ON; + 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 = xbt_strdup(A_surfxml_link_id); surf_parse_get_double(&bw_initial, A_surfxml_link_bandwidth); - surf_parse_get_trace(&bw_trace, A_surfxml_link_bandwidth_file); + bw_trace = tmgr_trace_new(A_surfxml_link_bandwidth_file); surf_parse_get_double(&lat_initial, A_surfxml_link_latency); - surf_parse_get_trace(&lat_trace, A_surfxml_link_latency_file); + 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"); + 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_LINK_ON; - else if (A_surfxml_link_state == - A_surfxml_link_state_OFF) - state_initial_link = SURF_LINK_OFF; + 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) + 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) + A_surfxml_link_sharing_policy_FATPIPE) policy_initial_link = SURF_LINK_FATPIPE; - surf_parse_get_trace(&state_trace, A_surfxml_link_state_file); + state_trace = tmgr_trace_new(A_surfxml_link_state_file); - link_new(name_link, bw_initial, bw_trace, - lat_initial, lat_trace, state_initial_link, state_trace, - policy_initial_link, xbt_dict_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 int src_id = -1; -static int dst_id = -1; - -static void parse_route_set_endpoints(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) { - src_id = network_card_new(A_surfxml_route_src); - dst_id = network_card_new(A_surfxml_route_dst); - - route_link_list = xbt_dynar_new(sizeof(char *), &free_string); + net_link_new(name, bw_initial, bw_trace, + lat_initial, lat_trace, state_initial, state_trace, + policy, xbt_dict_new()); } - -static void parse_route_set_route(void) +static void net_add_traces(void) { - char *name; - if (src_id != -1 && dst_id != -1) { - name = bprintf("%d##%d",src_id, dst_id); - xbt_dict_set(route_table, name, route_link_list, NULL); - free(name); - } -} + xbt_dict_cursor_t cursor = NULL; + char *trace_name, *elm; -static void add_loopback() -{ - int i; - /* Adding loopback if needed */ - for (i = 0; i < host_number; i++) - if (!ROUTE_SIZE(i, i)) { - if (!loopback) - loopback = link_new(xbt_strdup("__MSG_loopback__"), - 498000000, NULL, 0.000015, NULL, - SURF_LINK_ON, NULL, - SURF_LINK_FATPIPE,NULL); - ROUTE_SIZE(i, i) = 1; - ROUTE(i, i) = xbt_new0(link_CM02_t, 1); - ROUTE(i, i)[0] = loopback; - } -} - -static void add_route() -{ - xbt_ex_t e; - int nb_link = 0; - unsigned int cpt = 0; - int link_list_capacity = 0; - link_CM02_t *link_list = NULL; + static int called = 0; + if (called) + return; + called = 1; - if (routing_table == NULL) create_routing_table(); + /* connect all traces relative to network */ + 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); - link_list_capacity = xbt_dynar_length(links); - link_list = xbt_new(link_CM02_t, link_list_capacity); + 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", + trace_name, elm); - src_id = atoi(xbt_dynar_get_as(keys, 0, char*)); - dst_id = atoi(xbt_dynar_get_as(keys, 1, char*)); - - char* link = NULL; - xbt_dynar_foreach (links, cpt, link) { - TRY { - link_list[nb_link++] = xbt_dict_get(link_set, link); - } - CATCH(e) { - RETHROW1("Link %s not found (dict raised this exception: %s)", link); - } + link->lmm_resource.state_event = + tmgr_history_add_trace(history, trace, 0.0, 0, link); } - route_new(src_id, dst_id, link_list, nb_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); -static void count_hosts(void) -{ - host_number++; -} + 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", + trace_name, elm); -static void define_callbacks(const char *file) -{ - /* Figuring out the network links */ - surfxml_add_callback(STag_surfxml_host_cb_list, &count_hosts); - surfxml_add_callback(STag_surfxml_link_cb_list, &parse_link_init); - surfxml_add_callback(STag_surfxml_prop_cb_list, &parse_properties); - surfxml_add_callback(STag_surfxml_route_cb_list, &parse_route_set_endpoints); - surfxml_add_callback(ETag_surfxml_link_c_ctn_cb_list, &parse_route_elem); - surfxml_add_callback(ETag_surfxml_route_cb_list, &parse_route_set_route); - surfxml_add_callback(STag_surfxml_platform_cb_list, &init_route_table); - surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_route); - surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_loopback); -} + link->lmm_resource.power.event = + tmgr_history_add_trace(history, trace, 0.0, 0, link); + } -static void *name_service(const char *name) -{ - network_card_CM02_t card = xbt_dict_get_or_null(network_card_set, name); - return card; + 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_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", + trace_name, elm); + + link->lat_event = tmgr_history_add_trace(history, trace, 0.0, 0, link); + } } -static const char *get_resource_name(void *resource_id) +static void net_define_callbacks(const char *file) { - return ((network_card_CM02_t) resource_id)->name; + /* 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); } -static int resource_used(void *resource_id) +static int net_resource_used(void *resource_id) { return lmm_constraint_used(network_maxmin_system, - ((link_CM02_t) resource_id)-> - constraint); + ((surf_resource_lmm_t) resource_id)->constraint); } -static int action_free(surf_action_t action) +static int net_action_unref(surf_action_t action) { - action->using--; - if (!action->using) { + action->refcount--; + if (!action->refcount) { xbt_swag_remove(action, action->state_set); if (((surf_action_network_CM02_t) action)->variable) lmm_variable_free(network_maxmin_system, - ((surf_action_network_CM02_t) action)->variable); + ((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; } return 0; } -static void action_use(surf_action_t action) +static void net_action_cancel(surf_action_t action) { - action->using++; + surf_network_model->action_state_set(action, SURF_ACTION_FAILED); } -static void action_cancel(surf_action_t action) +void net_action_recycle(surf_action_t action) { return; } -static void action_recycle(surf_action_t action) +int net_get_link_latency(surf_action_t action) { - return; + return action->latency_limited; } -static void action_change_state(surf_action_t action, - e_surf_action_state_t state) +double net_action_get_remains(surf_action_t action) { -/* if((state==SURF_ACTION_DONE) || (state==SURF_ACTION_FAILED)) */ -/* if(((surf_action_network_CM02_t)action)->variable) { */ -/* lmm_variable_disable(network_maxmin_system, ((surf_action_network_CM02_t)action)->variable); */ -/* ((surf_action_network_CM02_t)action)->variable = NULL; */ -/* } */ - - surf_action_change_state(action, state); - return; + return action->remains; } -static double share_resources(double now) +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->common_public->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); + xbt_swag_offset(s_action, + variable), + 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; + } if (action->latency > 0) { if (min < 0) - min = action->latency; + min = action->latency; else if (action->latency < min) - min = action->latency; + min = action->latency; } } return min; } -static void update_actions_state(double now, double delta) +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->common_public->states.running_action_set; + xbt_swag_t running_actions = surf_network_model->states.running_action_set; /* xbt_swag_t failed_actions = - surf_network_model->common_public->states.failed_action_set; + 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; + double_update(&(action->latency), deltap); + deltap = 0.0; } else { - double_update(&(deltap), action->latency); - action->latency = 0.0; + double_update(&(deltap), action->latency); + action->latency = 0.0; } if ((action->latency == 0.0) && !(action->suspended)) - lmm_update_variable_weight(network_maxmin_system, action->variable, - action->lat_current); + 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); + 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<.00001) action->generic_action.remains=0; */ - if ((action->generic_action.remains <= 0) && - (lmm_get_variable_weight(action->variable) > 0)) { + (lmm_get_variable_weight(action->variable) > 0)) { action->generic_action.finish = surf_get_clock(); - action_change_state((surf_action_t) action, SURF_ACTION_DONE); - } else if ((action->generic_action.max_duration != NO_MAX_DURATION) && - (action->generic_action.max_duration <= 0)) { + surf_network_model->action_state_set((surf_action_t) action, + SURF_ACTION_DONE); + } else if ((action->generic_action.max_duration != NO_MAX_DURATION) + && (action->generic_action.max_duration <= 0)) { action->generic_action.finish = surf_get_clock(); - action_change_state((surf_action_t) action, SURF_ACTION_DONE); - } else { /* Need to check that none of the model has failed */ - lmm_constraint_t cnst = NULL; - int i = 0; - link_CM02_t nw_link = NULL; - - while ((cnst = - lmm_get_cnst_from_var(network_maxmin_system, - action->variable, i++))) { - nw_link = lmm_constraint_id(cnst); - if (nw_link->state_current == SURF_LINK_OFF) { - action->generic_action.finish = surf_get_clock(); - action_change_state((surf_action_t) action, SURF_ACTION_FAILED); - break; - } - } + surf_network_model->action_state_set((surf_action_t) action, + SURF_ACTION_DONE); } } return; } -static void update_resource_state(void *id, - tmgr_trace_event_t event_type, - double value) +static void net_update_resource_state(void *id, + 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 " */ /* "%lg" " for event %p\n", surf_get_clock(), nw_link->name, */ /* value, event_type); */ - if (event_type == nw_link->bw_event) { - nw_link->bw_current = value; - lmm_update_constraint_bound(network_maxmin_system, nw_link->constraint, - nw_link->bw_current); + 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); + lmm_variable_t var = NULL; + lmm_element_t elem = NULL; + surf_action_network_CM02_t action = NULL; + + nw_link->lmm_resource.power.peak = value; + lmm_update_constraint_bound(network_maxmin_system, + nw_link->lmm_resource.constraint, + sg_bandwidth_factor * + (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)); +#endif + if (sg_weight_S_parameter > 0) { + while ((var = lmm_get_var_from_cnst + (network_maxmin_system, nw_link->lmm_resource.constraint, + &elem))) { + action = lmm_variable_id(var); + action->weight += delta; + if (!(action->suspended)) + lmm_update_variable_weight(network_maxmin_system, action->variable, + action->weight); + } + } + if (tmgr_trace_event_free(event_type)) + nw_link->lmm_resource.power.event = NULL; } else if (event_type == nw_link->lat_event) { double delta = value - nw_link->lat_current; lmm_variable_t var = NULL; + lmm_element_t elem = NULL; surf_action_network_CM02_t action = NULL; nw_link->lat_current = value; - while (lmm_get_var_from_cnst - (network_maxmin_system, nw_link->constraint, &var)) { + while ((var = lmm_get_var_from_cnst + (network_maxmin_system, nw_link->lmm_resource.constraint, + &elem))) { action = lmm_variable_id(var); action->lat_current += delta; + action->weight += delta; if (action->rate < 0) - lmm_update_variable_bound(network_maxmin_system, action->variable, - SG_TCP_CTE_GAMMA / (2.0 * - action-> - lat_current)); - else - lmm_update_variable_bound(network_maxmin_system, action->variable, - min(action->rate, - SG_TCP_CTE_GAMMA / (2.0 * - action-> - lat_current))); + lmm_update_variable_bound(network_maxmin_system, action->variable, + 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->suspended)) - lmm_update_variable_weight(network_maxmin_system, action->variable, - action->lat_current); - lmm_update_variable_latency(network_maxmin_system, action->variable, - delta); + lmm_update_variable_weight(network_maxmin_system, action->variable, + action->weight); + } - } else if (event_type == nw_link->state_event) { + if (tmgr_trace_event_free(event_type)) + nw_link->lat_event = NULL; + } else if (event_type == nw_link->lmm_resource.state_event) { if (value > 0) - nw_link->state_current = SURF_LINK_ON; - else - nw_link->state_current = SURF_LINK_OFF; + nw_link->lmm_resource.state_current = SURF_RESOURCE_ON; + else { + lmm_constraint_t cnst = nw_link->lmm_resource.constraint; + lmm_variable_t var = NULL; + lmm_element_t elem = NULL; + + nw_link->lmm_resource.state_current = SURF_RESOURCE_OFF; + while ((var = lmm_get_var_from_cnst + (network_maxmin_system, cnst, &elem))) { + surf_action_t action = lmm_variable_id(var); + + if (surf_action_state_get(action) == SURF_ACTION_RUNNING || + surf_action_state_get(action) == SURF_ACTION_READY) { + action->finish = date; + surf_network_model->action_state_set(action, SURF_ACTION_FAILED); + } + } + } + if (tmgr_trace_event_free(event_type)) + nw_link->lmm_resource.state_event = NULL; } else { CRITICAL0("Unknown event ! \n"); xbt_abort(); @@ -440,251 +475,266 @@ static void update_resource_state(void *id, return; } -static surf_action_t communicate(void *src, void *dst, 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; - network_card_CM02_t card_src = src; - network_card_CM02_t card_dst = dst; - int route_size = ROUTE_SIZE(card_src->id, card_dst->id); - link_CM02_t *route = ROUTE(card_src->id, card_dst->id); - int i; - - XBT_IN4("(%s,%s,%g,%g)", card_src->name, card_dst->name, size, rate); - xbt_assert2(route_size, - "You're trying to send data from %s to %s but there is no connexion between these two cards.", - card_src->name, card_dst->name); - - action = xbt_new0(s_surf_action_network_CM02_t, 1); - - action->generic_action.using = 1; - action->generic_action.cost = size; - action->generic_action.remains = size; - action->generic_action.max_duration = NO_MAX_DURATION; - action->generic_action.start = surf_get_clock(); - action->generic_action.finish = -1.0; - action->generic_action.model_type = - (surf_model_t) surf_network_model; - action->suspended = 0; /* Should be useless because of the - calloc but it seems to help valgrind... */ - action->generic_action.state_set = - surf_network_model->common_public->states.running_action_set; + double bandwidth_bound; + /* 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; + + 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 */ + + XBT_IN4("(%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.", + src_name, dst_name); + + xbt_dynar_foreach(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_t), size, + surf_network_model, failed); + (action->generic_action).latency_limited = 0; xbt_swag_insert(action, action->generic_action.state_set); action->rate = rate; action->latency = 0.0; - for (i = 0; i < route_size; i++) - action->latency += route[i]->lat_current; + 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); + else + 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); + + /* 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, - route_size); + 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, - route_size); + 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_CTE_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); + -1.0); } else { if (action->lat_current > 0) lmm_update_variable_bound(network_maxmin_system, action->variable, - min(action->rate, - SG_TCP_CTE_GAMMA / (2.0 * - action-> - lat_current))); + min(action->rate, + sg_tcp_gamma / (2.0 * + action->lat_current))); else lmm_update_variable_bound(network_maxmin_system, action->variable, - action->rate); + action->rate); } - lmm_update_variable_latency(network_maxmin_system, action->variable, - action->latency); - - for (i = 0; i < route_size; i++) - lmm_expand(network_maxmin_system, route[i]->constraint, - action->variable, 1.0); - XBT_OUT; - - return (surf_action_t) action; -} -/* returns an array of link_CM02_t */ -static const void **get_route(void *src, void *dst) -{ - network_card_CM02_t card_src = src; - network_card_CM02_t card_dst = dst; - return (const void **) ROUTE(card_src->id, card_dst->id); -} + xbt_dynar_foreach(route, i, link) { + lmm_expand(network_maxmin_system, link->lmm_resource.constraint, + action->variable, 1.0); + } -static int get_route_size(void *src, void *dst) -{ - network_card_CM02_t card_src = src; - network_card_CM02_t card_dst = dst; - return ROUTE_SIZE(card_src->id, card_dst->id); -} + 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 */ + +#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 -static const char *get_link_name(const void *link) -{ - return ((link_CM02_t) link)->name; -} + XBT_OUT; -static double get_link_bandwidth(const void *link) -{ - return ((link_CM02_t) link)->bw_current; + return (surf_action_t) action; } -static double get_link_latency(const void *link) +static double net_get_link_bandwidth(const void *link) { - return ((link_CM02_t) link)->lat_current; + surf_resource_lmm_t lmm = (surf_resource_lmm_t) link; + return lmm->power.peak * lmm->power.scale; } -static xbt_dict_t get_properties(void *link) +static int net_link_shared(const void *link) { - return ((link_CM02_t) link)->properties; + return lmm_constraint_is_shared(((surf_resource_lmm_t) link)->constraint); } -static void action_suspend(surf_action_t action) +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 action_resume(surf_action_t action) +static void net_action_resume(surf_action_t action) { if (((surf_action_network_CM02_t) action)->suspended) { lmm_update_variable_weight(network_maxmin_system, - ((surf_action_network_CM02_t) action)-> - variable, - ((surf_action_network_CM02_t) action)-> - lat_current); + ((surf_action_network_CM02_t) + action)->variable, + ((surf_action_network_CM02_t) action)->weight); ((surf_action_network_CM02_t) action)->suspended = 0; } } -static int action_is_suspended(surf_action_t action) +static int net_action_is_suspended(surf_action_t action) { return ((surf_action_network_CM02_t) action)->suspended; } -static void 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; } -static void finalize(void) +static void net_finalize(void) { - int i, j; - - xbt_dict_free(&network_card_set); - xbt_dict_free(&link_set); - xbt_swag_free(surf_network_model->common_public->states. - ready_action_set); - xbt_swag_free(surf_network_model->common_public->states. - running_action_set); - xbt_swag_free(surf_network_model->common_public->states. - failed_action_set); - xbt_swag_free(surf_network_model->common_public->states. - done_action_set); - free(surf_network_model->common_public); - free(surf_network_model->common_private); - free(surf_network_model->extension_public); - - free(surf_network_model); + surf_model_exit(surf_network_model); surf_network_model = NULL; - - loopback = NULL; - for (i = 0; i < card_number; i++) - for (j = 0; j < card_number; j++) - free(ROUTE(i, j)); - free(routing_table); - routing_table = NULL; - free(routing_table_size); - routing_table_size = NULL; - card_number = 0; + + global_routing->finalize(); + + lmm_system_free(network_maxmin_system); + network_maxmin_system = NULL; } static void surf_network_model_init_internal(void) { - s_surf_action_t action; - - surf_network_model = xbt_new0(s_surf_network_model_t, 1); - - surf_network_model->common_private = - xbt_new0(s_surf_model_private_t, 1); - surf_network_model->common_public = - xbt_new0(s_surf_model_public_t, 1); - surf_network_model->extension_public = - xbt_new0(s_surf_network_model_extension_public_t, 1); - - surf_network_model->common_public->states.ready_action_set = - xbt_swag_new(xbt_swag_offset(action, state_hookup)); - surf_network_model->common_public->states.running_action_set = - xbt_swag_new(xbt_swag_offset(action, state_hookup)); - surf_network_model->common_public->states.failed_action_set = - xbt_swag_new(xbt_swag_offset(action, state_hookup)); - surf_network_model->common_public->states.done_action_set = - xbt_swag_new(xbt_swag_offset(action, state_hookup)); - - surf_network_model->common_public->name_service = name_service; - surf_network_model->common_public->get_resource_name = - get_resource_name; - surf_network_model->common_public->action_get_state = - surf_action_get_state; - surf_network_model->common_public->action_get_start_time = - surf_action_get_start_time; - surf_network_model->common_public->action_get_finish_time = - surf_action_get_finish_time; - surf_network_model->common_public->action_free = action_free; - surf_network_model->common_public->action_use = action_use; - surf_network_model->common_public->action_cancel = action_cancel; - surf_network_model->common_public->action_recycle = action_recycle; - surf_network_model->common_public->action_change_state = - action_change_state; - surf_network_model->common_public->action_set_data = - surf_action_set_data; - surf_network_model->common_public->name = "network"; - - surf_network_model->common_private->resource_used = resource_used; - surf_network_model->common_private->share_resources = share_resources; - surf_network_model->common_private->update_actions_state = - update_actions_state; - surf_network_model->common_private->update_resource_state = - update_resource_state; - surf_network_model->common_private->finalize = finalize; - - surf_network_model->common_public->suspend = action_suspend; - surf_network_model->common_public->resume = action_resume; - surf_network_model->common_public->is_suspended = action_is_suspended; - surf_cpu_model->common_public->set_max_duration = - action_set_max_duration; - - surf_network_model->extension_public->communicate = communicate; - surf_network_model->extension_public->get_route = get_route; - surf_network_model->extension_public->get_route_size = get_route_size; - surf_network_model->extension_public->get_link_name = get_link_name; - surf_network_model->extension_public->get_link_bandwidth = - get_link_bandwidth; - surf_network_model->extension_public->get_link_latency = - get_link_latency; - - surf_network_model->common_public->get_properties = get_properties; - - link_set = xbt_dict_new(); - network_card_set = xbt_dict_new(); + surf_network_model = surf_model_init(); + + surf_network_model->name = "network"; + surf_network_model->action_unref = net_action_unref; + surf_network_model->action_cancel = net_action_cancel; + surf_network_model->action_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; + surf_network_model->model_private->update_actions_state = + net_update_actions_state; + surf_network_model->model_private->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->extension.network.communicate = net_communicate; + surf_network_model->extension.network.get_link_bandwidth = + net_get_link_bandwidth; + 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; 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)); +} + + + +/************************************************************************/ +/* New model based on LV08 and experimental results of MPI ping-pongs */ +/************************************************************************/ +void surf_network_model_init_SMPI(const char *filename) +{ + + if (surf_network_model) + return; + surf_network_model_init_internal(); + latency_factor_callback = &smpi_latency_factor; + bandwidth_factor_callback = &smpi_bandwidth_factor; + bandwidth_constraint_callback = &smpi_bandwidth_constraint; + net_define_callbacks(filename); + xbt_dynar_push(model_list, &surf_network_model); + network_solve = lmm_solve; + + xbt_cfg_setdefault_double(_surf_cfg_set,"network/weight_S", 8775); + + update_model_description(surf_network_model_description, + "SMPI", surf_network_model); +} + +/************************************************************************/ +/* New model based on optimizations discussed during this thesis */ +/************************************************************************/ +void surf_network_model_init_LegrandVelho(const char *filename) +{ + + if (surf_network_model) + return; + surf_network_model_init_internal(); + net_define_callbacks(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); + + update_model_description(surf_network_model_description, + "LV08", surf_network_model); } /***************************************************************************/ @@ -704,14 +754,12 @@ void surf_network_model_init_CM02(const char *filename) if (surf_network_model) return; surf_network_model_init_internal(); - define_callbacks(filename); + net_define_callbacks(filename); xbt_dynar_push(model_list, &surf_network_model); network_solve = lmm_solve; update_model_description(surf_network_model_description, - surf_network_model_description_size, - "CM02", - (surf_model_t) surf_network_model); + "CM02", surf_network_model); } void surf_network_model_init_Reno(const char *filename) @@ -719,51 +767,59 @@ void surf_network_model_init_Reno(const char *filename) if (surf_network_model) return; surf_network_model_init_internal(); - define_callbacks(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); + update_model_description(surf_network_model_description, - surf_network_model_description_size, - "Reno", - (surf_model_t) surf_network_model); + "Reno", surf_network_model); } -void surf_network_model_init_Vegas(const char *filename) + +void surf_network_model_init_Reno2(const char *filename) { if (surf_network_model) return; surf_network_model_init_internal(); - define_callbacks(filename); + net_define_callbacks(filename); xbt_dynar_push(model_list, &surf_network_model); - lmm_set_default_protocol_function(func_vegas_f, func_vegas_fp, - func_vegas_fpi); + lmm_set_default_protocol_function(func_reno2_f, func_reno2_fp, + 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); + update_model_description(surf_network_model_description, - surf_network_model_description_size, - "Vegas", - (surf_model_t) surf_network_model); + "Reno2", surf_network_model); } -#ifdef HAVE_SDP -void surf_network_model_init_SDP(const char *filename) +void surf_network_model_init_Vegas(const char *filename) { if (surf_network_model) return; surf_network_model_init_internal(); - define_callbacks(filename); + net_define_callbacks(filename); xbt_dynar_push(model_list, &surf_network_model); - network_solve = sdp_solve; + lmm_set_default_protocol_function(func_vegas_f, func_vegas_fp, + 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); update_model_description(surf_network_model_description, - surf_network_model_description_size, - "SDP", - (surf_model_t) surf_network_model); + "Vegas", surf_network_model); } -#endif + +