X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2599ef96125066e141d69d3348c8b4c23d773938..9c7c55379477045addcd9553b6b12752b5dc606f:/src/surf/surf_routing_vivaldi.c diff --git a/src/surf/surf_routing_vivaldi.c b/src/surf/surf_routing_vivaldi.c index d53c81233f..2079a80a2b 100644 --- a/src/surf/surf_routing_vivaldi.c +++ b/src/surf/surf_routing_vivaldi.c @@ -7,88 +7,103 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_vivaldi, surf, "Routing part of surf"); -/* Routing model structure */ +static XBT_INLINE double euclidean_dist_comp(int index, xbt_dynar_t src, xbt_dynar_t dst) { + double src_coord, dst_coord; -typedef struct { - s_routing_component_t generic_routing; - xbt_dict_t dict_processing_units; - xbt_dict_t dict_autonomous_systems; -} s_routing_component_vivaldi_t, *routing_component_vivaldi_t; + src_coord = xbt_dynar_get_as(src, index, double); + dst_coord = xbt_dynar_get_as(dst, index, double); -/* Parse routing model functions */ - -static route_extended_t vivaldi_get_route(routing_component_t rc, - const char *src, - const char *dst); - -/* Business methods */ -static route_extended_t vivaldi_get_route(routing_component_t rc, - const char *src, - const char *dst) -{ - xbt_assert(rc && src - && dst, - "Invalid params for \"get_route\" function at AS \"%s\"", - rc->name); - - route_extended_t new_e_route = xbt_new0(s_route_extended_t, 1); - new_e_route->src_gateway = ROUTER_PEER(src); - new_e_route->dst_gateway = ROUTER_PEER(dst); - new_e_route->generic_route.link_list = xbt_dynar_new(0, NULL); - return new_e_route; + return (src_coord-dst_coord)*(src_coord-dst_coord); } -static double euclidean_dist_comp(int index, xbt_dynar_t src, xbt_dynar_t dst) +static void vivaldi_get_route_and_latency( + AS_t rc, sg_routing_edge_t src_p, sg_routing_edge_t dst_p, + sg_platf_route_cbarg_t route, double *lat) { - double src_coord, dst_coord; + s_surf_parsing_link_up_down_t info; - src_coord = atof(xbt_dynar_get_as(src, index, char *)); - dst_coord = atof(xbt_dynar_get_as(dst, index, char *)); + XBT_DEBUG("vivaldi_get_route_and_latency from '%s'[%d] '%s'[%d]",src_p->name,src_p->id,dst_p->name,dst_p->id); + char *src = (char*)src_p->name; + char *dst = (char*)dst_p->name; - return (src_coord-dst_coord)*(src_coord-dst_coord); - -} + if(src_p->rc_type == SURF_NETWORK_ELEMENT_AS) { + route->gw_src = xbt_lib_get_or_null(as_router_lib,ROUTER_PEER(src),ROUTING_ASR_LEVEL); + route->gw_dst = xbt_lib_get_or_null(as_router_lib,ROUTER_PEER(dst),ROUTING_ASR_LEVEL); + } -static double base_vivaldi_get_latency (const char *src, const char *dst) -{ double euclidean_dist; xbt_dynar_t src_ctn, dst_ctn; - src_ctn = xbt_lib_get_or_null(host_lib, src, COORD_HOST_LEVEL); - if(!src_ctn) src_ctn = xbt_lib_get_or_null(as_router_lib, src, COORD_ASR_LEVEL); - dst_ctn = xbt_lib_get_or_null(host_lib, dst, COORD_HOST_LEVEL); - if(!dst_ctn) dst_ctn = xbt_lib_get_or_null(as_router_lib, dst, COORD_ASR_LEVEL); + char *tmp_src_name, *tmp_dst_name; + + if(src_p->rc_type == SURF_NETWORK_ELEMENT_HOST){ + tmp_src_name = HOST_PEER(src); + + if(rc->link_up_down_list){ + info = xbt_dynar_get_as(rc->link_up_down_list,src_p->id,s_surf_parsing_link_up_down_t); + if(info.link_up) { // link up + xbt_dynar_push_as(route->link_list,void*,info.link_up); + if (lat) + *lat += surf_network_model->extension.network.get_link_latency(info.link_up); + } + } + src_ctn = xbt_lib_get_or_null(host_lib, tmp_src_name, COORD_HOST_LEVEL); + if(!src_ctn ) src_ctn = xbt_lib_get_or_null(host_lib, src, COORD_HOST_LEVEL); + } + else if(src_p->rc_type == SURF_NETWORK_ELEMENT_ROUTER || src_p->rc_type == SURF_NETWORK_ELEMENT_AS){ + tmp_src_name = ROUTER_PEER(src); + src_ctn = xbt_lib_get_or_null(as_router_lib, tmp_src_name, COORD_ASR_LEVEL); + } + else{ + THROW_IMPOSSIBLE; + } - if(dst_ctn == NULL || src_ctn == NULL) - xbt_die("Coord src '%s' :%p dst '%s' :%p",src,src_ctn,dst,dst_ctn); + if(dst_p->rc_type == SURF_NETWORK_ELEMENT_HOST){ + tmp_dst_name = HOST_PEER(dst); + + if(rc->link_up_down_list){ + info = xbt_dynar_get_as(rc->link_up_down_list,dst_p->id,s_surf_parsing_link_up_down_t); + if(info.link_down) { // link down + xbt_dynar_push_as(route->link_list,void*,info.link_down); + if (lat) + *lat += surf_network_model->extension.network.get_link_latency(info.link_down); + } + } + dst_ctn = xbt_lib_get_or_null(host_lib, tmp_dst_name, COORD_HOST_LEVEL); + if(!dst_ctn ) dst_ctn = xbt_lib_get_or_null(host_lib, dst, COORD_HOST_LEVEL); + } + else if(dst_p->rc_type == SURF_NETWORK_ELEMENT_ROUTER || dst_p->rc_type == SURF_NETWORK_ELEMENT_AS){ + tmp_dst_name = ROUTER_PEER(dst); + dst_ctn = xbt_lib_get_or_null(as_router_lib, tmp_dst_name, COORD_ASR_LEVEL); + } + else{ + THROW_IMPOSSIBLE; + } - euclidean_dist = sqrt (euclidean_dist_comp(0,src_ctn,dst_ctn)+euclidean_dist_comp(1,src_ctn,dst_ctn)) - + fabs(atof(xbt_dynar_get_as(src_ctn, 2, char *)))+fabs(atof(xbt_dynar_get_as(dst_ctn, 2, char *))); + xbt_assert(src_ctn,"No coordinate found for element '%s'",tmp_src_name); + xbt_assert(dst_ctn,"No coordinate found for element '%s'",tmp_dst_name); + free(tmp_src_name); + free(tmp_dst_name); - xbt_assert(euclidean_dist>=0, "Euclidean Dist is less than 0\"%s\" and \"%.2f\"", src, euclidean_dist); + euclidean_dist = sqrt (euclidean_dist_comp(0,src_ctn,dst_ctn)+euclidean_dist_comp(1,src_ctn,dst_ctn)) + + fabs(xbt_dynar_get_as(src_ctn, 2, double))+fabs(xbt_dynar_get_as(dst_ctn, 2, double)); - //From .ms to .s - return euclidean_dist / 1000; + if (lat){ + XBT_DEBUG("Updating latency %f += %f",*lat,euclidean_dist); + *lat += euclidean_dist / 1000.0; //From .ms to .s + } } -static double vivaldi_get_link_latency (routing_component_t rc,const char *src, const char *dst, route_extended_t e_route) -{ - if(get_network_element_type(src) == SURF_NETWORK_ELEMENT_AS) { - int need_to_clean = e_route?0:1; - double latency; - e_route = e_route?e_route:(*(rc->get_route)) (rc, src, dst); - latency = base_vivaldi_get_latency(e_route->src_gateway,e_route->dst_gateway); - if(need_to_clean) generic_free_extended_route(e_route); - return latency; - } else { - return base_vivaldi_get_latency(src,dst); - } +static int vivaldi_parse_PU(AS_t rc, sg_routing_edge_t elm) { + XBT_DEBUG("Load process unit \"%s\"", elm->name); + xbt_dynar_push_as(rc->index_network_elm,sg_routing_edge_t,elm); + return xbt_dynar_length(rc->index_network_elm)-1; } /* Creation routing model functions */ -void *model_vivaldi_create(void) +AS_t model_vivaldi_create(void) { - routing_component_vivaldi_t new_component = model_none_create(); - new_component->generic_routing.get_route = vivaldi_get_route; - new_component->generic_routing.get_latency = vivaldi_get_link_latency; - return new_component; + AS_t new_component = model_rulebased_create(); + new_component->get_route_and_latency = vivaldi_get_route_and_latency; + new_component->parse_PU = vivaldi_parse_PU; + return new_component; }