X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f6ed451b54e9f16d1b1e58987f34aef5cdbc56f7..858b362f76d61c062e83a6bb96b7234cc32d6c16:/src/surf/network.c diff --git a/src/surf/network.c b/src/surf/network.c index 840ad3eaa6..2ed6eefc2b 100644 --- a/src/surf/network.c +++ b/src/surf/network.c @@ -10,67 +10,74 @@ #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; 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 latency_factor = 1.0; /* default value */ +double bandwidth_factor = 1.0; /* default value */ +double weight_S_parameter = 0.0; /* default value */ + 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; +double sg_tcp_gamma = 0.0; + static void create_routing_table(void) { - 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); + 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); } static void link_free(void *nw_link) { free(((link_CM02_t) nw_link)->name); + xbt_dict_free(&(((link_CM02_t) nw_link)->properties)); free(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_link_state_t - state_initial, - tmgr_trace_t state_trace, - e_surf_link_sharing_policy_t - policy, xbt_dict_t properties) + 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) { 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); + 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); + 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); + 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, state_trace, 0.0, 0, nw_link); nw_link->constraint = - lmm_constraint_new(network_maxmin_system, nw_link, - nw_link->bw_current); + lmm_constraint_new(network_maxmin_system, nw_link, + bandwidth_factor * nw_link->bw_current); if (policy == SURF_LINK_FATPIPE) lmm_constraint_shared(nw_link->constraint); @@ -93,23 +100,23 @@ static void network_card_free(void *nw_card) static int network_card_new(const char *card_name) { network_card_CM02_t card = - xbt_dict_get_or_null(network_card_set, card_name); + 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++; + card->id = host_number++; xbt_dict_set(network_card_set, card_name, card, network_card_free); } return card->id; } static void route_new(int src_id, int dst_id, - link_CM02_t * link_list, int nb_link) + link_CM02_t * link_list, int nb_link) { 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); + xbt_realloc(link_list, sizeof(link_CM02_t) * nb_link); } static void parse_link_init(void) @@ -129,28 +136,25 @@ static void parse_link_init(void) surf_parse_get_double(&lat_initial, A_surfxml_link_latency); surf_parse_get_trace(&lat_trace, 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) + else if (A_surfxml_link_state == A_surfxml_link_state_OFF) state_initial_link = SURF_LINK_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); link_new(name_link, bw_initial, bw_trace, - lat_initial, lat_trace, state_initial_link, state_trace, - policy_initial_link, xbt_dict_new()); + lat_initial, lat_trace, state_initial_link, state_trace, + policy_initial_link, xbt_dict_new()); } @@ -162,16 +166,15 @@ static void parse_route_set_endpoints(void) src_id = network_card_new(A_surfxml_route_src); dst_id = network_card_new(A_surfxml_route_dst); route_action = A_surfxml_route_action; - route_link_list = xbt_dynar_new(sizeof(char *), &free_string); } static void parse_route_set_route(void) { char *name; if (src_id != -1 && dst_id != -1) { - name = bprintf("%x#%x",src_id, dst_id); + name = bprintf("%x#%x", src_id, dst_id); manage_route(route_table, name, route_action, 0); - free(name); + free(name); } } @@ -182,10 +185,9 @@ static void add_loopback(void) 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); + 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; @@ -196,95 +198,94 @@ static void add_route(void) { xbt_ex_t e; int nb_link = 0; - unsigned int cpt = 0; + unsigned int cpt = 0; int link_list_capacity = 0; link_CM02_t *link_list = NULL; xbt_dict_cursor_t cursor = NULL; - char *key,*data, *end; + char *key, *data, *end; const char *sep = "#"; xbt_dynar_t links, keys; - if (routing_table == NULL) create_routing_table(); + if (routing_table == NULL) + create_routing_table(); xbt_dict_foreach(route_table, cursor, key, data) { - char* link = NULL; + char *link = NULL; nb_link = 0; - links = (xbt_dynar_t)data; + links = (xbt_dynar_t) data; keys = xbt_str_split_str(key, sep); link_list_capacity = xbt_dynar_length(links); link_list = xbt_new(link_CM02_t, link_list_capacity); - src_id = strtol(xbt_dynar_get_as(keys, 0, char*), &end, 16); - dst_id = strtol(xbt_dynar_get_as(keys, 1, char*), &end, 16); - - xbt_dynar_foreach (links, cpt, link) { + src_id = strtol(xbt_dynar_get_as(keys, 0, char *), &end, 16); + dst_id = strtol(xbt_dynar_get_as(keys, 1, char *), &end, 16); + xbt_dynar_free(&keys); + + xbt_dynar_foreach(links, cpt, link) { TRY { - link_list[nb_link++] = xbt_dict_get(link_set, link); + link_list[nb_link++] = xbt_dict_get(link_set, link); } CATCH(e) { RETHROW1("Link %s not found (dict raised this exception: %s)", link); - } + } } route_new(src_id, dst_id, link_list, nb_link); - } - - xbt_dict_free(&route_table); - + } } static void count_hosts(void) { - host_number++; -} - - -static void add_traces(void) { - 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(link_set, elm); - - xbt_assert1(link, "Link %s undefined", elm); - xbt_assert1(trace, "Trace %s undefined", trace_name); - - link->state_event = tmgr_history_add_trace(history, trace, 0.0, 0, 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(link_set, elm); - - xbt_assert1(link, "Link %s undefined", elm); - xbt_assert1(trace, "Trace %s undefined", trace_name); - - link->bw_event = tmgr_history_add_trace(history, trace, 0.0, 0, link); - } - - 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(link_set, elm); - - xbt_assert1(link, "Link %s undefined", elm); - xbt_assert1(trace, "Trace %s undefined", trace_name); - - link->lat_event = tmgr_history_add_trace(history, trace, 0.0, 0, link); - } - - xbt_dict_free(&trace_connect_list_host_avail); - xbt_dict_free(&trace_connect_list_power); - xbt_dict_free(&trace_connect_list_link_avail); - xbt_dict_free(&trace_connect_list_bandwidth); - xbt_dict_free(&trace_connect_list_latency); - - xbt_dict_free(&traces_set_list); + host_number++; +} + + +static void add_traces(void) +{ + 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(link_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->state_event = tmgr_history_add_trace(history, trace, 0.0, 0, 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(link_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->bw_event = tmgr_history_add_trace(history, trace, 0.0, 0, link); + } + + 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(link_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 void define_callbacks(const char *file) @@ -292,22 +293,12 @@ 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(STag_surfxml_route_cb_list, + &parse_route_set_endpoints); surfxml_add_callback(ETag_surfxml_route_cb_list, &parse_route_set_route); - surfxml_add_callback(STag_surfxml_platform_cb_list, &init_data); surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_traces); surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_route); surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_loopback); - surfxml_add_callback(STag_surfxml_set_cb_list, &parse_sets); - surfxml_add_callback(STag_surfxml_route_c_multi_cb_list, &parse_route_multi_set_endpoints); - surfxml_add_callback(ETag_surfxml_route_c_multi_cb_list, &parse_route_multi_set_route); - surfxml_add_callback(STag_surfxml_foreach_cb_list, &parse_foreach); - surfxml_add_callback(STag_surfxml_cluster_cb_list, &parse_cluster); - surfxml_add_callback(STag_surfxml_trace_cb_list, &parse_trace_init); - surfxml_add_callback(ETag_surfxml_trace_cb_list, &parse_trace_finalize); - surfxml_add_callback(STag_surfxml_trace_c_connect_cb_list, &parse_trace_c_connect); } static void *name_service(const char *name) @@ -324,18 +315,17 @@ static const char *get_resource_name(void *resource_id) static int resource_used(void *resource_id) { return lmm_constraint_used(network_maxmin_system, - ((link_CM02_t) resource_id)-> - constraint); + ((link_CM02_t) resource_id)->constraint); } static int action_free(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); free(action); return 1; } @@ -344,7 +334,7 @@ static int action_free(surf_action_t action) static void action_use(surf_action_t action) { - action->using++; + action->refcount++; } static void action_cancel(surf_action_t action) @@ -358,7 +348,7 @@ static void action_recycle(surf_action_t action) } static void action_change_state(surf_action_t action, - e_surf_action_state_t state) + e_surf_action_state_t state) { /* if((state==SURF_ACTION_DONE) || (state==SURF_ACTION_FAILED)) */ /* if(((surf_action_network_CM02_t)action)->variable) { */ @@ -375,21 +365,22 @@ static double 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; + surf_network_model->common_public->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 (action->latency > 0) { if (min < 0) - min = action->latency; + min = action->latency; else if (action->latency < min) - min = action->latency; + min = action->latency; } } @@ -402,7 +393,7 @@ static void update_actions_state(double now, double delta) 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; + surf_network_model->common_public->states.running_action_set; /* xbt_swag_t failed_actions = surf_network_model->common_public->states.failed_action_set; @@ -412,44 +403,29 @@ static void update_actions_state(double now, double delta) 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); } 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 <= 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)) { + (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; - } - } } } @@ -457,8 +433,8 @@ static void update_actions_state(double now, double delta) } static void update_resource_state(void *id, - tmgr_trace_event_t event_type, - double value) + 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 " */ @@ -466,9 +442,25 @@ static void update_resource_state(void *id, /* value, event_type); */ if (event_type == nw_link->bw_event) { + double delta = + weight_S_parameter / value - weight_S_parameter / nw_link->bw_current; + lmm_variable_t var = NULL; + lmm_element_t elem = NULL; + surf_action_network_CM02_t action = NULL; + nw_link->bw_current = value; lmm_update_constraint_bound(network_maxmin_system, nw_link->constraint, - nw_link->bw_current); + bandwidth_factor * nw_link->bw_current); + if (weight_S_parameter > 0) { + while ((var = lmm_get_var_from_cnst + (network_maxmin_system, nw_link->constraint, &elem))) { + action = lmm_variable_id(var); + action->weight += delta; + if (!(action->suspended)) + lmm_update_variable_weight(network_maxmin_system, action->variable, + action->weight); + } + } } else if (event_type == nw_link->lat_event) { double delta = value - nw_link->lat_current; lmm_variable_t var = NULL; @@ -476,32 +468,43 @@ static void update_resource_state(void *id, surf_action_network_CM02_t action = NULL; nw_link->lat_current = value; - while (var= lmm_get_var_from_cnst - (network_maxmin_system, nw_link->constraint, &elem)) { + while ((var = lmm_get_var_from_cnst + (network_maxmin_system, nw_link->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)); + 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_CTE_GAMMA / (2.0 * - action-> - lat_current))); + 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->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 (value > 0) nw_link->state_current = SURF_LINK_ON; - else + else { + lmm_constraint_t cnst = nw_link->constraint; + lmm_variable_t var = NULL; + lmm_element_t elem = NULL; + nw_link->state_current = SURF_LINK_OFF; + while ((var = lmm_get_var_from_cnst + (network_maxmin_system, cnst, &elem))) { + surf_action_t action = lmm_variable_id(var); + + if (surf_action_get_state(action) == SURF_ACTION_RUNNING || + surf_action_get_state(action) == SURF_ACTION_READY) { + action->finish = date; + action_change_state(action, SURF_ACTION_FAILED); + } + } + } } else { CRITICAL0("Unknown event ! \n"); xbt_abort(); @@ -511,7 +514,7 @@ static void update_resource_state(void *id, } static surf_action_t communicate(void *src, void *dst, double size, - double rate) + double rate) { surf_action_network_CM02_t action = NULL; /* LARGE PLATFORMS HACK: @@ -529,70 +532,73 @@ static surf_action_t communicate(void *src, void *dst, double size, /* LARGE PLATFORMS HACK: assert on total_route_size */ 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); + "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.refcount = 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.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; + surf_network_model->common_public->states.running_action_set; + for (i = 0; i < route_size; i++) + if (route[i]->state_current == SURF_LINK_OFF) { + action->generic_action.state_set = + surf_network_model->common_public->states.failed_action_set; + break; + } xbt_swag_insert(action, action->generic_action.state_set); action->rate = rate; action->latency = 0.0; - for (i = 0; i < route_size; i++) + action->weight = 0.0; + for (i = 0; i < route_size; i++) { action->latency += route[i]->lat_current; + action->weight += + route[i]->lat_current + weight_S_parameter / route[i]->bw_current; + } /* LARGE PLATFORMS HACK: Add src->link and dst->link latencies */ action->lat_current = action->latency; + action->latency *= latency_factor; /* LARGE PLATFORMS HACK: - lmm_variable_new(..., total_route_size)*/ + lmm_variable_new(..., total_route_size) */ 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, route_size); 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, route_size); 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); + action->variable, 1.0); /* LARGE PLATFORMS HACK: expand also with src->link and dst->link */ @@ -631,27 +637,31 @@ 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(((link_CM02_t) link)->constraint); +} + static xbt_dict_t get_properties(void *link) { - return ((link_CM02_t) link)->properties; + return ((link_CM02_t) link)->properties; } 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); + ((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)-> - lat_current); + ((surf_action_network_CM02_t) + action)->variable, + ((surf_action_network_CM02_t) action)->weight); ((surf_action_network_CM02_t) action)->suspended = 0; } } @@ -672,14 +682,10 @@ static void finalize(void) 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); + 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); @@ -688,14 +694,16 @@ static void finalize(void) surf_network_model = NULL; loopback = NULL; - for (i = 0; i < card_number; i++) - for (j = 0; j < card_number; j++) + for (i = 0; i < host_number; i++) + for (j = 0; j < host_number; j++) free(ROUTE(i, j)); free(routing_table); routing_table = NULL; free(routing_table_size); routing_table_size = NULL; - card_number = 0; + host_number = 0; + lmm_system_free(network_maxmin_system); + network_maxmin_system = NULL; } static void surf_network_model_init_internal(void) @@ -704,65 +712,59 @@ static void surf_network_model_init_internal(void) 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->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); + 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)); + 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)); + 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)); + 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)); + 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->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_action_get_start_time; surf_network_model->common_public->action_get_finish_time = - surf_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; + 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; + update_actions_state; surf_network_model->common_private->update_resource_state = - 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_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; + get_link_bandwidth; + surf_network_model->extension_public->get_link_latency = get_link_latency; + surf_network_model->extension_public->link_shared = link_shared; - surf_network_model->common_public->get_properties = get_properties; + surf_network_model->common_public->get_properties = get_properties; link_set = xbt_dict_new(); network_card_set = xbt_dict_new(); @@ -771,6 +773,27 @@ static void surf_network_model_init_internal(void) network_maxmin_system = lmm_system_new(); } +/************************************************************************/ +/* 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, + "LegrandVelho", (surf_model_t) surf_network_model); +} + /***************************************************************************/ /* The nice TCP sharing model designed by Loris Marchal and Henri Casanova */ /***************************************************************************/ @@ -793,9 +816,7 @@ void surf_network_model_init_CM02(const char *filename) 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_model_t) surf_network_model); } void surf_network_model_init_Reno(const char *filename) @@ -806,14 +827,36 @@ void surf_network_model_init_Reno(const char *filename) 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; + latency_factor = 10.4; + bandwidth_factor = 0.92; + weight_S_parameter = 8775; + update_model_description(surf_network_model_description, - surf_network_model_description_size, - "Reno", - (surf_model_t) surf_network_model); + "Reno", (surf_model_t) surf_network_model); +} + + +void surf_network_model_init_Reno2(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_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_model_t) surf_network_model); } void surf_network_model_init_Vegas(const char *filename) @@ -825,13 +868,15 @@ void surf_network_model_init_Vegas(const char *filename) xbt_dynar_push(model_list, &surf_network_model); lmm_set_default_protocol_function(func_vegas_f, func_vegas_fp, - func_vegas_fpi); + 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, - surf_network_model_description_size, - "Vegas", - (surf_model_t) surf_network_model); + "Vegas", (surf_model_t) surf_network_model); } #ifdef HAVE_SDP @@ -846,8 +891,6 @@ void surf_network_model_init_SDP(const char *filename) network_solve = sdp_solve; update_model_description(surf_network_model_description, - surf_network_model_description_size, - "SDP", - (surf_model_t) surf_network_model); + "SDP", (surf_model_t) surf_network_model); } #endif