X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/17023af1f7484d0592aa37f08bcd35e7dda3efe3..40d89d6d59e95c796444491689c9848e3c7fa332:/src/surf/surf_routing_full.cpp diff --git a/src/surf/surf_routing_full.cpp b/src/surf/surf_routing_full.cpp index 49e71cc36f..1ec430882b 100644 --- a/src/surf/surf_routing_full.cpp +++ b/src/surf/surf_routing_full.cpp @@ -14,19 +14,24 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_full, surf, "Routing part of surf"); namespace simgrid { namespace surf { + AsFull::AsFull(const char*name) + : AsGeneric(name) + { + } + void AsFull::Seal() { int i; sg_platf_route_cbarg_t e_route; /* set utils vars */ - int table_size = (int)xbt_dynar_length(p_indexNetworkElm); + int table_size = (int)xbt_dynar_length(vertices_); /* Create table if necessary */ if (!p_routingTable) p_routingTable = xbt_new0(sg_platf_route_cbarg_t, table_size * table_size); /* Add the loopback if needed */ - if (routing_platf->p_loopback && p_hierarchy == SURF_ROUTING_BASE) { + if (routing_platf->p_loopback && hierarchy_ == SURF_ROUTING_BASE) { for (i = 0; i < table_size; i++) { e_route = TO_ROUTE_FULL(i, i); if (!e_route) { @@ -43,7 +48,7 @@ void AsFull::Seal() { AsFull::~AsFull(){ if (p_routingTable) { - int table_size = (int)xbt_dynar_length(p_indexNetworkElm); + int table_size = (int)xbt_dynar_length(vertices_); int i, j; /* Delete routing table */ for (i = 0; i < table_size; i++) @@ -62,7 +67,7 @@ xbt_dynar_t AsFull::getOneLinkRoutes() xbt_dynar_t ret = xbt_dynar_new(sizeof(Onelink*), xbt_free_f); int src, dst; - int table_size = xbt_dynar_length(p_indexNetworkElm); + int table_size = xbt_dynar_length(vertices_); for(src=0; src < table_size; src++) { for(dst=0; dst< table_size; dst++) { @@ -71,13 +76,13 @@ xbt_dynar_t AsFull::getOneLinkRoutes() if (xbt_dynar_length(route->link_list) == 1) { void *link = *(void **) xbt_dynar_get_ptr(route->link_list, 0); Onelink *onelink; - if (p_hierarchy == SURF_ROUTING_BASE) { - NetCard *tmp_src = xbt_dynar_get_as(p_indexNetworkElm, src, sg_netcard_t); + if (hierarchy_ == SURF_ROUTING_BASE) { + NetCard *tmp_src = xbt_dynar_get_as(vertices_, src, sg_netcard_t); tmp_src->setId(src); - NetCard *tmp_dst = xbt_dynar_get_as(p_indexNetworkElm, dst, sg_netcard_t); + NetCard *tmp_dst = xbt_dynar_get_as(vertices_, dst, sg_netcard_t); tmp_dst->setId(dst); onelink = new Onelink(link, tmp_src, tmp_dst); - } else if (p_hierarchy == SURF_ROUTING_RECURSIVE) + } else if (hierarchy_ == SURF_ROUTING_RECURSIVE) onelink = new Onelink(link, route->gw_src, route->gw_dst); else onelink = new Onelink(link, NULL, NULL); @@ -95,19 +100,19 @@ xbt_dynar_t AsFull::getOneLinkRoutes() void AsFull::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t res, double *lat) { XBT_DEBUG("full_get_route_and_latency from %s[%d] to %s[%d]", - src->getName(), - src->getId(), - dst->getName(), - dst->getId()); + src->name(), + src->id(), + dst->name(), + dst->id()); /* set utils vars */ - size_t table_size = xbt_dynar_length(p_indexNetworkElm); + size_t table_size = xbt_dynar_length(vertices_); sg_platf_route_cbarg_t e_route = NULL; void *link; unsigned int cpt = 0; - e_route = TO_ROUTE_FULL(src->getId(), dst->getId()); + e_route = TO_ROUTE_FULL(src->id(), dst->id()); if (e_route) { res->gw_src = e_route->gw_src; @@ -120,10 +125,6 @@ void AsFull::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg } } -void AsFull::parseASroute(sg_platf_route_cbarg_t route){ - parseRoute(route); -} - static int full_pointer_resource_cmp(const void *a, const void *b) { return a != b; @@ -131,17 +132,15 @@ static int full_pointer_resource_cmp(const void *a, const void *b) void AsFull::parseRoute(sg_platf_route_cbarg_t route) { - int as_route = 0; - char *src = (char*)(route->src); - char *dst = (char*)(route->dst); - NetCard *src_net_elm, *dst_net_elm; - src_net_elm = sg_netcard_by_name_or_null(src); - dst_net_elm = sg_netcard_by_name_or_null(dst); + const char *src = route->src; + const char *dst = route->dst; + NetCard *src_net_elm = sg_netcard_by_name_or_null(src); + NetCard *dst_net_elm = sg_netcard_by_name_or_null(dst); xbt_assert(src_net_elm, "Network elements %s not found", src); xbt_assert(dst_net_elm, "Network elements %s not found", dst); - size_t table_size = xbt_dynar_length(p_indexNetworkElm); + size_t table_size = xbt_dynar_length(vertices_); xbt_assert(!xbt_dynar_is_empty(route->link_list), "Invalid count of links, must be greater than zero (%s,%s)", @@ -150,7 +149,7 @@ void AsFull::parseRoute(sg_platf_route_cbarg_t route) if (!p_routingTable) p_routingTable = xbt_new0(sg_platf_route_cbarg_t, table_size * table_size); - if (TO_ROUTE_FULL(src_net_elm->getId(), dst_net_elm->getId())) { + if (TO_ROUTE_FULL(src_net_elm->id(), dst_net_elm->id())) { char *link_name; unsigned int i; xbt_dynar_t link_route_to_test = @@ -160,7 +159,7 @@ void AsFull::parseRoute(sg_platf_route_cbarg_t route) xbt_assert(link, "Link : '%s' doesn't exists.", link_name); xbt_dynar_push(link_route_to_test, &link); } - if (xbt_dynar_compare(TO_ROUTE_FULL(src_net_elm->getId(), dst_net_elm->getId())->link_list, + if (xbt_dynar_compare(TO_ROUTE_FULL(src_net_elm->id(), dst_net_elm->id())->link_list, link_route_to_test, full_pointer_resource_cmp)) { surf_parse_error("A route between \"%s\" and \"%s\" already exists " "with a different content. " @@ -201,33 +200,29 @@ void AsFull::parseRoute(sg_platf_route_cbarg_t route) // "in a sub-sub-AS is not allowed), " // "but '%s' is not in '%s'.", // route->dst_gateway, subas->name); - as_route = 1; XBT_DEBUG("Load ASroute from \"%s\" to \"%s\"", src, dst); if (!route->gw_src || route->gw_src->getRcType() == SURF_NETWORK_ELEMENT_NULL) surf_parse_error("The src_gateway \"%s\" does not exist!", - route->gw_src ? route->gw_src->getName() : "(null)"); + route->gw_src ? route->gw_src->name() : "(null)"); if (!route->gw_dst || route->gw_dst->getRcType() == SURF_NETWORK_ELEMENT_NULL) surf_parse_error("The dst_gateway \"%s\" does not exist!", - route->gw_dst ? route->gw_dst->getName() : "(null)"); + route->gw_dst ? route->gw_dst->name() : "(null)"); XBT_DEBUG("ASroute goes from \"%s\" to \"%s\"", - route->gw_src->getName(), route->gw_dst->getName()); + route->gw_src->name(), route->gw_dst->name()); } - TO_ROUTE_FULL(src_net_elm->getId(), dst_net_elm->getId()) = newExtendedRoute(p_hierarchy, route, 1); - xbt_dynar_shrink(TO_ROUTE_FULL(src_net_elm->getId(), dst_net_elm->getId())->link_list, 0); + TO_ROUTE_FULL(src_net_elm->id(), dst_net_elm->id()) = newExtendedRoute(hierarchy_, route, 1); + xbt_dynar_shrink(TO_ROUTE_FULL(src_net_elm->id(), dst_net_elm->id())->link_list, 0); } - if ( (route->symmetrical == TRUE && as_route == 0) - || (route->symmetrical == TRUE && as_route == 1) - ) { + if (route->symmetrical == TRUE) { if (route->gw_dst && route->gw_src) { - sg_netcard_t gw_tmp; - gw_tmp = route->gw_src; + NetCard* gw_tmp = route->gw_src; route->gw_src = route->gw_dst; route->gw_dst = gw_tmp; } - if (TO_ROUTE_FULL(dst_net_elm->getId(), src_net_elm->getId())) { + if (TO_ROUTE_FULL(dst_net_elm->id(), src_net_elm->id())) { char *link_name; unsigned int i; xbt_dynar_t link_route_to_test = @@ -238,7 +233,7 @@ void AsFull::parseRoute(sg_platf_route_cbarg_t route) xbt_assert(link, "Link : '%s' doesn't exists.", link_name); xbt_dynar_push(link_route_to_test, &link); } - xbt_assert(!xbt_dynar_compare(TO_ROUTE_FULL(dst_net_elm->getId(), src_net_elm->getId())->link_list, + xbt_assert(!xbt_dynar_compare(TO_ROUTE_FULL(dst_net_elm->id(), src_net_elm->id())->link_list, link_route_to_test, full_pointer_resource_cmp), "The route between \"%s\" and \"%s\" already exists", src, @@ -248,9 +243,9 @@ void AsFull::parseRoute(sg_platf_route_cbarg_t route) XBT_DEBUG("Load Route from \"%s\" to \"%s\"", dst, src); else XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", - dst, route->gw_src->getName(), src, route->gw_dst->getName()); - TO_ROUTE_FULL(dst_net_elm->getId(), src_net_elm->getId()) = newExtendedRoute(p_hierarchy, route, 0); - xbt_dynar_shrink(TO_ROUTE_FULL(dst_net_elm->getId(), src_net_elm->getId())->link_list, 0); + dst, route->gw_src->name(), src, route->gw_dst->name()); + TO_ROUTE_FULL(dst_net_elm->id(), src_net_elm->id()) = newExtendedRoute(hierarchy_, route, 0); + xbt_dynar_shrink(TO_ROUTE_FULL(dst_net_elm->id(), src_net_elm->id())->link_list, 0); } } xbt_dynar_free(&route->link_list);