void routing_route_free(sg_platf_route_cbarg_t route)
{
- xbt_free(route);
+ if (route) {
+ delete route->link_list;
+ xbt_free(route);
+ }
}
namespace simgrid {
-namespace surf {
+namespace routing {
AsRoutedGraph::AsRoutedGraph(const char*name)
: AsImpl(name)
return ret;
ret = xbt_graph_new_node(graph, xbt_strdup(name));
- xbt_dict_set(nodes, name, ret, NULL);
+ xbt_dict_set(nodes, name, ret, nullptr);
return ret;
}
snprintf(name, len, "%s%s", sn, dn);
xbt_edge_t ret = (xbt_edge_t) xbt_dict_get_or_null(edges, name);
- if (ret == NULL) {
+ if (ret == nullptr) {
snprintf(name, len, "%s%s", dn, sn);
ret = (xbt_edge_t) xbt_dict_get_or_null(edges, name);
}
- if (ret == NULL) {
- ret = xbt_graph_new_edge(graph, s, d, NULL);
- xbt_dict_set(edges, name, ret, NULL);
+ if (ret == nullptr) {
+ ret = xbt_graph_new_edge(graph, s, d, nullptr);
+ xbt_dict_set(edges, name, ret, nullptr);
}
free(name);
return ret;
}
namespace simgrid {
-namespace surf {
+namespace routing {
xbt_dynar_t AsRoutedGraph::getOneLinkRoutes()
{
xbt_dynar_t ret = xbt_dynar_new(sizeof(Onelink*), xbt_free_f);
sg_platf_route_cbarg_t route = xbt_new0(s_sg_platf_route_cbarg_t,1);
+ route->link_list = new std::vector<Link*>();
int table_size = (int)xbt_dynar_length(vertices_);
for(int src=0; src < table_size; src++) {
for(int dst=0; dst< table_size; dst++) {
- route->link_list.clear();
+ route->link_list->clear();
NetCard *src_elm = xbt_dynar_get_as(vertices_, src, NetCard*);
NetCard *dst_elm = xbt_dynar_get_as(vertices_, dst, NetCard*);
- this->getRouteAndLatency(src_elm, dst_elm,route, NULL);
+ this->getRouteAndLatency(src_elm, dst_elm,route, nullptr);
- if (route->link_list.size() == 1) {
- Link *link = route->link_list.at(0);
+ if (route->link_list->size() == 1) {
+ Link *link = route->link_list->at(0);
Onelink *onelink;
if (hierarchy_ == RoutingMode::base)
onelink = new Onelink(link, src_elm, dst_elm);
else if (hierarchy_ == RoutingMode::recursive)
onelink = new Onelink(link, route->gw_src, route->gw_dst);
else
- onelink = new Onelink(link, NULL, NULL);
+ onelink = new Onelink(link, nullptr, nullptr);
xbt_dynar_push(ret, &onelink);
}
}
xbt_dynar_get_as(vertices_, dst, NetCard*);
sg_platf_route_cbarg_t route = xbt_new0(s_sg_platf_route_cbarg_t, 1);
+ route->link_list = new std::vector<Link*>();
- getRouteAndLatency(my_src, my_dst, route, NULL);
+ getRouteAndLatency(my_src, my_dst, route, nullptr);
XBT_DEBUG ("get_route_and_latency %s -> %s", my_src->name(), my_dst->name());
previous_name = my_src->name();
}
- for (auto link: route->link_list) {
+ for (auto link: *route->link_list) {
const char *link_name = link->getName();
current = new_xbt_graph_node(graph, link_name, nodes);
current_name = link_name;
new_xbt_graph_edge(graph, previous, current, edges);
XBT_DEBUG (" %s -> %s", previous_name, current_name);
+ delete route->link_list;
xbt_free (route);
}
}
sg_platf_route_cbarg_t result;
result = xbt_new0(s_sg_platf_route_cbarg_t, 1);
+ result->link_list = new std::vector<Link*>();
xbt_assert(hierarchy == RoutingMode::base || hierarchy == RoutingMode::recursive,
"The hierarchy of this AS is neither BASIC nor RECURSIVE, I'm lost here.");
if (hierarchy == RoutingMode::recursive) {
- xbt_assert(routearg->gw_src && routearg->gw_dst, "NULL is obviously a deficient gateway");
+ xbt_assert(routearg->gw_src && routearg->gw_dst, "nullptr is obviously a deficient gateway");
result->gw_src = routearg->gw_src;
result->gw_dst = routearg->gw_dst;
}
- for (auto link : routearg->link_list) {
+ for (auto link : *routearg->link_list) {
if (change_order)
- result->link_list.push_back(link);
+ result->link_list->push_back(link);
else
- result->link_list.insert(result->link_list.begin(), link);
+ result->link_list->insert(result->link_list->begin(), link);
}
return result;
void AsRoutedGraph::getRouteCheckParams(NetCard *src, NetCard *dst)
{
- xbt_assert(src,"Cannot find a route from NULL to %s", dst->name());
- xbt_assert(dst,"Cannot find a route from %s to NULL", src->name());
+ xbt_assert(src,"Cannot find a route from nullptr to %s", dst->name());
+ xbt_assert(dst,"Cannot find a route from %s to nullptr", src->name());
As *src_as = src->containingAS();
As *dst_as = dst->containingAS();
src->name(), dst->name(), src_as->name(), dst_as->name(), name());
}
void AsRoutedGraph::addRouteCheckParams(sg_platf_route_cbarg_t route) {
- const char *srcName = route->src;
- const char *dstName = route->dst;
- NetCard *src = sg_netcard_by_name_or_null(srcName);
- NetCard *dst = sg_netcard_by_name_or_null(dstName);
+ NetCard *src = route->src;
+ NetCard *dst = route->dst;
+ const char *srcName = src->name();
+ const char *dstName = dst->name();
if(!route->gw_dst && !route->gw_src) {
XBT_DEBUG("Load Route from \"%s\" to \"%s\"", srcName, dstName);
xbt_assert(src, "Cannot add a route from %s to %s: %s does not exist.", srcName, dstName, srcName);
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(! route->link_list->empty(), "Empty route (between %s and %s) forbidden.", srcName, dstName);
xbt_assert(! src->isAS(), "When defining a route, src cannot be an AS such as '%s'. Did you meant to have an ASroute?", srcName);
xbt_assert(! dst->isAS(), "When defining a route, dst cannot be an AS such as '%s'. Did you meant to have an ASroute?", dstName);
} else {
srcName,route->gw_src->name(), dstName,route->gw_dst->name(), srcName);
xbt_assert(dst, "Cannot add a route from %s@%s to %s@%s: %s does not exist.",
srcName,route->gw_src->name(), dstName,route->gw_dst->name(), dstName);
- xbt_assert(! route->link_list.empty(), "Empty route (between %s@%s and %s@%s) forbidden.",
+ xbt_assert(! route->link_list->empty(), "Empty route (between %s@%s and %s@%s) forbidden.",
srcName,route->gw_src->name(), dstName,route->gw_dst->name());
}
}
