X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8c354c48ec90c997cc7213ce96ca97d882934166..6cb691951277de5ede59b021bd50648ba9968182:/src/surf/network.c diff --git a/src/surf/network.c b/src/surf/network.c index f8eacea1ec..b32a57caec 100644 --- a/src/surf/network.c +++ b/src/surf/network.c @@ -6,274 +6,177 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "network_private.h" -#include "xbt/dict.h" +#include "xbt/log.h" +#include "xbt/str.h" -#define SG_TCP_CTE_GAMMA 20000.0 +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network, surf, + "Logging specific to the SURF network module"); -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(network, surf, - "Logging specific to the SURF network module"); +surf_model_t surf_network_model = NULL; +static lmm_system_t network_maxmin_system = NULL; +static void (*network_solve) (lmm_system_t) = NULL; -surf_network_resource_t surf_network_resource = NULL; +double latency_factor = 1.0; /* default value */ +double bandwidth_factor = 1.0; /* default value */ +double weight_S_parameter = 0.0; /* default value */ -static xbt_dict_t network_link_set = NULL; -static xbt_dict_t network_card_set = NULL; +double sg_tcp_gamma = 0.0; -static int card_number = 0; -static network_link_t **routing_table = NULL; -static int *routing_table_size = NULL; -#define ROUTE(i,j) routing_table[(i)+(j)*card_number] -#define ROUTE_SIZE(i,j) routing_table_size[(i)+(j)*card_number] - -static void create_routing_table(void) -{ - routing_table = xbt_new0(network_link_t *,card_number*card_number); - routing_table_size = xbt_new0(int,card_number*card_number); -} - -static void network_link_free(void *nw_link) +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_resource_state_t + state_initial, + tmgr_trace_t state_trace, + e_surf_link_sharing_policy_t + policy, xbt_dict_t properties) { - xbt_free(nw_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, + 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); -static network_link_t network_link_new(const char *name, - xbt_maxmin_float_t bw_initial, - tmgr_trace_t bw_trace, - xbt_maxmin_float_t lat_initial, - tmgr_trace_t lat_trace, - e_surf_network_link_state_t state_initial, - tmgr_trace_t state_trace) -{ - network_link_t nw_link = xbt_new0(s_network_link_t, 1); - - - nw_link->resource = (surf_resource_t) surf_network_resource; - 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); + tmgr_history_add_trace(history, lat_trace, 0.0, 0, nw_link); - nw_link->constraint = - lmm_constraint_new(maxmin_system, nw_link, - nw_link->bw_current); + if (policy == SURF_LINK_FATPIPE) + lmm_constraint_shared(nw_link->lmm_resource.constraint); - xbt_dict_set(network_link_set, name, nw_link, network_link_free); + xbt_dict_set(surf_network_model->resource_set, name, nw_link, + surf_resource_free); return nw_link; } -static int network_card_new(const char *card_name) -{ - network_card_t card = NULL; - - xbt_dict_get(network_card_set, card_name, (void *) &card); - - if(!card) { - card = xbt_new0(s_network_card_t,1); - card->name=xbt_strdup(card_name); - card->id=card_number++; - xbt_dict_set(network_card_set, card_name, card, NULL); - } - return card->id; -} - -static void route_new(int src_id, int dst_id, - char* *links, int nb_link) -{ - network_link_t *link_list = NULL; - int i ; - - ROUTE_SIZE(src_id,dst_id) = nb_link; - link_list = (ROUTE(src_id,dst_id) = xbt_new0(network_link_t,nb_link)); - for(i=0; i < nb_link; i++) { - xbt_dict_get(network_link_set,links[i], (void *) &(link_list[i])); - xbt_free(links[i]); - } - xbt_free(links); -} - -/* - Semantic: name initial bandwidth initial latency initial state - bandwidth trace latency trace state trace - - Token: TOKEN_WORD TOKEN_WORD TOKEN_WORD TOKEN_WORD TOKEN_WORD TOKEN_WORD TOKEN_WORD - Type: string float string float string ON/OFF string -*/ -static void parse_network_link(void) +static void parse_link_init(void) { - e_surf_token_t token; - char *name; - xbt_maxmin_float_t bw_initial; + char *name_link; + double bw_initial; tmgr_trace_t bw_trace; - xbt_maxmin_float_t lat_initial; + double lat_initial; tmgr_trace_t lat_trace; - e_surf_network_link_state_t state_initial; + 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 = xbt_strdup(surf_parse_text); - - surf_parse_float(&bw_initial); - surf_parse_trace(&bw_trace); - surf_parse_float(&lat_initial); - surf_parse_trace(&lat_trace); - - token = surf_parse(); /* state_initial */ - xbt_assert1((token == TOKEN_WORD), "Parse error line %d", line_pos); - if (strcmp(surf_parse_text, "ON") == 0) - state_initial = SURF_NETWORK_LINK_ON; - else if (strcmp(surf_parse_text, "OFF") == 0) - state_initial = SURF_NETWORK_LINK_OFF; - else { - CRITICAL2("Invalid cpu state (line %d): %s neq ON or OFF\n", line_pos, - surf_parse_text); - xbt_abort(); - } + 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); - surf_parse_trace(&state_trace); + 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; - network_link_new(name, bw_initial, bw_trace, - lat_initial, lat_trace, - state_initial, state_trace); -} + 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; -/* - Semantic: source destination network - links - - Token: TOKEN_WORD TOKEN_WORD TOKEN_LP TOKEN_WORD* TOKEN_RP - Type: string string string -*/ -static void parse_route(int fake) -{ - int src_id = -1; - int dst_id = -1; - int nb_link = 0; - char **link_name = NULL; - e_surf_token_t token; - - src_id = network_card_new(surf_parse_text); - - token = surf_parse(); - xbt_assert1((token == TOKEN_WORD), "Parse error line %d", line_pos); - dst_id = network_card_new(surf_parse_text); - - token = surf_parse(); - xbt_assert1((token == TOKEN_LP), "Parse error line %d", line_pos); - - while((token = surf_parse())==TOKEN_WORD) { - if(!fake) { - nb_link++; - link_name=xbt_realloc(link_name, (nb_link) * sizeof(char*)); - link_name[(nb_link)-1]=xbt_strdup(surf_parse_text); - } - } - xbt_assert1((token == TOKEN_RP), "Parse error line %d", line_pos); + 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()); - if(!fake) route_new(src_id,dst_id,link_name, nb_link); } -static void parse_file(const char *file) +static void add_traces(void) { - e_surf_token_t token; - - /* Figuring out the network links in the system */ - find_section(file, "NETWORK"); - while (1) { - token = surf_parse(); - - if (token == TOKEN_END_SECTION) - break; - if (token == TOKEN_NEWLINE) - continue; - - if (token == TOKEN_WORD) - parse_network_link(); - else { - CRITICAL1("Parse error line %d\n", line_pos); - xbt_abort(); - } + xbt_dict_cursor_t cursor = NULL; + char *trace_name, *elm; + + static int called = 0; + if (called) + return; + called = 1; + + /* 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); + + 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->lmm_resource.state_event = + tmgr_history_add_trace(history, trace, 0.0, 0, link); } - close_section("NETWORK"); - /* Figuring out the network cards used */ - find_section(file, "ROUTE"); - while (1) { - token = surf_parse(); + 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); - if (token == TOKEN_END_SECTION) - break; - if (token == TOKEN_NEWLINE) - continue; + 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); - if (token == TOKEN_WORD) - parse_route(1); - else { - CRITICAL1("Parse error line %d\n", line_pos); - xbt_abort(); - } + link->lmm_resource.power.event = + tmgr_history_add_trace(history, trace, 0.0, 0, link); } - close_section("ROUTE"); - - create_routing_table(); - /* Building the routes */ - find_section(file, "ROUTE"); - while (1) { - token = surf_parse(); + 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); - if (token == TOKEN_END_SECTION) - break; - if (token == TOKEN_NEWLINE) - continue; + 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); - if (token == TOKEN_WORD) - parse_route(0); - else { - CRITICAL1("Parse error line %d\n", line_pos); - xbt_abort(); - } + link->lat_event = tmgr_history_add_trace(history, trace, 0.0, 0, link); } - close_section("ROUTE"); } -static void *name_service(const char *name) +static void define_callbacks(const char *file) { - network_card_t card = NULL; - - xbt_dict_get(network_card_set, name, (void *) &card); - - return card; -} - -static const char *get_resource_name(void *resource_id) -{ - return ((network_card_t) resource_id)->name; + /* Figuring out the network links */ + surfxml_add_callback(STag_surfxml_link_cb_list, &parse_link_init); + surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_traces); } static int resource_used(void *resource_id) { - return lmm_constraint_used(maxmin_system, - ((network_link_t) resource_id)->constraint); + return lmm_constraint_used(network_maxmin_system, + ((surf_resource_lmm_t) resource_id)->constraint); } -static void action_free(surf_action_t action) +static int action_unref(surf_action_t action) { - surf_action_network_t Action = (surf_action_network_t) action; - - xbt_swag_remove(action, action->state_set); - lmm_variable_free(maxmin_system, Action->variable); - xbt_free(action); - - return; + 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); + free(action); + return 1; + } + return 0; } static void action_cancel(surf_action_t action) @@ -286,123 +189,169 @@ static void action_recycle(surf_action_t action) return; } -static void action_change_state(surf_action_t action, - e_surf_action_state_t state) +static double action_get_remains(surf_action_t action) { - surf_action_change_state(action, state); - return; + return action->remains; } -static xbt_heap_float_t share_resources(xbt_heap_float_t now) +static double share_resources(double now) { - surf_action_network_t action = NULL; - xbt_swag_t running_actions = - surf_network_resource->common_public->states.running_action_set; - xbt_maxmin_float_t min = -1; - xbt_maxmin_float_t value = -1; - lmm_solve(maxmin_system); - - action = xbt_swag_getFirst(running_actions); - if (!action) - return -1.0; - value = lmm_variable_getvalue(action->variable); - min = action->generic_action.remains / value; + s_surf_action_network_CM02_t s_action; + surf_action_network_CM02_t action = NULL; + xbt_swag_t running_actions = surf_network_model->states.running_action_set; + double min; + + min = generic_maxmin_share_resources(running_actions, + 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) { - value = action->latency + (action->generic_action.remains / - lmm_variable_getvalue(action->variable)); - if (value < min) - min = value; + if (action->latency > 0) { + if (min < 0) + min = action->latency; + else if (action->latency < min) + min = action->latency; + } } return min; } - -static void update_actions_state(xbt_heap_float_t now, - xbt_heap_float_t delta) +static void update_actions_state(double now, double delta) { - xbt_heap_float_t deltap = 0.0; - surf_action_network_t action = NULL; - surf_action_network_t next_action = NULL; - xbt_swag_t running_actions = - surf_network_resource->common_public->states.running_action_set; - xbt_swag_t failed_actions = - surf_network_resource->common_public->states.failed_action_set; + double deltap = 0.0; + surf_action_network_CM02_t action = NULL; + surf_action_network_CM02_t next_action = NULL; + xbt_swag_t running_actions = surf_network_model->states.running_action_set; + /* + xbt_swag_t 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) { - action->latency-=deltap; - deltap = 0.0; + if (action->latency > 0) { + if (action->latency > deltap) { + double_update(&(action->latency), deltap); + deltap = 0.0; } else { - 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->weight); } - action->generic_action.remains -= - lmm_variable_getvalue(action->variable) * deltap; - -/* if(action->generic_action.remains<.00001) action->generic_action.remains=0; */ - - if (action->generic_action.remains <= 0) { - action_change_state((surf_action_t) action, SURF_ACTION_DONE); - } else { /* Need to check that none of the resource has failed */ - lmm_constraint_t cnst = NULL; - int i = 0; - network_link_t nw_link = NULL; - - while ((cnst = - lmm_get_cnst_from_var(maxmin_system, action->variable, - i++))) { - nw_link = lmm_constraint_id(cnst); - if (nw_link->state_current == SURF_NETWORK_LINK_OFF) { - action_change_state((surf_action_t) action, SURF_ACTION_FAILED); - break; - } - } + 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); + } 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); } } - xbt_swag_foreach_safe(action, next_action, failed_actions) { - lmm_variable_disable(maxmin_system, action->variable); - } - return; } static void update_resource_state(void *id, - tmgr_trace_event_t event_type, - xbt_maxmin_float_t value) + tmgr_trace_event_t event_type, + double value, double date) { - network_link_t nw_link = id; - -/* printf("[" XBT_HEAP_FLOAT_T "] Asking to update network card \"%s\" with value " */ -/* XBT_MAXMIN_FLOAT_T " 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(maxmin_system, nw_link->constraint, - nw_link->bw_current); + 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->lmm_resource.power.event) { + double delta = + weight_S_parameter / value - 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, + bandwidth_factor * + (nw_link->lmm_resource.power.peak * + nw_link->lmm_resource.power.scale)); + if (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) { - xbt_maxmin_float_t delta = value - nw_link->lat_current; + double delta = value - nw_link->lat_current; lmm_variable_t var = NULL; - surf_action_network_t action = NULL; + lmm_element_t elem = NULL; + surf_action_network_CM02_t action = NULL; nw_link->lat_current = value; - while(lmm_get_var_from_cnst(maxmin_system, nw_link->constraint, &var)) { - action = lmm_variable_id(var); - action->lat_current+=delta; - lmm_update_variable_bound(maxmin_system, var, - 1/(action->lat_current)); + 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_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->suspended)) + 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_NETWORK_LINK_ON; - else - nw_link->state_current = SURF_NETWORK_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(); @@ -411,118 +360,291 @@ static void update_resource_state(void *id, return; } -static surf_action_t communicate(void *src, void *dst, - xbt_maxmin_float_t size) +static surf_action_t communicate(const char *src_name, const char *dst_name, + int src, int dst, double size, double rate) { - surf_action_network_t action = NULL; - network_card_t card_src = src; - network_card_t card_dst = dst; - int route_size = ROUTE_SIZE(card_src->id,card_dst->id); - network_link_t *route = ROUTE(card_src->id,card_dst->id); - int i; - - action = xbt_new0(s_surf_action_network_t, 1); - - action->generic_action.cost = size; - action->generic_action.remains = size; - action->generic_action.start = -1.0; - action->generic_action.finish = -1.0; - action->generic_action.callback = NULL; - action->generic_action.resource_type = - (surf_resource_t) surf_network_resource; - - action->generic_action.state_set = - surf_network_resource->common_public->states.running_action_set; + surf_action_network_CM02_t action = NULL; + /* LARGE PLATFORMS HACK: + Add a link_CM02_t *link and a int link_nb to network_card_CM02_t. It will represent local links for this node + Use the cluster_id for ->id */ + xbt_dynar_t route = used_routing->get_route(src, dst); + /* LARGE PLATFORMS HACK: + total_route_size = route_size + src->link_nb + dst->nb */ + unsigned int i; + + 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); + + link_CM02_t link; + int failed = 0; + 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); xbt_swag_insert(action, action->generic_action.state_set); - - action->variable = lmm_variable_new(maxmin_system, action, 1.0, -1.0, - route_size); - for(i=0; iconstraint, action->variable, - 1.0); + action->rate = rate; action->latency = 0.0; - for(i=0; ilatency += route[i]->lat_current; + action->weight = 0.0; + xbt_dynar_foreach(route, i, link) { + action->latency += link->lat_current; + action->weight += + link->lat_current + + weight_S_parameter / + (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; - lmm_update_variable_bound(maxmin_system, action->variable, - SG_TCP_CTE_GAMMA/action->lat_current); + action->latency *= latency_factor; + + /* LARGE PLATFORMS HACK: + lmm_variable_new(..., total_route_size) */ + if (action->latency > 0) + action->variable = + lmm_variable_new(network_maxmin_system, action, 0.0, -1.0, + xbt_dynar_length(route)); + else + action->variable = + lmm_variable_new(network_maxmin_system, action, 1.0, -1.0, + xbt_dynar_length(route)); + + if (action->rate < 0) { + if (action->lat_current > 0) + lmm_update_variable_bound(network_maxmin_system, action->variable, + sg_tcp_gamma / (2.0 * action->lat_current)); + else + lmm_update_variable_bound(network_maxmin_system, action->variable, + -1.0); + } else { + if (action->lat_current > 0) + lmm_update_variable_bound(network_maxmin_system, action->variable, + min(action->rate, + sg_tcp_gamma / (2.0 * + action->lat_current))); + else + lmm_update_variable_bound(network_maxmin_system, action->variable, + action->rate); + } + + xbt_dynar_foreach(route, i, link) { + lmm_expand(network_maxmin_system, link->lmm_resource.constraint, + action->variable, 1.0); + } + /* LARGE PLATFORMS HACK: + expand also with src->link and dst->link */ + + XBT_OUT; return (surf_action_t) action; } +static double get_link_bandwidth(const void *link) +{ + surf_resource_lmm_t lmm = (surf_resource_lmm_t) link; + return lmm->power.peak * lmm->power.scale; +} + +static double get_link_latency(const void *link) +{ + return ((link_CM02_t) link)->lat_current; +} + +static int link_shared(const void *link) +{ + return lmm_constraint_is_shared(((surf_resource_lmm_t) link)->constraint); +} + +static void 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); +} + +static void 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)->weight); + ((surf_action_network_CM02_t) action)->suspended = 0; + } +} + +static int 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) +{ + action->max_duration = duration; +} + static void finalize(void) { - xbt_dict_free(&network_card_set); - xbt_dict_free(&network_link_set); - xbt_swag_free(surf_network_resource->common_public->states.ready_action_set); - xbt_swag_free(surf_network_resource->common_public->states. - running_action_set); - xbt_swag_free(surf_network_resource->common_public->states. - failed_action_set); - xbt_swag_free(surf_network_resource->common_public->states.done_action_set); - xbt_free(surf_network_resource->common_public); - xbt_free(surf_network_resource->common_private); - xbt_free(surf_network_resource->extension_public); - - xbt_free(surf_network_resource); - surf_network_resource = NULL; + surf_model_exit(surf_network_model); + surf_network_model = NULL; + + used_routing->finalize(); + lmm_system_free(network_maxmin_system); + network_maxmin_system = NULL; } -static void surf_network_resource_init_internal(void) +static void surf_network_model_init_internal(void) +{ + surf_network_model = surf_model_init(); + + surf_network_model->name = "network"; + surf_network_model->action_unref = action_unref; + surf_network_model->action_cancel = action_cancel; + surf_network_model->action_recycle = action_recycle; + surf_network_model->get_remains = action_get_remains; + + surf_network_model->model_private->resource_used = resource_used; + surf_network_model->model_private->share_resources = share_resources; + surf_network_model->model_private->update_actions_state = + update_actions_state; + surf_network_model->model_private->update_resource_state = + update_resource_state; + surf_network_model->model_private->finalize = finalize; + + surf_network_model->suspend = action_suspend; + surf_network_model->resume = action_resume; + surf_network_model->is_suspended = action_is_suspended; + surf_cpu_model->set_max_duration = action_set_max_duration; + + surf_network_model->extension.network.communicate = communicate; + surf_network_model->extension.network.get_link_bandwidth = + get_link_bandwidth; + surf_network_model->extension.network.get_link_latency = get_link_latency; + surf_network_model->extension.network.link_shared = link_shared; + + if (!network_maxmin_system) + network_maxmin_system = lmm_system_new(); + + routing_model_create(sizeof(link_CM02_t), + link_new(xbt_strdup("__loopback__"), + 498000000, NULL, 0.000015, NULL, + SURF_RESOURCE_ON, NULL, SURF_LINK_FATPIPE, + NULL)); +} + +/************************************************************************/ +/* 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(); + define_callbacks(filename); + xbt_dynar_push(model_list, &surf_network_model); + network_solve = lmm_solve; + + latency_factor = 10.4; + bandwidth_factor = 0.92; + weight_S_parameter = 8775; + + update_model_description(surf_network_model_description, + "LV08", surf_network_model); +} + +/***************************************************************************/ +/* 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(const char *filename) +{ + + if (surf_network_model) + return; + surf_network_model_init_internal(); + define_callbacks(filename); + xbt_dynar_push(model_list, &surf_network_model); + network_solve = lmm_solve; + + update_model_description(surf_network_model_description, + "CM02", surf_network_model); +} + +void surf_network_model_init_Reno(const char *filename) +{ + if (surf_network_model) + return; + surf_network_model_init_internal(); + 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); + network_solve = lagrange_solve; + + latency_factor = 10.4; + bandwidth_factor = 0.92; + weight_S_parameter = 8775; + + update_model_description(surf_network_model_description, + "Reno", surf_network_model); +} + + +void surf_network_model_init_Reno2(const char *filename) { - s_surf_action_t action; - - surf_network_resource = xbt_new0(s_surf_network_resource_t, 1); - - surf_network_resource->common_private = - xbt_new0(s_surf_resource_private_t, 1); - surf_network_resource->common_public = - xbt_new0(s_surf_resource_public_t, 1); -/* surf_network_resource->extension_private = xbt_new0(s_surf_network_resource_extension_private_t,1); */ - surf_network_resource->extension_public = - xbt_new0(s_surf_network_resource_extension_public_t, 1); - - surf_network_resource->common_public->states.ready_action_set = - xbt_swag_new(xbt_swag_offset(action, state_hookup)); - surf_network_resource->common_public->states.running_action_set = - xbt_swag_new(xbt_swag_offset(action, state_hookup)); - surf_network_resource->common_public->states.failed_action_set = - xbt_swag_new(xbt_swag_offset(action, state_hookup)); - surf_network_resource->common_public->states.done_action_set = - xbt_swag_new(xbt_swag_offset(action, state_hookup)); - - surf_network_resource->common_public->name_service = name_service; - surf_network_resource->common_public->get_resource_name = - get_resource_name; - surf_network_resource->common_public->action_get_state = - surf_action_get_state; - surf_network_resource->common_public->action_free = action_free; - surf_network_resource->common_public->action_cancel = action_cancel; - surf_network_resource->common_public->action_recycle = action_recycle; - surf_network_resource->common_public->action_change_state = - action_change_state; - - surf_network_resource->common_private->resource_used = resource_used; - surf_network_resource->common_private->share_resources = share_resources; - surf_network_resource->common_private->update_actions_state = - update_actions_state; - surf_network_resource->common_private->update_resource_state = - update_resource_state; - surf_network_resource->common_private->finalize = finalize; - - surf_network_resource->extension_public->communicate = communicate; - - network_link_set = xbt_dict_new(); - network_card_set = xbt_dict_new(); - - xbt_assert0(maxmin_system, "surf_init has to be called first!"); + if (surf_network_model) + return; + surf_network_model_init_internal(); + define_callbacks(filename); + + xbt_dynar_push(model_list, &surf_network_model); + lmm_set_default_protocol_function(func_reno2_f, func_reno2_fp, + func_reno2_fpi); + network_solve = lagrange_solve; + + latency_factor = 10.4; + bandwidth_factor = 0.92; + weight_S_parameter = 8775; + + update_model_description(surf_network_model_description, + "Reno2", surf_network_model); } -void surf_network_resource_init(const char *filename) +void surf_network_model_init_Vegas(const char *filename) { - surf_network_resource_init_internal(); - parse_file(filename); - xbt_dynar_push(resource_list, &surf_network_resource); + if (surf_network_model) + return; + surf_network_model_init_internal(); + 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); + network_solve = lagrange_solve; + + latency_factor = 10.4; + bandwidth_factor = 0.92; + weight_S_parameter = 8775; + + update_model_description(surf_network_model_description, + "Vegas", surf_network_model); }