From: Martin Quinson Date: Tue, 3 Jan 2017 20:50:17 +0000 (+0100) Subject: AS are called netzones, now X-Git-Tag: v3_15~581 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/d34ca0e867fb77d5d4b20431fc7e32679051a830 AS are called netzones, now --- diff --git a/src/kernel/routing/DijkstraZone.cpp b/src/kernel/routing/DijkstraZone.cpp index db3525bdc8..75068094a3 100644 --- a/src/kernel/routing/DijkstraZone.cpp +++ b/src/kernel/routing/DijkstraZone.cpp @@ -340,7 +340,7 @@ void DijkstraZone::addRoute(sg_platf_route_cbarg_t route) if (!route->gw_dst && !route->gw_src) XBT_DEBUG("Load Route from \"%s\" to \"%s\"", dstName, srcName); else - XBT_DEBUG("Load ASroute from %s@%s to %s@%s", dstName, route->gw_dst->name().c_str(), srcName, + XBT_DEBUG("Load NetzoneRoute from %s@%s to %s@%s", dstName, route->gw_dst->name().c_str(), srcName, route->gw_src->name().c_str()); xbt_dynar_t nodes = xbt_graph_get_nodes(routeGraph_); diff --git a/src/kernel/routing/FloydZone.cpp b/src/kernel/routing/FloydZone.cpp index 21780d27f6..0caacff9c3 100644 --- a/src/kernel/routing/FloydZone.cpp +++ b/src/kernel/routing/FloydZone.cpp @@ -108,7 +108,7 @@ void FloydZone::addRoute(sg_platf_route_cbarg_t route) } /* Check that the route does not already exist */ - if (route->gw_dst) // AS route (to adapt the error message, if any) + if (route->gw_dst) // netzone route (to adapt the error message, if any) xbt_assert(nullptr == TO_FLOYD_LINK(route->src->id(), route->dst->id()), "The route between %s@%s and %s@%s already exists (Rq: routes are symmetrical by default).", route->src->name().c_str(), route->gw_src->name().c_str(), route->dst->name().c_str(), @@ -124,7 +124,7 @@ void FloydZone::addRoute(sg_platf_route_cbarg_t route) (TO_FLOYD_LINK(route->src->id(), route->dst->id()))->link_list->size(); if (route->symmetrical == true) { - if (route->gw_dst) // AS route (to adapt the error message, if any) + if (route->gw_dst) // netzone route (to adapt the error message, if any) xbt_assert( nullptr == TO_FLOYD_LINK(route->dst->id(), route->src->id()), "The route between %s@%s and %s@%s already exists. You should not declare the reverse path as symmetrical.", @@ -144,7 +144,7 @@ void FloydZone::addRoute(sg_platf_route_cbarg_t route) if (!route->gw_src && !route->gw_dst) XBT_DEBUG("Load Route from \"%s\" to \"%s\"", route->dst->name().c_str(), route->src->name().c_str()); else - XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", route->dst->name().c_str(), route->gw_src->name().c_str(), + XBT_DEBUG("Load NetzoneRoute from \"%s(%s)\" to \"%s(%s)\"", route->dst->name().c_str(), route->gw_src->name().c_str(), route->src->name().c_str(), route->gw_dst->name().c_str()); TO_FLOYD_LINK(route->dst->id(), route->src->id()) = newExtendedRoute(hierarchy_, route, 0); diff --git a/src/kernel/routing/NetCard.hpp b/src/kernel/routing/NetCard.hpp index 4f285c339b..0f0b45ddf9 100644 --- a/src/kernel/routing/NetCard.hpp +++ b/src/kernel/routing/NetCard.hpp @@ -32,7 +32,7 @@ public: NetCard(std::string name, NetCard::Type componentType, NetZoneImpl* netzone_p); ~NetCard() = default; - // Our rank in the vertices_ array of our containing AS. + // Our rank in the vertices_ array of the netzone that contains us. unsigned int id() { return id_; } std::string name() { return name_; } const char* cname() { return name_.c_str(); } diff --git a/src/kernel/routing/NetZoneImpl.cpp b/src/kernel/routing/NetZoneImpl.cpp index 3927a8fdb1..b48032b06c 100644 --- a/src/kernel/routing/NetZoneImpl.cpp +++ b/src/kernel/routing/NetZoneImpl.cpp @@ -60,7 +60,7 @@ void NetZoneImpl::addBypassRoute(sg_platf_route_cbarg_t e_route) { /* Argument validity checks */ if (e_route->gw_dst) { - XBT_DEBUG("Load bypassASroute from %s@%s to %s@%s", e_route->src->cname(), e_route->gw_src->cname(), + 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(!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()); @@ -105,7 +105,7 @@ void NetZoneImpl::addBypassRoute(sg_platf_route_cbarg_t e_route) * src dst * @endverbatim * - * In the base case (when src and dst are in the same AS), things are as follows: + * In the base case (when src and dst are in the same netzone), things are as follows: * @verbatim * platform root * | @@ -152,8 +152,8 @@ static void find_common_ancestors(NetCard* src, NetCard* dst, NetZoneImpl* src_as = src->netzone(); NetZoneImpl* dst_as = dst->netzone(); - xbt_assert(src_as, "Host %s must be in an AS", src->cname()); - xbt_assert(dst_as, "Host %s must be in an AS", dst->cname()); + 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()); /* (2) find the path to the root routing component */ std::vector path_src; @@ -317,14 +317,14 @@ void NetZoneImpl::getGlobalRoute(routing::NetCard* src, routing::NetCard* dst, if (common_ancestor->getBypassRoute(src, dst, links, latency)) return; - /* If src and dst are in the same AS, life is good */ + /* If src and dst are in the same netzone, life is good */ if (src_ancestor == dst_ancestor) { /* SURF_ROUTING_BASE */ route.link_list = links; common_ancestor->getLocalRoute(src, dst, &route, latency); return; } - /* Not in the same AS, no bypass. We'll have to find our path between the ASes recursively*/ + /* Not in the same netzone, no bypass. We'll have to find our path between the netzones recursively */ route.link_list = new std::vector(); diff --git a/src/kernel/routing/RoutedZone.cpp b/src/kernel/routing/RoutedZone.cpp index eab11d972e..b559691c76 100644 --- a/src/kernel/routing/RoutedZone.cpp +++ b/src/kernel/routing/RoutedZone.cpp @@ -137,7 +137,7 @@ sg_platf_route_cbarg_t RoutedZone::newExtendedRoute(RoutingMode hierarchy, sg_pl result->link_list = new std::vector(); xbt_assert(hierarchy == RoutingMode::base || hierarchy == RoutingMode::recursive, - "The hierarchy of this AS is neither BASIC nor RECURSIVE, I'm lost here."); + "The hierarchy of this netzone is neither BASIC nor RECURSIVE, I'm lost here."); if (hierarchy == RoutingMode::recursive) { xbt_assert(routearg->gw_src && routearg->gw_dst, "nullptr is obviously a deficient gateway"); @@ -165,10 +165,10 @@ void RoutedZone::getRouteCheckParams(NetCard* src, NetCard* dst) NetZone* dst_as = dst->netzone(); xbt_assert(src_as == dst_as, - "Internal error: %s@%s and %s@%s are not in the same AS as expected. Please report that bug.", + "Internal error: %s@%s and %s@%s are not in the same netzone as expected. Please report that bug.", src->cname(), src_as->name(), dst->cname(), dst_as->name()); - xbt_assert(this == dst_as, "Internal error: route destination %s@%s is not in AS %s as expected (route source: " + xbt_assert(this == dst_as, "Internal error: route destination %s@%s is not in netzone %s as expected (route source: " "%s@%s). Please report that bug.", src->cname(), dst->cname(), src_as->name(), dst_as->name(), name()); } @@ -185,20 +185,20 @@ void RoutedZone::addRouteCheckParams(sg_platf_route_cbarg_t route) xbt_assert(dst, "Cannot add a route from %s to %s: %s does not exist.", srcName, dstName, dstName); xbt_assert(!route->link_list->empty(), "Empty route (between %s and %s) forbidden.", srcName, dstName); xbt_assert(!src->isNetZone(), - "When defining a route, src cannot be an AS such as '%s'. Did you meant to have an ASroute?", srcName); + "When defining a route, src cannot be a netzone such as '%s'. Did you meant to have an NetzoneRoute?", srcName); xbt_assert(!dst->isNetZone(), - "When defining a route, dst cannot be an AS such as '%s'. Did you meant to have an ASroute?", dstName); + "When defining a route, dst cannot be a netzone such as '%s'. Did you meant to have an NetzoneRoute?", dstName); } else { - XBT_DEBUG("Load ASroute from %s@%s to %s@%s", srcName, route->gw_src->cname(), dstName, route->gw_dst->cname()); - xbt_assert(src->isNetZone(), "When defining an ASroute, src must be an AS but '%s' is not", srcName); - xbt_assert(dst->isNetZone(), "When defining an ASroute, dst must be an AS but '%s' is not", dstName); + XBT_DEBUG("Load NetzoneRoute from %s@%s to %s@%s", srcName, route->gw_src->cname(), dstName, route->gw_dst->cname()); + xbt_assert(src->isNetZone(), "When defining a NetzoneRoute, src must be a netzone but '%s' is not", srcName); + xbt_assert(dst->isNetZone(), "When defining a NetzoneRoute, dst must be a netzone but '%s' is not", dstName); xbt_assert(route->gw_src->isHost() || route->gw_src->isRouter(), - "When defining an ASroute, gw_src must be an host or a router but '%s' is not.", srcName); + "When defining a NetzoneRoute, gw_src must be an host or a router but '%s' is not.", srcName); xbt_assert(route->gw_dst->isHost() || route->gw_dst->isRouter(), - "When defining an ASroute, gw_dst must be an host or a router but '%s' is not.", dstName); + "When defining a NetzoneRoute, gw_dst must be an host or a router but '%s' is not.", dstName); - xbt_assert(route->gw_src != route->gw_dst, "Cannot define an ASroute from '%s' to itself", route->gw_src->cname()); + xbt_assert(route->gw_src != route->gw_dst, "Cannot define an NetzoneRoute from '%s' to itself", route->gw_src->cname()); xbt_assert(src, "Cannot add a route from %s@%s to %s@%s: %s does not exist.", srcName, route->gw_src->cname(), dstName, route->gw_dst->cname(), srcName); diff --git a/src/kernel/routing/VivaldiZone.cpp b/src/kernel/routing/VivaldiZone.cpp index 25b6e65606..f4d289b508 100644 --- a/src/kernel/routing/VivaldiZone.cpp +++ b/src/kernel/routing/VivaldiZone.cpp @@ -51,7 +51,7 @@ static std::vector* getCoordsFromNetcard(NetCard* nc) { simgrid::kernel::routing::vivaldi::Coords* coords = nc->extension(); xbt_assert(coords, "Please specify the Vivaldi coordinates of %s %s (%p)", - (nc->isNetZone() ? "AS" : (nc->isHost() ? "Host" : "Router")), nc->cname(), nc); + (nc->isNetZone() ? "Netzone" : (nc->isHost() ? "Host" : "Router")), nc->cname(), nc); return &coords->coords; } VivaldiZone::VivaldiZone(NetZone* father, const char* name) : ClusterZone(father, name) @@ -60,7 +60,7 @@ VivaldiZone::VivaldiZone(NetZone* father, const char* name) : ClusterZone(father void VivaldiZone::setPeerLink(NetCard* netcard, double bw_in, double bw_out, const char* coord) { - xbt_assert(netcard->netzone() == this, "Cannot add a peer link to a netcard that is not in this AS"); + xbt_assert(netcard->netzone() == this, "Cannot add a peer link to a netcard that is not in this netzone"); new simgrid::kernel::routing::vivaldi::Coords(netcard, coord);