std::vector<Link*> *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<As*> 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<As*> 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<std::string, std::string> 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<std::string, std::string> key = {path_src.at(max)->name_, path_dst.at(i)->name_};
+ if (bypassRoutes_.find(key) != bypassRoutes_.end())
+ bypassedRoute = bypassRoutes_.at(key);
}
if (bypassedRoute)
break;
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<std::string, std::string> 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;
}
const char *src = e_route->src;
const char *dst = e_route->dst;
- 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 */
newRoute->push_back(link);
/* Store it */
- bypassRoutes_.insert({route_name, newRoute});
- xbt_free(route_name);
+ bypassRoutes_.insert({{src,dst}, newRoute});
}
}} // namespace simgrid::surf
