X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f0cd8bad281b6428eb9736724025ade137fd4dfe..aaa70a4e410281b60c6566cc54066a1dfadc449d:/src/surf/network.c diff --git a/src/surf/network.c b/src/surf/network.c index 412779c2c3..738a096980 100644 --- a/src/surf/network.c +++ b/src/surf/network.c @@ -6,8 +6,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "network_private.h" - -#define SG_TCP_CTE_GAMMA 20000.0 +#include "xbt/log.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(network, surf, "Logging specific to the SURF network module"); @@ -118,26 +117,26 @@ 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), - "Invalid state") - if (A_network_link_state==A_network_link_state_ON) + 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_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, @@ -151,8 +150,8 @@ 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; } @@ -161,7 +160,7 @@ 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); + link_name[(nb_link) - 1] = xbt_strdup(A_surfxml_route_element_name); } static void parse_route_set_route(void) @@ -175,14 +174,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(); @@ -191,9 +190,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(); @@ -321,7 +320,8 @@ static void update_actions_state(double now, double 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) && @@ -373,10 +373,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) @@ -400,6 +403,9 @@ 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); action->generic_action.using = 1; @@ -433,23 +439,20 @@ 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); - - if(route_size == 0) { - action_change_state((surf_action_t) action, SURF_ACTION_DONE); - } + XBT_OUT; return (surf_action_t) action; } @@ -464,7 +467,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, + action->lat_current); ((surf_action_network_CM02_t) action)->suspended = 0; }