X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1847d1441271d076b3de449c8853031ea208ce8f..de57b34916659892d2dc26edabf552253afe2c18:/src/kernel/routing/NetZoneImpl.cpp diff --git a/src/kernel/routing/NetZoneImpl.cpp b/src/kernel/routing/NetZoneImpl.cpp index 994c6e1b76..775bff479d 100644 --- a/src/kernel/routing/NetZoneImpl.cpp +++ b/src/kernel/routing/NetZoneImpl.cpp @@ -64,32 +64,33 @@ simgrid::s4u::Host* NetZoneImpl::createHost(const char* name, std::vector& link_list, bool symmetrical) { /* Argument validity checks */ - if (e_route->gw_dst) { - XBT_DEBUG("Load bypassNetzoneRoute from %s@%s to %s@%s", e_route->src->cname(), e_route->gw_src->cname(), - e_route->dst->cname(), e_route->gw_dst->cname()); - xbt_assert(not e_route->link_list->empty(), "Bypass route between %s@%s and %s@%s cannot be empty.", - e_route->src->cname(), e_route->gw_src->cname(), e_route->dst->cname(), e_route->gw_dst->cname()); - xbt_assert(bypassRoutes_.find({e_route->src, e_route->dst}) == bypassRoutes_.end(), - "The bypass route between %s@%s and %s@%s already exists.", e_route->src->cname(), - e_route->gw_src->cname(), e_route->dst->cname(), e_route->gw_dst->cname()); + if (gw_dst) { + XBT_DEBUG("Load bypassNetzoneRoute from %s@%s to %s@%s", src->getCname(), gw_src->getCname(), dst->getCname(), + gw_dst->getCname()); + xbt_assert(not link_list.empty(), "Bypass route between %s@%s and %s@%s cannot be empty.", src->getCname(), + gw_src->getCname(), dst->getCname(), gw_dst->getCname()); + xbt_assert(bypassRoutes_.find({src, dst}) == bypassRoutes_.end(), + "The bypass route between %s@%s and %s@%s already exists.", src->getCname(), gw_src->getCname(), + dst->getCname(), gw_dst->getCname()); } else { - XBT_DEBUG("Load bypassRoute from %s to %s", e_route->src->cname(), e_route->dst->cname()); - xbt_assert(not e_route->link_list->empty(), "Bypass route between %s and %s cannot be empty.", - e_route->src->cname(), e_route->dst->cname()); - xbt_assert(bypassRoutes_.find({e_route->src, e_route->dst}) == bypassRoutes_.end(), - "The bypass route between %s and %s already exists.", e_route->src->cname(), e_route->dst->cname()); + XBT_DEBUG("Load bypassRoute from %s to %s", src->getCname(), dst->getCname()); + xbt_assert(not link_list.empty(), "Bypass route between %s and %s cannot be empty.", src->getCname(), + dst->getCname()); + xbt_assert(bypassRoutes_.find({src, dst}) == bypassRoutes_.end(), + "The bypass route between %s and %s already exists.", src->getCname(), dst->getCname()); } /* Build a copy that will be stored in the dict */ - kernel::routing::BypassRoute* newRoute = new kernel::routing::BypassRoute(e_route->gw_src, e_route->gw_dst); - for (auto const& link : *e_route->link_list) + kernel::routing::BypassRoute* newRoute = new kernel::routing::BypassRoute(gw_src, gw_dst); + for (auto const& link : link_list) newRoute->links.push_back(link); /* Store it */ - bypassRoutes_.insert({{e_route->src, e_route->dst}, newRoute}); + bypassRoutes_.insert({{src, dst}, newRoute}); } /** @brief Get the common ancestor and its first children in each line leading to src and dst @@ -160,8 +161,8 @@ static void find_common_ancestors(NetPoint* src, NetPoint* dst, NetZoneImpl* src_as = src->netzone(); NetZoneImpl* dst_as = dst->netzone(); - xbt_assert(src_as, "Host %s must be in a netzone", src->cname()); - xbt_assert(dst_as, "Host %s must be in a netzone", dst->cname()); + xbt_assert(src_as, "Host %s must be in a netzone", src->getCname()); + xbt_assert(dst_as, "Host %s must be in a netzone", dst->getCname()); /* (2) find the path to the root routing component */ std::vector path_src; @@ -203,7 +204,7 @@ static void find_common_ancestors(NetPoint* src, NetPoint* dst, /* PRECONDITION: this is the common ancestor of src and dst */ bool NetZoneImpl::getBypassRoute(routing::NetPoint* src, routing::NetPoint* dst, - /* OUT */ std::vector* links, double* latency) + /* OUT */ std::vector& links, double* latency) { // If never set a bypass route return nullptr without any further computations if (bypassRoutes_.empty()) @@ -214,11 +215,11 @@ bool NetZoneImpl::getBypassRoute(routing::NetPoint* src, routing::NetPoint* dst, if (bypassRoutes_.find({src, dst}) != bypassRoutes_.end()) { BypassRoute* bypassedRoute = bypassRoutes_.at({src, dst}); for (surf::LinkImpl* const& link : bypassedRoute->links) { - links->push_back(link); + links.push_back(link); if (latency) *latency += link->latency(); } - XBT_DEBUG("Found a bypass route from '%s' to '%s' with %zu links", src->cname(), dst->cname(), + XBT_DEBUG("Found a bypass route from '%s' to '%s' with %zu links", src->getCname(), dst->getCname(), bypassedRoute->links.size()); return true; } @@ -294,11 +295,11 @@ bool NetZoneImpl::getBypassRoute(routing::NetPoint* src, routing::NetPoint* dst, if (bypassedRoute) { XBT_DEBUG("Found a bypass route from '%s' to '%s' with %zu links. We may have to complete it with recursive " "calls to getRoute", - src->cname(), dst->cname(), bypassedRoute->links.size()); + src->getCname(), dst->getCname(), bypassedRoute->links.size()); if (src != key.first) getGlobalRoute(src, bypassedRoute->gw_src, links, latency); for (surf::LinkImpl* const& link : bypassedRoute->links) { - links->push_back(link); + links.push_back(link); if (latency) *latency += link->latency(); } @@ -306,17 +307,16 @@ bool NetZoneImpl::getBypassRoute(routing::NetPoint* src, routing::NetPoint* dst, getGlobalRoute(bypassedRoute->gw_dst, dst, links, latency); return true; } - XBT_DEBUG("No bypass route from '%s' to '%s'.", src->cname(), dst->cname()); + XBT_DEBUG("No bypass route from '%s' to '%s'.", src->getCname(), dst->getCname()); return false; } void NetZoneImpl::getGlobalRoute(routing::NetPoint* src, routing::NetPoint* dst, - /* OUT */ std::vector* links, double* latency) + /* OUT */ std::vector& links, double* latency) { - s_sg_platf_route_cbarg_t route; - memset(&route, 0, sizeof(route)); + RouteCreationArgs route; - XBT_DEBUG("Resolve route from '%s' to '%s'", src->cname(), dst->cname()); + XBT_DEBUG("Resolve route from '%s' to '%s'", src->getCname(), dst->getCname()); /* Find how src and dst are interconnected */ NetZoneImpl *common_ancestor; @@ -332,25 +332,23 @@ void NetZoneImpl::getGlobalRoute(routing::NetPoint* src, routing::NetPoint* dst, /* If src and dst are in the same netzone, life is good */ if (src_ancestor == dst_ancestor) { /* SURF_ROUTING_BASE */ - route.link_list = links; + route.link_list = std::move(links); common_ancestor->getLocalRoute(src, dst, &route, latency); + links = std::move(route.link_list); return; } /* Not in the same netzone, no bypass. We'll have to find our path between the netzones recursively */ - route.link_list = new std::vector(); - common_ancestor->getLocalRoute(src_ancestor->netpoint_, dst_ancestor->netpoint_, &route, latency); xbt_assert((route.gw_src != nullptr) && (route.gw_dst != nullptr), "bad gateways for route from \"%s\" to \"%s\"", - src->cname(), dst->cname()); + src->getCname(), dst->getCname()); /* If source gateway is not our source, we have to recursively find our way up to this point */ if (src != route.gw_src) getGlobalRoute(src, route.gw_src, links, latency); - for (auto const& link : *route.link_list) - links->push_back(link); - delete route.link_list; + for (auto const& link : route.link_list) + links.push_back(link); /* If dest gateway is not our destination, we have to recursively find our way from this point */ if (route.gw_dst != dst)