X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6aee8176bcb1a32402d11424b1f2c027ceec1b6e..360874ef02486f44db71b6ea1732457aaae54ed1:/src/surf/network.c diff --git a/src/surf/network.c b/src/surf/network.c index f8690a850a..604aeb19c7 100644 --- a/src/surf/network.c +++ b/src/surf/network.c @@ -13,7 +13,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network, surf, 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; @@ -91,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) @@ -143,8 +134,9 @@ static void parse_network_link(void) 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; @@ -153,19 +145,22 @@ 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); 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_surfxml_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) @@ -203,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; @@ -304,20 +299,20 @@ 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, 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; */ @@ -413,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; @@ -458,6 +453,31 @@ static surf_action_t communicate(void *src, void *dst, double size, double rate) 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; @@ -542,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; @@ -565,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();