/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-#include "src/surf/surf_routing_private.hpp"
#include "src/surf/surf_routing_dijkstra.hpp"
#include "src/surf/network_interface.hpp"
namespace surf {
void AsDijkstra::Seal()
{
+ xbt_node_t node = NULL;
+ unsigned int cursor2, cursor;
+
/* Create the topology graph */
if(!routeGraph_)
routeGraph_ = xbt_graph_new_graph(1, NULL);
graphNodeMap_ = xbt_dict_new_homogeneous(&graph_node_map_elem_free);
/* Add the loopback if needed */
- if (routing_platf->loopback_ && hierarchy_ == SURF_ROUTING_BASE)
- addLoopback();
+ if (routing_platf->loopback_ && hierarchy_ == SURF_ROUTING_BASE) {
+ xbt_dynar_foreach(xbt_graph_get_nodes(routeGraph_), cursor, node) {
+ xbt_edge_t edge = NULL;
+
+ bool found = false;
+ xbt_dynar_foreach(xbt_graph_node_get_outedges(node), cursor2, edge) {
+ if (xbt_graph_edge_get_target(edge) == node) {
+ found = true;
+ break;
+ }
+ }
+
+ if (!found) {
+ sg_platf_route_cbarg_t e_route = xbt_new0(s_sg_platf_route_cbarg_t, 1);
+ e_route->link_list = xbt_dynar_new(sizeof(Link*), NULL);
+ xbt_dynar_push(e_route->link_list, &routing_platf->loopback_);
+ xbt_graph_new_edge(routeGraph_, node, node, e_route);
+ }
+ }
+ }
/* initialize graph indexes in nodes after graph has been built */
xbt_dynar_t nodes = xbt_graph_get_nodes(routeGraph_);
- xbt_node_t node = NULL;
- unsigned int cursor2;
- xbt_dynar_foreach(nodes, cursor2, node) {
+ xbt_dynar_foreach(nodes, cursor, node) {
graph_node_data_t data = (graph_node_data_t) xbt_graph_node_get_data(node);
- data->graph_id = cursor2;
+ data->graph_id = cursor;
}
}
elm = xbt_new0(struct graph_node_map_element, 1);
elm->node = node;
- xbt_dict_set_ext(graphNodeMap_, (char *) (&id), sizeof(int),
- (xbt_dictelm_t) elm, NULL);
+ xbt_dict_set_ext(graphNodeMap_, (char *) (&id), sizeof(int), (xbt_dictelm_t) elm, NULL);
return node;
}
graph_node_map_element_t AsDijkstra::nodeMapSearch(int id)
{
- graph_node_map_element_t elm = (graph_node_map_element_t)
- xbt_dict_get_or_null_ext(graphNodeMap_,
- (char *) (&id),
- sizeof(int));
- return elm;
+ return (graph_node_map_element_t)xbt_dict_get_or_null_ext(graphNodeMap_, (char *) (&id), sizeof(int));
}
/* Parsing */
xbt_node_t src = NULL;
xbt_node_t dst = NULL;
- graph_node_map_element_t src_elm = (graph_node_map_element_t)
- xbt_dict_get_or_null_ext(graphNodeMap_,
- (char *) (&src_id),
- sizeof(int));
- graph_node_map_element_t dst_elm = (graph_node_map_element_t)
- xbt_dict_get_or_null_ext(graphNodeMap_,
- (char *) (&dst_id),
- sizeof(int));
-
+ graph_node_map_element_t src_elm = nodeMapSearch(src_id);
+ graph_node_map_element_t dst_elm = nodeMapSearch(dst_id);
if (src_elm)
src = src_elm->node;
xbt_graph_new_edge(routeGraph_, src, dst, e_route);
}
-void AsDijkstra::addLoopback() {
- xbt_dynar_t nodes = xbt_graph_get_nodes(routeGraph_);
-
- xbt_node_t node = NULL;
- unsigned int cursor2;
- xbt_dynar_foreach(nodes, cursor2, node) {
- xbt_dynar_t out_edges = xbt_graph_node_get_outedges(node);
- xbt_edge_t edge = NULL;
- unsigned int cursor;
-
- int found = 0;
- xbt_dynar_foreach(out_edges, cursor, edge) {
- xbt_node_t other_node = xbt_graph_edge_get_target(edge);
- if (other_node == node) {
- found = 1;
- break;
- }
- }
-
- if (!found) {
- sg_platf_route_cbarg_t e_route = xbt_new0(s_sg_platf_route_cbarg_t, 1);
- e_route->link_list = xbt_dynar_new(sizeof(Link*), NULL);
- xbt_dynar_push(e_route->link_list, &routing_platf->loopback_);
- xbt_graph_new_edge(routeGraph_, node, node, e_route);
- }
- }
-}
-
xbt_dynar_t AsDijkstra::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 = xbt_dynar_new(sizeof(Link*),NULL);
- int src,dst;
- NetCard *src_elm, *dst_elm;
int table_size = (int)xbt_dynar_length(vertices_);
- for(src=0; src < table_size; src++) {
- for(dst=0; dst< table_size; dst++) {
+ for(int src=0; src < table_size; src++) {
+ for(int dst=0; dst< table_size; dst++) {
xbt_dynar_reset(route->link_list);
- src_elm = xbt_dynar_get_as(vertices_, src, NetCard*);
- dst_elm = xbt_dynar_get_as(vertices_, dst, NetCard*);
+ 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 (xbt_dynar_length(route->link_list) == 1) {
void AsDijkstra::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t route, double *lat)
{
-
- /* set utils vars */
-
- srcDstCheck(src, dst);
+ getRouteCheckParams(src, dst);
int src_id = src->id();
int dst_id = dst->id();
if (v == dst_node_id)
first_gw = gw_dst;
- if (hierarchy_ == SURF_ROUTING_RECURSIVE && v != dst_node_id
- && strcmp(gw_dst->name(), prev_gw_src->name())) {
+ if (hierarchy_ == SURF_ROUTING_RECURSIVE && v != dst_node_id && strcmp(gw_dst->name(), prev_gw_src->name())) {
xbt_dynar_t e_route_as_to_as=NULL;
routing_platf->getRouteAndLatency(gw_dst_net_elm, prev_gw_src_net_elm, &e_route_as_to_as, NULL);
/* Creation routing model functions */
AsDijkstra::AsDijkstra(const char*name, bool cached)
- : AsGeneric(name)
+ : AsRoutedGraph(name)
{
if (cached)
routeCache_ = xbt_dict_new_homogeneous(&route_cache_elem_free);
}
-void AsDijkstra::parseRoute(sg_platf_route_cbarg_t route)
+void AsDijkstra::addRoute(sg_platf_route_cbarg_t route)
{
- const char *src = route->src;
- const char *dst = route->dst;
- NetCard *src_net_elm = sg_netcard_by_name_or_null(src);
- NetCard *dst_net_elm = sg_netcard_by_name_or_null(dst);
+ 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);
- parseRouteCheckParams(route);
+ addRouteCheckParams(route);
/* Create the topology graph */
if(!routeGraph_)
if(!graphNodeMap_)
graphNodeMap_ = xbt_dict_new_homogeneous(&graph_node_map_elem_free);
+ /* we don't check whether the route already exist, because the algorithm may find another path through some other nodes */
+
+ /* Add the route to the base */
sg_platf_route_cbarg_t e_route = newExtendedRoute(hierarchy_, route, 1);
- newRoute(src_net_elm->id(), dst_net_elm->id(), e_route);
+ newRoute(src->id(), dst->id(), e_route);
// Symmetrical YES
if (route->symmetrical == TRUE) {
if(!route->gw_dst && !route->gw_src)
- XBT_DEBUG("Load Route from \"%s\" to \"%s\"", dst, src);
+ XBT_DEBUG("Load Route from \"%s\" to \"%s\"", dstName, srcName);
else
- XBT_DEBUG("Load ASroute from %s@%s to %s@%s", dst, route->gw_dst->name(), src, route->gw_src->name());
+ XBT_DEBUG("Load ASroute from %s@%s to %s@%s", dstName, route->gw_dst->name(), srcName, route->gw_src->name());
xbt_dynar_t nodes = xbt_graph_get_nodes(routeGraph_);
- xbt_node_t node_s_v = xbt_dynar_get_as(nodes, src_net_elm->id(), xbt_node_t);
- xbt_node_t node_e_v = xbt_dynar_get_as(nodes, dst_net_elm->id(), xbt_node_t);
+ xbt_node_t node_s_v = xbt_dynar_get_as(nodes, src->id(), xbt_node_t);
+ xbt_node_t node_e_v = xbt_dynar_get_as(nodes, dst->id(), xbt_node_t);
xbt_edge_t edge = xbt_graph_get_edge(routeGraph_, node_e_v, node_s_v);
if (edge)
- THROWF(arg_error,0, "Route from %s@%s to %s@%s already exists", dst, route->gw_dst->name(), src, route->gw_src->name());
+ THROWF(arg_error,0, "Route from %s@%s to %s@%s already exists", dstName, route->gw_dst->name(), srcName, route->gw_src->name());
if (route->gw_dst && route->gw_src) {
NetCard *gw_tmp = route->gw_src;
route->gw_dst = gw_tmp;
}
sg_platf_route_cbarg_t link_route_back = newExtendedRoute(hierarchy_, route, 0);
- newRoute(dst_net_elm->id(), src_net_elm->id(), link_route_back);
+ newRoute(dst->id(), src->id(), link_route_back);
}
xbt_dynar_free(&route->link_list);
}
