X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/38fad1a54be8df52b153c7f9ca4c40ced5dba8c9..360874ef02486f44db71b6ea1732457aaae54ed1:/src/surf/network.c diff --git a/src/surf/network.c b/src/surf/network.c index 202c2c613f..604aeb19c7 100644 --- a/src/surf/network.c +++ b/src/surf/network.c @@ -8,14 +8,12 @@ #include "network_private.h" #include "xbt/log.h" -#define SG_TCP_CTE_GAMMA 20000.0 - -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(network, surf, +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network, surf, "Logging specific to the SURF network module"); surf_network_resource_t surf_network_resource = NULL; -static xbt_dict_t network_link_set = NULL; +xbt_dict_t network_link_set = NULL; xbt_dict_t network_card_set = NULL; int card_number = 0; @@ -93,19 +91,10 @@ static int network_card_new(const char *card_name) return card->id; } -static void route_new(int src_id, int dst_id, char **links, int nb_link) +static void route_new(int src_id, int dst_id, network_link_CM02_t *link_list, int nb_link) { - network_link_CM02_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_CM02_t, nb_link)); - for (i = 0; i < nb_link; i++) { - link_list[i] = xbt_dict_get_or_null(network_link_set, links[i]); - xbt_assert1(link_list[i],"Invalid link name \"%s\"",links[i]); - free(links[i]); - } - free(links); + ROUTE(src_id, dst_id) = link_list = xbt_realloc(link_list, sizeof(network_link_CM02_t) * nb_link); } static void parse_network_link(void) @@ -119,55 +108,59 @@ static void parse_network_link(void) e_surf_network_link_sharing_policy_t policy_initial = SURF_NETWORK_LINK_SHARED; tmgr_trace_t state_trace; - name = xbt_strdup(A_network_link_name); - surf_parse_get_double(&bw_initial,A_network_link_bandwidth); - surf_parse_get_trace(&bw_trace, A_network_link_bandwidth_file); - surf_parse_get_double(&lat_initial,A_network_link_latency); - surf_parse_get_trace(&lat_trace, A_network_link_latency_file); + name = xbt_strdup(A_surfxml_network_link_name); + surf_parse_get_double(&bw_initial,A_surfxml_network_link_bandwidth); + surf_parse_get_trace(&bw_trace, A_surfxml_network_link_bandwidth_file); + surf_parse_get_double(&lat_initial,A_surfxml_network_link_latency); + surf_parse_get_trace(&lat_trace, A_surfxml_network_link_latency_file); - xbt_assert0((A_network_link_state==A_network_link_state_ON)|| - (A_network_link_state==A_network_link_state_OFF), + xbt_assert0((A_surfxml_network_link_state==A_surfxml_network_link_state_ON)|| + (A_surfxml_network_link_state==A_surfxml_network_link_state_OFF), "Invalid state"); - if (A_network_link_state==A_network_link_state_ON) + if (A_surfxml_network_link_state==A_surfxml_network_link_state_ON) state_initial = SURF_NETWORK_LINK_ON; - else if (A_network_link_state==A_network_link_state_OFF) + else if (A_surfxml_network_link_state==A_surfxml_network_link_state_OFF) state_initial = SURF_NETWORK_LINK_OFF; - if (A_network_link_sharing_policy==A_network_link_sharing_policy_SHARED) + if (A_surfxml_network_link_sharing_policy==A_surfxml_network_link_sharing_policy_SHARED) policy_initial = SURF_NETWORK_LINK_SHARED; - else if (A_network_link_sharing_policy==A_network_link_sharing_policy_FATPIPE) + else if (A_surfxml_network_link_sharing_policy==A_surfxml_network_link_sharing_policy_FATPIPE) policy_initial = SURF_NETWORK_LINK_FATPIPE; - surf_parse_get_trace(&state_trace,A_network_link_state_file); + surf_parse_get_trace(&state_trace,A_surfxml_network_link_state_file); network_link_new(name, bw_initial, bw_trace, lat_initial, lat_trace, state_initial, state_trace, policy_initial); } -static int nb_link = 0; -static char **link_name = NULL; +static int nb_link; +static int link_list_capacity; +static network_link_CM02_t *link_list = NULL; static int src_id = -1; static int dst_id = -1; static void parse_route_set_endpoints(void) { - src_id = network_card_new(A_route_src); - dst_id = network_card_new(A_route_dst); + src_id = network_card_new(A_surfxml_route_src); + dst_id = network_card_new(A_surfxml_route_dst); nb_link = 0; - link_name = NULL; + link_list_capacity = 20; + link_list = xbt_new(network_link_CM02_t, link_list_capacity); } static void parse_route_elem(void) { - nb_link++; - link_name = xbt_realloc(link_name, (nb_link) * sizeof(char *)); - link_name[(nb_link) - 1] = xbt_strdup(A_route_element_name); + if (nb_link == link_list_capacity) { + link_list_capacity *= 2; + link_list = xbt_realloc(link_list, (link_list_capacity) * sizeof(network_link_CM02_t)); + } + link_list[nb_link++] = xbt_dict_get_or_null(network_link_set, A_surfxml_route_element_name); } static void parse_route_set_route(void) { - route_new(src_id, dst_id, link_name, nb_link); + route_new(src_id, dst_id, link_list, nb_link); } static void parse_file(const char *file) @@ -176,14 +169,14 @@ static void parse_file(const char *file) /* Figuring out the network links */ surf_parse_reset_parser(); - ETag_network_link_fun=parse_network_link; + ETag_surfxml_network_link_fun=parse_network_link; surf_parse_open(file); xbt_assert1((!surf_parse()),"Parse error in %s",file); surf_parse_close(); /* Figuring out the network cards used */ surf_parse_reset_parser(); - STag_route_fun=parse_route_set_endpoints; + STag_surfxml_route_fun=parse_route_set_endpoints; surf_parse_open(file); xbt_assert1((!surf_parse()),"Parse error in %s",file); surf_parse_close(); @@ -192,9 +185,9 @@ static void parse_file(const char *file) /* Building the routes */ surf_parse_reset_parser(); - STag_route_fun=parse_route_set_endpoints; - ETag_route_element_fun=parse_route_elem; - ETag_route_fun=parse_route_set_route; + STag_surfxml_route_fun=parse_route_set_endpoints; + ETag_surfxml_route_element_fun=parse_route_elem; + ETag_surfxml_route_fun=parse_route_set_route; surf_parse_open(file); xbt_assert1((!surf_parse()),"Parse error in %s",file); surf_parse_close(); @@ -205,7 +198,7 @@ static void parse_file(const char *file) if(!ROUTE_SIZE(i,i)) { if(!loopback) loopback = network_link_new(xbt_strdup("__MSG_loopback__"), - 498.00, NULL, 0.000015, NULL, + 498000000, NULL, 0.000015, NULL, SURF_NETWORK_LINK_ON, NULL, SURF_NETWORK_LINK_FATPIPE); ROUTE_SIZE(i,i)=1; @@ -306,23 +299,25 @@ static void update_actions_state(double now, double delta) deltap = delta; if (action->latency > 0) { if (action->latency > deltap) { - surf_double_update(&(action->latency),deltap); + double_update(&(action->latency),deltap); deltap = 0.0; } else { - surf_double_update(&(deltap), action->latency); + double_update(&(deltap), action->latency); action->latency = 0.0; } if ((action->latency == 0.0) && !(action->suspended)) - lmm_update_variable_weight(maxmin_system, action->variable, 1.0); + lmm_update_variable_weight(maxmin_system, action->variable, + action->lat_current); } - surf_double_update(&(action->generic_action.remains), + double_update(&(action->generic_action.remains), lmm_variable_getvalue(action->variable) * deltap); if (action->generic_action.max_duration != NO_MAX_DURATION) - surf_double_update(&(action->generic_action.max_duration), delta); + 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) { + if ((action->generic_action.remains <= 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) && @@ -374,10 +369,13 @@ static void update_resource_state(void *id, action->lat_current += delta; if(action->rate<0) lmm_update_variable_bound(maxmin_system, action->variable, - SG_TCP_CTE_GAMMA / action->lat_current); + SG_TCP_CTE_GAMMA / (2.0 * action->lat_current)); else lmm_update_variable_bound(maxmin_system, action->variable, - min(action->rate,SG_TCP_CTE_GAMMA / action->lat_current)); + min(action->rate,SG_TCP_CTE_GAMMA / (2.0 * action->lat_current))); + if(!(action->suspended)) + lmm_update_variable_weight(maxmin_system, action->variable, + action->lat_current); } } else if (event_type == nw_link->state_event) { if (value > 0) @@ -401,6 +399,7 @@ static surf_action_t communicate(void *src, void *dst, double size, double rate) network_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); @@ -409,7 +408,7 @@ static surf_action_t communicate(void *src, void *dst, double size, double rate) action->generic_action.cost = size; action->generic_action.remains = size; action->generic_action.max_duration = NO_MAX_DURATION; - action->generic_action.start = -1.0; + action->generic_action.start = surf_get_clock(); action->generic_action.finish = -1.0; action->generic_action.resource_type = (surf_resource_t) surf_network_resource; @@ -436,23 +435,49 @@ static surf_action_t communicate(void *src, void *dst, double size, double rate) if(action->rate<0) { if(action->lat_current>0) lmm_update_variable_bound(maxmin_system, action->variable, - SG_TCP_CTE_GAMMA / action->lat_current); + SG_TCP_CTE_GAMMA / (2.0 * action->lat_current)); else lmm_update_variable_bound(maxmin_system, action->variable, -1.0); } else { if(action->lat_current>0) lmm_update_variable_bound(maxmin_system, action->variable, - min(action->rate,SG_TCP_CTE_GAMMA / action->lat_current)); + min(action->rate,SG_TCP_CTE_GAMMA / (2.0 * action->lat_current))); else lmm_update_variable_bound(maxmin_system, action->variable, action->rate); } for (i = 0; i < route_size; i++) lmm_expand(maxmin_system, route[i]->constraint, action->variable, 1.0); + XBT_OUT; return (surf_action_t) action; } +/* returns an array of network_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); +} + +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); +} + +static const char *get_link_name(const void *link) { + return ((network_link_CM02_t) link)->name; +} + +static double get_link_bandwidth(const void *link) { + return ((network_link_CM02_t) link)->bw_current; +} + +static double get_link_latency(const void *link) { + return ((network_link_CM02_t) link)->lat_current; +} + static void action_suspend(surf_action_t action) { ((surf_action_network_CM02_t) action)->suspended = 1; @@ -463,7 +488,8 @@ static void action_suspend(surf_action_t action) static void action_resume(surf_action_t action) { lmm_update_variable_weight(maxmin_system, - ((surf_action_network_CM02_t) action)->variable, 1.0); + ((surf_action_network_CM02_t) action)->variable, + ((surf_action_network_CM02_t) action)->lat_current); ((surf_action_network_CM02_t) action)->suspended = 0; } @@ -536,6 +562,10 @@ static void surf_network_resource_init_internal(void) get_resource_name; surf_network_resource->common_public->action_get_state = surf_action_get_state; + surf_network_resource->common_public->action_get_start_time = + surf_action_get_start_time; + surf_network_resource->common_public->action_get_finish_time = + surf_action_get_finish_time; surf_network_resource->common_public->action_free = action_free; surf_network_resource->common_public->action_use = action_use; surf_network_resource->common_public->action_cancel = action_cancel; @@ -559,6 +589,11 @@ static void surf_network_resource_init_internal(void) surf_cpu_resource->common_public->set_max_duration = action_set_max_duration; surf_network_resource->extension_public->communicate = communicate; + surf_network_resource->extension_public->get_route = get_route; + surf_network_resource->extension_public->get_route_size = get_route_size; + surf_network_resource->extension_public->get_link_name = get_link_name; + surf_network_resource->extension_public->get_link_bandwidth = get_link_bandwidth; + surf_network_resource->extension_public->get_link_latency = get_link_latency; network_link_set = xbt_dict_new(); network_card_set = xbt_dict_new();