#include "xbt/dynar.h"
#include "xbt/graph.h"
-#include "surf_routing_private.hpp"
#include "network_interface.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_routing_generic, surf_route, "Generic implementation of the surf routing");
void routing_route_free(sg_platf_route_cbarg_t route)
{
if (route) {
- xbt_dynar_free(&route->link_list);
+ delete route->link_list;
xbt_free(route);
}
}
namespace surf {
AsRoutedGraph::AsRoutedGraph(const char*name)
- : As(name)
+ : AsImpl(name)
{
}
return str;
}
-xbt_node_t new_xbt_graph_node(xbt_graph_t graph, const char *name,
- xbt_dict_t nodes)
+xbt_node_t new_xbt_graph_node(xbt_graph_t graph, const char *name, xbt_dict_t nodes)
{
xbt_node_t ret = (xbt_node_t) xbt_dict_get_or_null(nodes, name);
if (ret)
return ret;
}
-xbt_edge_t new_xbt_graph_edge(xbt_graph_t graph, xbt_node_t s, xbt_node_t d,
- xbt_dict_t edges)
+xbt_edge_t new_xbt_graph_edge(xbt_graph_t graph, xbt_node_t s, xbt_node_t d, xbt_dict_t edges)
{
- xbt_edge_t ret;
-
const char *sn = instr_node_name(s);
const char *dn = instr_node_name(d);
int len = strlen(sn) + strlen(dn) + 1;
snprintf(name, len, "%s%s", sn, dn);
- ret = (xbt_edge_t) xbt_dict_get_or_null(edges, name);
+ xbt_edge_t ret = (xbt_edge_t) xbt_dict_get_or_null(edges, name);
if (ret == NULL) {
snprintf(name, len, "%s%s", dn, sn);
ret = (xbt_edge_t) xbt_dict_get_or_null(edges, name);
namespace simgrid {
namespace surf {
+ 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();
+ 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);
+
+ if (route->link_list->size() == 1) {
+ Link *link = route->link_list->at(0);
+ Onelink *onelink;
+ if (hierarchy_ == AsImpl::ROUTING_BASE)
+ onelink = new Onelink(link, src_elm, dst_elm);
+ else if (hierarchy_ == AsImpl::ROUTING_RECURSIVE)
+ onelink = new Onelink(link, route->gw_src, route->gw_dst);
+ else
+ onelink = new Onelink(link, NULL, NULL);
+ xbt_dynar_push(ret, &onelink);
+ }
+ }
+ }
+ return ret;
+ }
+
void AsRoutedGraph::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges)
{
int src, dst;
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 = xbt_dynar_new(sizeof(Link*), NULL);
+ route->link_list = new std::vector<Link*>();
getRouteAndLatency(my_src, my_dst, route, NULL);
XBT_DEBUG ("get_route_and_latency %s -> %s", my_src->name(), my_dst->name());
- unsigned int cpt;
- void *link;
-
xbt_node_t current, previous;
const char *previous_name, *current_name;
previous_name = my_src->name();
}
- xbt_dynar_foreach(route->link_list, cpt, link) {
- const char *link_name = static_cast<simgrid::surf::Resource*>(
- link)->getName();
+ 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);
new_xbt_graph_edge(graph, previous, current, edges);
XBT_DEBUG (" %s -> %s", previous_name, current_name);
- xbt_dynar_free (&(route->link_list));
+ delete route->link_list;
xbt_free (route);
}
}
/* ************************************************************************** */
/* ************************* GENERIC AUX FUNCTIONS ************************** */
/* change a route containing link names into a route containing link entities */
-sg_platf_route_cbarg_t AsRoutedGraph::newExtendedRoute(e_surf_routing_hierarchy_t hierarchy,
- sg_platf_route_cbarg_t routearg, int change_order) {
+sg_platf_route_cbarg_t AsRoutedGraph::newExtendedRoute(AsImpl::RoutingKind hierarchy,
+ sg_platf_route_cbarg_t routearg, int change_order)
+{
sg_platf_route_cbarg_t result;
- char *link_name;
- unsigned int cpt;
result = xbt_new0(s_sg_platf_route_cbarg_t, 1);
- result->link_list = xbt_dynar_new(sizeof(Link*), NULL);
+ result->link_list = new std::vector<Link*>();
- xbt_assert(hierarchy == SURF_ROUTING_BASE
- || hierarchy == SURF_ROUTING_RECURSIVE,
+ xbt_assert(hierarchy == AsImpl::ROUTING_BASE || hierarchy == AsImpl::ROUTING_RECURSIVE,
"The hierarchy of this AS is neither BASIC nor RECURSIVE, I'm lost here.");
- if (hierarchy == SURF_ROUTING_RECURSIVE) {
-
+ if (hierarchy == AsImpl::ROUTING_RECURSIVE) {
xbt_assert(routearg->gw_src && routearg->gw_dst, "NULL is obviously a deficient gateway");
- /* remember not erase the gateway names */
result->gw_src = routearg->gw_src;
result->gw_dst = routearg->gw_dst;
}
- xbt_dynar_foreach(routearg->link_list, cpt, link_name) {
-
- Link *link = Link::byName(link_name);
- if (link) {
- if (change_order)
- xbt_dynar_push(result->link_list, &link);
- else
- xbt_dynar_unshift(result->link_list, &link);
- } else
- THROWF(mismatch_error, 0, "Link '%s' not found", link_name);
+ for (auto link : *routearg->link_list) {
+ if (change_order)
+ result->link_list->push_back(link);
+ else
+ result->link_list->insert(result->link_list->begin(), link);
}
return result;
As *dst_as = dst->containingAS();
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.",
- src->name(), src_as->name_, dst->name(), dst_as->name_);
+ src->name(), src_as->name(), dst->name(), dst_as->name());
xbt_assert(this == dst_as,
"Internal error: route destination %s@%s is not in AS %s as expected (route source: %s@%s). Please report that bug.",
- src->name(), dst->name(), src_as->name_, dst_as->name_, name_);
+ 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;
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(!xbt_dynar_is_empty(route->link_list), "Empty route (between %s and %s) forbidden.", srcName, dstName);
- xbt_assert(src->getRcType()==SURF_NETWORK_ELEMENT_HOST || src->getRcType()==SURF_NETWORK_ELEMENT_ROUTER,
- "When defining a route, src must be an host or a router but '%s' is not. Did you meant to have an ASroute?", srcName);
- xbt_assert(dst->getRcType()==SURF_NETWORK_ELEMENT_HOST || dst->getRcType()==SURF_NETWORK_ELEMENT_ROUTER,
- "When defining a route, dst must be an host or a router but '%s' is not. Did you meant to have an ASroute?", 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 {
XBT_DEBUG("Load ASroute from %s@%s to %s@%s", srcName, route->gw_src->name(), dstName, route->gw_dst->name());
- xbt_assert(src->getRcType()==SURF_NETWORK_ELEMENT_AS,
- "When defining an ASroute, src must be an AS but '%s' is not", srcName);
- xbt_assert(dst->getRcType()==SURF_NETWORK_ELEMENT_AS,
- "When defining an ASroute, dst must be an AS but '%s' is not", dstName);
+ xbt_assert(src->isAS(), "When defining an ASroute, src must be an AS but '%s' is not", srcName);
+ xbt_assert(dst->isAS(), "When defining an ASroute, dst must be an AS but '%s' is not", dstName);
- xbt_assert(route->gw_src->getRcType()==SURF_NETWORK_ELEMENT_HOST || route->gw_src->getRcType()==SURF_NETWORK_ELEMENT_ROUTER,
+ 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);
- xbt_assert(route->gw_dst->getRcType()==SURF_NETWORK_ELEMENT_HOST || route->gw_dst->getRcType()==SURF_NETWORK_ELEMENT_ROUTER,
+ 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);
xbt_assert(route->gw_src != route->gw_dst, "Cannot define an ASroute from '%s' to itself", route->gw_src->name());
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(!xbt_dynar_is_empty(route->link_list), "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());
}
}
