X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c851616da164e672fae29b8d80a9d122f1f414a6..808745d358295b6534b2c472b29cffa2b29d1b18:/src/surf/surf_routing.cpp diff --git a/src/surf/surf_routing.cpp b/src/surf/surf_routing.cpp index b09f0e7729..eef8fe46c7 100644 --- a/src/surf/surf_routing.cpp +++ b/src/surf/surf_routing.cpp @@ -37,18 +37,16 @@ namespace surf { xbt_dict_cursor_t cursor = NULL; char *key; AS_t elem; - xbt_dict_foreach(sons_, cursor, key, elem) { + xbt_dict_foreach(children_, cursor, key, elem) { delete (As*)elem; } - xbt_dict_free(&sons_); + xbt_dict_free(&children_); xbt_dynar_free(&vertices_); xbt_dynar_free(&upDownLinks); - if (nullptr != bypassRoutes_) - for (auto &kv : *bypassRoutes_) - delete kv.second; - delete bypassRoutes_; + for (auto &kv : bypassRoutes_) + delete kv.second; xbt_free(name_); delete netcard_; } @@ -57,12 +55,64 @@ namespace surf { sealed_ = true; } + /** @brief Get the common ancestor and its first childs in each line leading to src and dst */ + static void find_common_ancestors(NetCard *src, NetCard *dst, + /* OUT */ As **common_ancestor, As **src_ancestor, As **dst_ancestor) + { + #define ROUTING_HIERARCHY_MAXDEPTH 32 /* increase if it is not enough */ + simgrid::surf::As *path_src[ROUTING_HIERARCHY_MAXDEPTH]; + simgrid::surf::As *path_dst[ROUTING_HIERARCHY_MAXDEPTH]; + int index_src = 0; + int index_dst = 0; + simgrid::surf::As *current_src; + simgrid::surf::As *current_dst; + simgrid::surf::As *father; + + /* (1) find the path to root of src and dst*/ + simgrid::surf::As *src_as = src->containingAS(); + simgrid::surf::As *dst_as = dst->containingAS(); + + xbt_assert(src_as, "Host %s must be in an AS", src->name()); + xbt_assert(dst_as, "Host %s must be in an AS", dst->name()); + + /* (2) find the path to the root routing component */ + for (simgrid::surf::As *current = src_as; current != NULL; current = current->father_) { + xbt_assert(index_src < ROUTING_HIERARCHY_MAXDEPTH, "ROUTING_HIERARCHY_MAXDEPTH should be increased for element %s", src->name()); + path_src[index_src++] = current; + } + for (simgrid::surf::As *current = dst_as; current != NULL; current = current->father_) { + xbt_assert(index_dst < ROUTING_HIERARCHY_MAXDEPTH,"ROUTING_HIERARCHY_MAXDEPTH should be increased for path_dst"); + path_dst[index_dst++] = current; + } + + /* (3) find the common father. + * Before that, index_src and index_dst may be different, they both point to NULL in path_src/path_dst + * So we move them down simultaneously as long as they point to the same content. + */ + do { + current_src = path_src[--index_src]; + current_dst = path_dst[--index_dst]; + } while (index_src > 0 && index_dst > 0 && current_src == current_dst); + + /* (4) if we did not find a difference (index_src or index_dst went to 0), both elements are in the same AS */ + if (current_src == current_dst) + father = current_src; + else // we found a difference + father = path_src[index_src + 1]; + + /* (5) result generation */ + *common_ancestor = father; /* the common father of src and dst */ + *src_ancestor = current_src; /* the first different father of src */ + *dst_ancestor = current_dst; /* the first different father of dst */ + #undef ROUTING_HIERARCHY_MAXDEPTH + } + + xbt_dynar_t As::getOneLinkRoutes() { return NULL; } int As::addComponent(NetCard *elm) { - XBT_DEBUG("Load component \"%s\"", elm->name()); xbt_dynar_push_as(vertices_, NetCard*, elm); return xbt_dynar_length(vertices_)-1; } @@ -71,84 +121,64 @@ namespace surf { xbt_die("AS %s does not accept new routes (wrong class).",name_); } + /* PRECONDITION: this is the common ancestor of src and dst */ std::vector *As::getBypassRoute(NetCard *src, NetCard *dst) { // If never set a bypass route return NULL without any further computations XBT_DEBUG("generic_get_bypassroute from %s to %s", src->name(), dst->name()); - if (bypassRoutes_ == nullptr) + if (bypassRoutes_.empty()) return nullptr; std::vector *bypassedRoute = nullptr; if(dst->containingAS() == this && src->containingAS() == this ){ - char *route_name = bprintf("%s#%s", src->name(), dst->name()); - if (bypassRoutes_->find(route_name) != bypassRoutes_->end()) { - bypassedRoute = bypassRoutes_->at(route_name); + if (bypassRoutes_.find({src->name(),dst->name()}) != bypassRoutes_.end()) { + bypassedRoute = bypassRoutes_.at({src->name(),dst->name()}); XBT_DEBUG("Found a bypass route with %zu links",bypassedRoute->size()); } - free(route_name); return bypassedRoute; } - int index_src, index_dst; - As **current_src = NULL; - As **current_dst = NULL; - - As *src_as = src->containingAS(); - As *dst_as = dst->containingAS(); - /* (2) find the path to the root routing component */ - xbt_dynar_t path_src = xbt_dynar_new(sizeof(As*), NULL); - As *current = src_as; + std::vector path_src; + As *current = src->containingAS(); while (current != NULL) { - xbt_dynar_push(path_src, ¤t); + path_src.push_back(current); current = current->father_; } - xbt_dynar_t path_dst = xbt_dynar_new(sizeof(As*), NULL); - current = dst_as; + + std::vector path_dst; + current = dst->containingAS(); while (current != NULL) { - xbt_dynar_push(path_dst, ¤t); + path_dst.push_back(current); current = current->father_; } /* (3) find the common father */ - index_src = path_src->used - 1; - index_dst = path_dst->used - 1; - current_src = (As **) xbt_dynar_get_ptr(path_src, index_src); - current_dst = (As **) xbt_dynar_get_ptr(path_dst, index_dst); - while (index_src >= 0 && index_dst >= 0 && *current_src == *current_dst) { - xbt_dynar_pop_ptr(path_src); - xbt_dynar_pop_ptr(path_dst); - index_src--; - index_dst--; - current_src = (As **) xbt_dynar_get_ptr(path_src, index_src); - current_dst = (As **) xbt_dynar_get_ptr(path_dst, index_dst); + while (path_src.size() > 1 && path_dst.size() >1 + && path_src.at(path_src.size() -1) == path_dst.at(path_dst.size() -1)) { + path_src.pop_back(); + path_dst.pop_back(); } - int max_index_src = path_src->used - 1; - int max_index_dst = path_dst->used - 1; + int max_index_src = path_src.size() - 1; + int max_index_dst = path_dst.size() - 1; int max_index = std::max(max_index_src, max_index_dst); for (int max = 0; max <= max_index; max++) { for (int i = 0; i < max; i++) { if (i <= max_index_src && max <= max_index_dst) { - char *route_name = bprintf("%s#%s", - (*(As **) (xbt_dynar_get_ptr(path_src, i)))->name_, - (*(As **) (xbt_dynar_get_ptr(path_dst, max)))->name_); - if (bypassRoutes_->find(route_name) != bypassRoutes_->end()) - bypassedRoute = bypassRoutes_->at(route_name); - xbt_free(route_name); + const std::pair key = {path_src.at(i)->name_, path_dst.at(max)->name_}; + if (bypassRoutes_.find(key) != bypassRoutes_.end()) + bypassedRoute = bypassRoutes_.at(key); } if (bypassedRoute) break; if (max <= max_index_src && i <= max_index_dst) { - char *route_name = bprintf("%s#%s", - (*(As **) (xbt_dynar_get_ptr(path_src, max)))->name_, - (*(As **) (xbt_dynar_get_ptr(path_dst, i)))->name_); - if (bypassRoutes_->find(route_name) != bypassRoutes_->end()) - bypassedRoute = bypassRoutes_->at(route_name); - xbt_free(route_name); + const std::pair key = {path_src.at(max)->name_, path_dst.at(i)->name_}; + if (bypassRoutes_.find(key) != bypassRoutes_.end()) + bypassedRoute = bypassRoutes_.at(key); } if (bypassedRoute) break; @@ -158,21 +188,14 @@ namespace surf { break; if (max <= max_index_src && max <= max_index_dst) { - char *route_name = bprintf("%s#%s", - (*(As **) (xbt_dynar_get_ptr(path_src, max)))->name_, - (*(As **) (xbt_dynar_get_ptr(path_dst, max)))->name_); - - if (bypassRoutes_->find(route_name) != bypassRoutes_->end()) - bypassedRoute = bypassRoutes_->at(route_name); - xbt_free(route_name); + const std::pair key = {path_src.at(max)->name_, path_dst.at(max)->name_}; + if (bypassRoutes_.find(key) != bypassRoutes_.end()) + bypassedRoute = bypassRoutes_.at(key); } if (bypassedRoute) break; } - xbt_dynar_free(&path_src); - xbt_dynar_free(&path_dst); - return bypassedRoute; } @@ -180,24 +203,18 @@ namespace surf { const char *src = e_route->src; const char *dst = e_route->dst; - if(bypassRoutes_ == nullptr) - bypassRoutes_ = new std::map*>(); - - char *route_name = bprintf("%s#%s", src, dst); - /* Argument validity checks */ if (e_route->gw_dst) { XBT_DEBUG("Load bypassASroute from %s@%s to %s@%s", src, e_route->gw_src->name(), dst, e_route->gw_dst->name()); xbt_assert(!e_route->link_list->empty(), "Bypass route between %s@%s and %s@%s cannot be empty.", src, e_route->gw_src->name(), dst, e_route->gw_dst->name()); - xbt_assert(bypassRoutes_->find(route_name) == bypassRoutes_->end(), - "The bypass route between %s@%s and %s@%s already exists.", + xbt_assert(bypassRoutes_.find({src,dst}) == bypassRoutes_.end(), "The bypass route between %s@%s and %s@%s already exists.", src, e_route->gw_src->name(), dst, e_route->gw_dst->name()); } else { XBT_DEBUG("Load bypassRoute from %s to %s", src, dst); - xbt_assert(!e_route->link_list->empty(), "Bypass route between %s and %s cannot be empty.", src, dst); - xbt_assert(bypassRoutes_->find(route_name) == bypassRoutes_->end(), "The bypass route between %s and %s already exists.", src, dst); + xbt_assert(!e_route->link_list->empty(), "Bypass route between %s and %s cannot be empty.", src, dst); + xbt_assert(bypassRoutes_.find({src,dst}) == bypassRoutes_.end(), "The bypass route between %s and %s already exists.", src, dst); } /* Build a copy that will be stored in the dict */ @@ -206,8 +223,7 @@ namespace surf { newRoute->push_back(link); /* Store it */ - bypassRoutes_->insert({route_name, newRoute}); - xbt_free(route_name); + bypassRoutes_.insert({{src,dst}, newRoute}); } }} // namespace simgrid::surf @@ -342,7 +358,7 @@ void routing_AS_begin(sg_platf_AS_cbarg_t AS) netcard->setId(-1); } else if (current_routing != NULL && routing_platf->root_ != NULL) { - xbt_assert(!xbt_dict_get_or_null(current_routing->sons_, AS->id), + xbt_assert(!xbt_dict_get_or_null(current_routing->children_, AS->id), "The AS \"%s\" already exists", AS->id); /* it is a part of the tree */ new_as->father_ = current_routing; @@ -350,7 +366,7 @@ void routing_AS_begin(sg_platf_AS_cbarg_t AS) if (current_routing->hierarchy_ == SURF_ROUTING_NULL) current_routing->hierarchy_ = SURF_ROUTING_RECURSIVE; /* add to the sons dictionary */ - xbt_dict_set(current_routing->sons_, AS->id, (void *) new_as, NULL); + xbt_dict_set(current_routing->children_, AS->id, (void *) new_as, NULL); /* add to the father element list */ netcard->setId(current_routing->addComponent(netcard)); } else { @@ -381,92 +397,33 @@ void routing_AS_end() current_routing = current_routing->father_; } -/** - * \brief Get the AS father and the first elements of the chain - * - * \param src the source host name - * \param dst the destination host name - * - * Get the common father of the to processing units, and the first different - * father in the chain - */ -static void elements_father(sg_netcard_t src, sg_netcard_t dst, - AS_t * res_father, AS_t * res_src, AS_t * res_dst) -{ - xbt_assert(src && dst, "bad parameters for \"elements_father\" method"); -#define ROUTING_HIERARCHY_MAXDEPTH 16 /* increase if it is not enough */ - simgrid::surf::As *path_src[ROUTING_HIERARCHY_MAXDEPTH]; - simgrid::surf::As *path_dst[ROUTING_HIERARCHY_MAXDEPTH]; - int index_src = 0; - int index_dst = 0; - simgrid::surf::As *current_src; - simgrid::surf::As *current_dst; - simgrid::surf::As *father; - - /* (1) find the path to root of src and dst*/ - simgrid::surf::As *src_as = src->containingAS(); - simgrid::surf::As *dst_as = dst->containingAS(); - - xbt_assert(src_as, "Host %s must be in an AS", src->name()); - xbt_assert(dst_as, "Host %s must be in an AS", dst->name()); - - /* (2) find the path to the root routing component */ - for (simgrid::surf::As *current = src_as; current != NULL; current = current->father_) { - if (index_src >= ROUTING_HIERARCHY_MAXDEPTH) - xbt_die("ROUTING_HIERARCHY_MAXDEPTH should be increased for element %s", src->name()); - path_src[index_src++] = current; - } - for (simgrid::surf::As *current = dst_as; current != NULL; current = current->father_) { - if (index_dst >= ROUTING_HIERARCHY_MAXDEPTH) - xbt_die("ROUTING_HIERARCHY_MAXDEPTH should be increased for path_dst"); - path_dst[index_dst++] = current; - } - - /* (3) find the common father */ - do { - current_src = path_src[--index_src]; - current_dst = path_dst[--index_dst]; - } while (index_src > 0 && index_dst > 0 && current_src == current_dst); - - /* (4) they are not in the same routing component, make the path */ - if (current_src == current_dst) - father = current_src; - else - father = path_src[index_src + 1]; - - /* (5) result generation */ - *res_father = father; /* first the common father of src and dst */ - *res_src = current_src; /* second the first different father of src */ - *res_dst = current_dst; /* three the first different father of dst */ - -#undef ROUTING_HIERARCHY_MAXDEPTH -} +namespace simgrid { +namespace surf { /** - * \brief Recursive function for get_route_and_latency + * \brief Recursive function for getRouteAndLatency * - * \param src the source host name - * \param dst the destination host name - * \param *route the route where the links are stored. It is either NULL or a ready to use dynar - * \param *latency the latency, if needed + * \param src the source host + * \param dst the destination host + * \param links Where to store the links and the gw information + * \param latency If not NULL, the latency of all links will be added in it */ -static void _get_route_and_latency(simgrid::surf::NetCard *src, simgrid::surf::NetCard *dst, - std::vector * links, double *latency) +void As::getRouteRecursive(NetCard *src, NetCard *dst, + /* OUT */ std::vector * links, double *latency) { - s_sg_platf_route_cbarg_t route = SG_PLATF_ROUTE_INITIALIZER; + s_sg_platf_route_cbarg_t route; memset(&route,0,sizeof(route)); - xbt_assert(src && dst, "bad parameters for \"_get_route_latency\" method"); - XBT_DEBUG("Solve route/latency \"%s\" to \"%s\"", src->name(), dst->name()); + XBT_DEBUG("Solve route/latency \"%s\" to \"%s\"", src->name(), dst->name()); /* Find how src and dst are interconnected */ - simgrid::surf::As *common_father, *src_father, *dst_father; - elements_father(src, dst, &common_father, &src_father, &dst_father); - XBT_DEBUG("elements_father: common father '%s' src_father '%s' dst_father '%s'", - common_father->name_, src_father->name_, dst_father->name_); + simgrid::surf::As *common_ancestor, *src_ancestor, *dst_ancestor; + find_common_ancestors(src, dst, &common_ancestor, &src_ancestor, &dst_ancestor); + XBT_DEBUG("elements_father: common ancestor '%s' src ancestor '%s' dst ancestor '%s'", + common_ancestor->name_, src_ancestor->name_, dst_ancestor->name_); /* Check whether a direct bypass is defined. If so, use it and bail out */ - std::vector *bypassed_route = common_father->getBypassRoute(src, dst); + std::vector *bypassed_route = common_ancestor->getBypassRoute(src, dst); if (nullptr != bypassed_route) { for (Link *link : *bypassed_route) { links->push_back(link); @@ -477,9 +434,9 @@ static void _get_route_and_latency(simgrid::surf::NetCard *src, simgrid::surf::N } /* If src and dst are in the same AS, life is good */ - if (src_father == dst_father) { /* SURF_ROUTING_BASE */ + if (src_ancestor == dst_ancestor) { /* SURF_ROUTING_BASE */ route.link_list = links; - common_father->getRouteAndLatency(src, dst, &route, latency); + common_ancestor->getRouteAndLatency(src, dst, &route, latency); return; } @@ -487,25 +444,22 @@ static void _get_route_and_latency(simgrid::surf::NetCard *src, simgrid::surf::N route.link_list = new std::vector(); - common_father->getRouteAndLatency(src_father->netcard_, dst_father->netcard_, &route, latency); + common_ancestor->getRouteAndLatency(src_ancestor->netcard_, dst_ancestor->netcard_, &route, latency); xbt_assert((route.gw_src != NULL) && (route.gw_dst != NULL), "bad gateways for route from \"%s\" to \"%s\"", src->name(), dst->name()); /* If source gateway is not our source, we have to recursively find our way up to this point */ if (src != route.gw_src) - _get_route_and_latency(src, route.gw_src, links, latency); + getRouteRecursive(src, route.gw_src, links, latency); for (auto 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) - _get_route_and_latency(route.gw_dst, dst, links, latency); + getRouteRecursive(route.gw_dst, dst, links, latency); } -namespace simgrid { -namespace surf { - /** * \brief Find a route between hosts * @@ -524,7 +478,7 @@ void RoutingPlatf::getRouteAndLatency(NetCard *src, NetCard *dst, std::vector
  • name(), dst->name()); - _get_route_and_latency(src, dst, route, latency); + As::getRouteRecursive(src, dst, route, latency); } static xbt_dynar_t _recursiveGetOneLinkRoutes(As *rc) @@ -540,7 +494,7 @@ static xbt_dynar_t _recursiveGetOneLinkRoutes(As *rc) char *key; xbt_dict_cursor_t cursor = NULL; AS_t rc_child; - xbt_dict_foreach(rc->sons_, cursor, key, rc_child) { + xbt_dict_foreach(rc->children_, cursor, key, rc_child) { xbt_dynar_t onelink_child = _recursiveGetOneLinkRoutes(rc_child); if (onelink_child) xbt_dynar_merge(&ret,&onelink_child); @@ -786,7 +740,7 @@ static simgrid::surf::As *surf_AS_recursive_get_by_name(simgrid::surf::As *curre if(!strcmp(current->name_, name)) return current; - xbt_dict_foreach(current->sons_, cursor, key, elem) { + xbt_dict_foreach(current->children_, cursor, key, elem) { tmp = surf_AS_recursive_get_by_name(elem, name); if(tmp != NULL ) { break; @@ -803,9 +757,9 @@ simgrid::surf::As *surf_AS_get_by_name(const char * name) return as; } -xbt_dict_t surf_AS_get_routing_sons(simgrid::surf::As *as) +xbt_dict_t surf_AS_get_children(simgrid::surf::As *as) { - return as->sons_; + return as->children_; } xbt_dynar_t surf_AS_get_hosts(simgrid::surf::As *as)