X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/95f98f86ddeb28cea15e126929f48d196160a316..0ef25bc8b50d2820e612d6f416bf2c8657b0658e:/src/surf/surf_routing_vivaldi.cpp diff --git a/src/surf/surf_routing_vivaldi.cpp b/src/surf/surf_routing_vivaldi.cpp index 00e0552d8f..95bcc1b26c 100644 --- a/src/surf/surf_routing_vivaldi.cpp +++ b/src/surf/surf_routing_vivaldi.cpp @@ -1,8 +1,17 @@ +/* Copyright (c) 2013-2015. The SimGrid Team. + * All rights reserved. */ + +/* This program is free software; you can redistribute it and/or modify it + * under the terms of the license (GNU LGPL) which comes with this package. */ + #include "surf_routing_vivaldi.hpp" +#include "network_interface.hpp" -extern "C" { - XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_vivaldi, surf, "Routing part of surf"); -} +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_vivaldi, surf, "Routing part of surf"); + +#define HOST_PEER(peername) bprintf("peer_%s", peername) +#define ROUTER_PEER(peername) bprintf("router_%s", peername) +#define LINK_PEER(peername) bprintf("link_%s", peername) static XBT_INLINE double euclidean_dist_comp(int index, xbt_dynar_t src, xbt_dynar_t dst) { double src_coord, dst_coord; @@ -13,65 +22,74 @@ static XBT_INLINE double euclidean_dist_comp(int index, xbt_dynar_t src, xbt_dyn return (src_coord-dst_coord)*(src_coord-dst_coord); } -AS_t model_vivaldi_create(void) -{ - return new AsVivaldi(); -} +namespace simgrid { +namespace surf { + AsVivaldi::AsVivaldi(const char *name) + : AsGeneric(name) + {} -void AsVivaldi::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_platf_route_cbarg_t route, double *lat) +void AsVivaldi::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t route, double *lat) { s_surf_parsing_link_up_down_t info; XBT_DEBUG("vivaldi_get_route_and_latency from '%s'[%d] '%s'[%d]", - src->p_name, src->m_id, dst->p_name, dst->m_id); - - if(src->p_rcType == SURF_NETWORK_ELEMENT_AS) { - route->gw_src = (sg_routing_edge_t) xbt_lib_get_or_null(as_router_lib, ROUTER_PEER(src->p_name), ROUTING_ASR_LEVEL); - route->gw_dst = (sg_routing_edge_t) xbt_lib_get_or_null(as_router_lib, ROUTER_PEER(dst->p_name), ROUTING_ASR_LEVEL); + src->getName(), src->getId(), dst->getName(), dst->getId()); + + if(src->getRcType() == SURF_NETWORK_ELEMENT_AS) { + char *src_name = ROUTER_PEER(src->getName()); + char *dst_name = ROUTER_PEER(dst->getName()); + route->gw_src = (sg_netcard_t) xbt_lib_get_or_null(as_router_lib, src_name, ROUTING_ASR_LEVEL); + route->gw_dst = (sg_netcard_t) xbt_lib_get_or_null(as_router_lib, dst_name, ROUTING_ASR_LEVEL); + xbt_free(src_name); + xbt_free(dst_name); } double euclidean_dist; xbt_dynar_t src_ctn, dst_ctn; char *tmp_src_name, *tmp_dst_name; - if(src->p_rcType == SURF_NETWORK_ELEMENT_HOST){ - tmp_src_name = HOST_PEER(src->p_name); + if(src->getRcType() == SURF_NETWORK_ELEMENT_HOST){ + tmp_src_name = HOST_PEER(src->getName()); - if(p_linkUpDownList){ - info = xbt_dynar_get_as(p_linkUpDownList, src->m_id, s_surf_parsing_link_up_down_t); + if ((int)xbt_dynar_length(upDownLinks)>src->getId()) { + info = xbt_dynar_get_as(upDownLinks, src->getId(), 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 += dynamic_cast(static_cast(info.link_up))->getLatency(); + *lat += static_cast(info.link_up)->getLatency(); } } - src_ctn = (xbt_dynar_t) xbt_lib_get_or_null(host_lib, tmp_src_name, COORD_HOST_LEVEL); - if(!src_ctn ) src_ctn = (xbt_dynar_t) xbt_lib_get_or_null(host_lib, src->p_name, COORD_HOST_LEVEL); + src_ctn = (xbt_dynar_t) simgrid::s4u::Host::by_name_or_create(tmp_src_name)->extension(COORD_HOST_LEVEL); + if (src_ctn == nullptr) + src_ctn = (xbt_dynar_t) simgrid::s4u::Host::by_name_or_create(src->getName())->extension(COORD_HOST_LEVEL); } - else if(src->p_rcType == SURF_NETWORK_ELEMENT_ROUTER || src->p_rcType == SURF_NETWORK_ELEMENT_AS){ - tmp_src_name = ROUTER_PEER(src->p_name); + else if(src->getRcType() == SURF_NETWORK_ELEMENT_ROUTER || src->getRcType() == SURF_NETWORK_ELEMENT_AS){ + tmp_src_name = ROUTER_PEER(src->getName()); src_ctn = (xbt_dynar_t) xbt_lib_get_or_null(as_router_lib, tmp_src_name, COORD_ASR_LEVEL); } else{ THROW_IMPOSSIBLE; } - if(dst->p_rcType == SURF_NETWORK_ELEMENT_HOST){ - tmp_dst_name = HOST_PEER(dst->p_name); + if(dst->getRcType() == SURF_NETWORK_ELEMENT_HOST){ + tmp_dst_name = HOST_PEER(dst->getName()); - if(p_linkUpDownList){ - info = xbt_dynar_get_as(p_linkUpDownList, dst->m_id, s_surf_parsing_link_up_down_t); + if ((int)xbt_dynar_length(upDownLinks)>dst->getId()) { + info = xbt_dynar_get_as(upDownLinks, dst->getId(), 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 += dynamic_cast(static_cast(info.link_down))->getLatency(); + *lat += static_cast(info.link_down)->getLatency(); } } - dst_ctn = (xbt_dynar_t) xbt_lib_get_or_null(host_lib, tmp_dst_name, COORD_HOST_LEVEL); - if(!dst_ctn ) dst_ctn = (xbt_dynar_t) xbt_lib_get_or_null(host_lib, dst->p_name, COORD_HOST_LEVEL); + dst_ctn = (xbt_dynar_t) simgrid::s4u::Host::by_name_or_create(tmp_dst_name) + ->extension(COORD_HOST_LEVEL); + if (dst_ctn == nullptr) + dst_ctn = (xbt_dynar_t) simgrid::s4u::Host::by_name_or_create(dst->getName()) + ->extension(COORD_HOST_LEVEL); } - else if(dst->p_rcType == SURF_NETWORK_ELEMENT_ROUTER || dst->p_rcType == SURF_NETWORK_ELEMENT_AS){ - tmp_dst_name = ROUTER_PEER(dst->p_name); + else if(dst->getRcType() == SURF_NETWORK_ELEMENT_ROUTER || dst->getRcType() == SURF_NETWORK_ELEMENT_AS){ + tmp_dst_name = ROUTER_PEER(dst->getName()); dst_ctn = (xbt_dynar_t) xbt_lib_get_or_null(as_router_lib, tmp_dst_name, COORD_ASR_LEVEL); } else{ @@ -92,8 +110,5 @@ void AsVivaldi::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_pl } } -int AsVivaldi::parsePU(RoutingEdgePtr elm) { - XBT_DEBUG("Load process unit \"%s\"", elm->p_name); - xbt_dynar_push_as(p_indexNetworkElm, sg_routing_edge_t, elm); - return xbt_dynar_length(p_indexNetworkElm)-1; +} }