/* Global vars */
extern routing_global_t global_routing;
-extern routing_component_t current_routing;
-extern model_type_t current_routing_model;
+extern AS_t current_routing;
+extern routing_model_description_t current_routing_model;
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_dijkstra, surf, "Routing part of surf -- dijkstra routing logic");
typedef struct {
- s_routing_component_t generic_routing;
+ s_as_t generic_routing;
xbt_graph_t route_graph; /* xbt_graph */
xbt_dict_t graph_node_map; /* map */
xbt_dict_t route_cache; /* use in cache mode */
int cached;
-} s_routing_component_dijkstra_t, *routing_component_dijkstra_t;
+} s_as_dijkstra_t, *as_dijkstra_t;
typedef struct graph_node_data {
/* Utility functions */
-static xbt_node_t route_graph_new_node(routing_component_dijkstra_t rc,
+static xbt_node_t route_graph_new_node(as_dijkstra_t as,
int id, int graph_id)
{
- routing_component_dijkstra_t routing = (routing_component_dijkstra_t) rc;
xbt_node_t node = NULL;
graph_node_data_t data = NULL;
graph_node_map_element_t elm = NULL;
data = xbt_new0(struct graph_node_data, 1);
data->id = id;
data->graph_id = graph_id;
- node = xbt_graph_new_node(routing->route_graph, data);
+ node = xbt_graph_new_node(as->route_graph, data);
elm = xbt_new0(struct graph_node_map_element, 1);
elm->node = node;
- xbt_dict_set_ext(routing->graph_node_map, (char *) (&id), sizeof(int),
+ xbt_dict_set_ext(as->graph_node_map, (char *) (&id), sizeof(int),
(xbt_set_elm_t) elm, &graph_node_map_elem_free);
return node;
}
static graph_node_map_element_t
-graph_node_map_search(routing_component_dijkstra_t rc, int id)
+graph_node_map_search(as_dijkstra_t as, int id)
{
- routing_component_dijkstra_t routing = (routing_component_dijkstra_t) rc;
graph_node_map_element_t elm = (graph_node_map_element_t)
- xbt_dict_get_or_null_ext(routing->graph_node_map,
+ xbt_dict_get_or_null_ext(as->graph_node_map,
(char *) (&id),
sizeof(int));
return elm;
/* Parsing */
-static void route_new_dijkstra(routing_component_dijkstra_t rc, int src_id,
+static void route_new_dijkstra(as_dijkstra_t as, int src_id,
int dst_id, route_extended_t e_route)
{
- routing_component_dijkstra_t routing = (routing_component_dijkstra_t) rc;
XBT_DEBUG("Load Route from \"%d\" to \"%d\"", src_id, dst_id);
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(routing->graph_node_map,
+ xbt_dict_get_or_null_ext(as->graph_node_map,
(char *) (&src_id),
sizeof(int));
graph_node_map_element_t dst_elm = (graph_node_map_element_t)
- xbt_dict_get_or_null_ext(routing->graph_node_map,
+ xbt_dict_get_or_null_ext(as->graph_node_map,
(char *) (&dst_id),
sizeof(int));
/* add nodes if they don't exist in the graph */
if (src_id == dst_id && src == NULL && dst == NULL) {
- src = route_graph_new_node(rc, src_id, -1);
+ src = route_graph_new_node(as, src_id, -1);
dst = src;
} else {
if (src == NULL) {
- src = route_graph_new_node(rc, src_id, -1);
+ src = route_graph_new_node(as, src_id, -1);
}
if (dst == NULL) {
- dst = route_graph_new_node(rc, dst_id, -1);
+ dst = route_graph_new_node(as, dst_id, -1);
}
}
/* add link as edge to graph */
- xbt_graph_new_edge(routing->route_graph, src, dst, e_route);
+ xbt_graph_new_edge(as->route_graph, src, dst, e_route);
}
-static void add_loopback_dijkstra(routing_component_dijkstra_t rc)
-{
- routing_component_dijkstra_t routing = (routing_component_dijkstra_t) rc;
-
- xbt_dynar_t nodes = xbt_graph_get_nodes(routing->route_graph);
+static void add_loopback_dijkstra(as_dijkstra_t as) {
+ xbt_dynar_t nodes = xbt_graph_get_nodes(as->route_graph);
xbt_node_t node = NULL;
unsigned int cursor2;
xbt_dynar_new(global_routing->size_of_link, NULL);
xbt_dynar_push(e_route->generic_route.link_list,
&global_routing->loopback);
- xbt_graph_new_edge(routing->route_graph, node, node, e_route);
+ xbt_graph_new_edge(as->route_graph, node, node, e_route);
}
}
}
-static route_extended_t dijkstra_get_route(routing_component_t rc,
+static route_extended_t dijkstra_get_route(AS_t as_generic,
const char *src,
const char *dst);
-static xbt_dynar_t dijkstra_get_onelink_routes(routing_component_t rc)
+static xbt_dynar_t dijkstra_get_onelink_routes(AS_t as)
{
// xbt_die("\"dijkstra_get_onelink_routes\" function not implemented yet");
xbt_dynar_t ret = xbt_dynar_new(sizeof(onelink_t), xbt_free);
- routing_component_dijkstra_t routing = (routing_component_dijkstra_t) rc;
//size_t table_size = xbt_dict_length(routing->generic_routing.to_index);
xbt_dict_cursor_t c1 = NULL, c2 = NULL;
char *k1, *d1, *k2, *d2;
- xbt_dict_foreach(routing->generic_routing.to_index, c1, k1, d1) {
- xbt_dict_foreach(routing->generic_routing.to_index, c2, k2, d2) {
- route_extended_t route = dijkstra_get_route(rc, k1, k2);
+ xbt_dict_foreach(as->to_index, c1, k1, d1) {
+ xbt_dict_foreach(as->to_index, c2, k2, d2) {
+ route_extended_t route = dijkstra_get_route(as, k1, k2);
if (route) {
if (xbt_dynar_length(route->generic_route.link_list) == 1) {
void *link =
0);
onelink_t onelink = xbt_new0(s_onelink_t, 1);
onelink->link_ptr = link;
- if (routing->generic_routing.hierarchy == SURF_ROUTING_BASE) {
+ if (as->hierarchy == SURF_ROUTING_BASE) {
onelink->src = xbt_strdup(k1);
onelink->dst = xbt_strdup(k2);
- } else if (routing->generic_routing.hierarchy ==
+ } else if (as->hierarchy ==
SURF_ROUTING_RECURSIVE) {
onelink->src = xbt_strdup(route->src_gateway);
onelink->dst = xbt_strdup(route->dst_gateway);
return ret;
}
-static route_extended_t dijkstra_get_route(routing_component_t rc,
+static route_extended_t dijkstra_get_route(AS_t asg,
const char *src,
const char *dst)
{
- xbt_assert(rc && src
+ xbt_assert(asg && src
&& dst,
"Invalid params for \"get_route\" function at AS \"%s\"",
- rc->name);
+ asg->name);
/* set utils vars */
- routing_component_dijkstra_t routing = (routing_component_dijkstra_t) rc;
+ as_dijkstra_t as = (as_dijkstra_t) asg;
- generic_src_dst_check(rc, src, dst);
- int *src_id = xbt_dict_get_or_null(routing->generic_routing.to_index, src);
- int *dst_id = xbt_dict_get_or_null(routing->generic_routing.to_index, dst);
+ generic_src_dst_check(asg, src, dst);
+ int *src_id = xbt_dict_get_or_null(asg->to_index, src);
+ int *dst_id = xbt_dict_get_or_null(asg->to_index, dst);
xbt_assert(src_id
&& dst_id,
"Ask for route \"from\"(%s) or \"to\"(%s) no found in the local table",
void *link;
xbt_dynar_t links = NULL;
route_cache_element_t elm = NULL;
- xbt_dynar_t nodes = xbt_graph_get_nodes(routing->route_graph);
+ xbt_dynar_t nodes = xbt_graph_get_nodes(as->route_graph);
/* Use the graph_node id mapping set to quickly find the nodes */
graph_node_map_element_t src_elm =
- graph_node_map_search(routing, *src_id);
+ graph_node_map_search(as, *src_id);
graph_node_map_element_t dst_elm =
- graph_node_map_search(routing, *dst_id);
+ graph_node_map_search(as, *dst_id);
xbt_assert(src_elm != NULL
&& dst_elm != NULL, "src %d or dst %d does not exist",
*src_id, *dst_id);
xbt_node_t node_s_v = xbt_dynar_get_as(nodes, src_node_id, xbt_node_t);
xbt_node_t node_e_v = xbt_dynar_get_as(nodes, dst_node_id, xbt_node_t);
xbt_edge_t edge =
- xbt_graph_get_edge(routing->route_graph, node_s_v, node_e_v);
+ xbt_graph_get_edge(as->route_graph, node_s_v, node_e_v);
xbt_assert(edge != NULL, "no route between host %d and %d", *src_id,
*dst_id);
return new_e_route;
}
- if (routing->cached) {
+ if (as->cached) {
/*check if there is a cached predecessor list avail */
elm = (route_cache_element_t)
- xbt_dict_get_or_null_ext(routing->route_cache, (char *) (&src_id),
+ xbt_dict_get_or_null_ext(as->route_cache, (char *) (&src_id),
sizeof(int));
}
xbt_dynar_get_as(nodes, pred_arr[v], xbt_node_t);
xbt_node_t node_v = xbt_dynar_get_as(nodes, v, xbt_node_t);
xbt_edge_t edge =
- xbt_graph_get_edge(routing->route_graph, node_pred_v, node_v);
+ xbt_graph_get_edge(as->route_graph, node_pred_v, node_v);
xbt_assert(edge != NULL, "no route between host %d and %d", *src_id,
*dst_id);
if (v == dst_node_id)
first_gw = gw_dst;
- if (rc->hierarchy == SURF_ROUTING_RECURSIVE && v != dst_node_id
+ if (asg->hierarchy == SURF_ROUTING_RECURSIVE && v != dst_node_id
&& strcmp(gw_dst, prev_gw_src)) {
xbt_dynar_t e_route_as_to_as =
(*(global_routing->get_route)) (gw_dst, prev_gw_src);
size++;
}
- if (rc->hierarchy == SURF_ROUTING_RECURSIVE) {
+ if (asg->hierarchy == SURF_ROUTING_RECURSIVE) {
new_e_route->src_gateway = xbt_strdup(gw_src);
new_e_route->dst_gateway = xbt_strdup(first_gw);
}
- if (routing->cached && elm == NULL) {
+ if (as->cached && elm == NULL) {
/* add to predecessor list of the current src-host to cache */
elm = xbt_new0(struct route_cache_element, 1);
elm->pred_arr = pred_arr;
elm->size = size;
- xbt_dict_set_ext(routing->route_cache, (char *) (&src_id), sizeof(int),
+ xbt_dict_set_ext(as->route_cache, (char *) (&src_id), sizeof(int),
(xbt_set_elm_t) elm, &route_cache_elem_free);
}
- if (!routing->cached)
+ if (!as->cached)
xbt_free(pred_arr);
return new_e_route;
}
-static void dijkstra_finalize(routing_component_t rc)
+static void dijkstra_finalize(AS_t asg)
{
- routing_component_dijkstra_t routing = (routing_component_dijkstra_t) rc;
+ as_dijkstra_t as = (as_dijkstra_t) asg;
- if (routing) {
- xbt_graph_free_graph(routing->route_graph, &xbt_free,
+ if (as) {
+ xbt_graph_free_graph(as->route_graph, &xbt_free,
&graph_edge_data_free, &xbt_free);
- xbt_dict_free(&routing->graph_node_map);
- if (routing->cached)
- xbt_dict_free(&routing->route_cache);
+ xbt_dict_free(&as->graph_node_map);
+ if (as->cached)
+ xbt_dict_free(&as->route_cache);
/* Delete bypass dict */
- xbt_dict_free(&routing->generic_routing.bypassRoutes);
+ xbt_dict_free(&as->generic_routing.bypassRoutes);
/* Delete index dict */
- xbt_dict_free(&(routing->generic_routing.to_index));
+ xbt_dict_free(&(as->generic_routing.to_index));
/* Delete structure */
- xbt_free(routing);
+ xbt_free(as);
}
}
/* Creation routing model functions */
-routing_component_t model_dijkstra_both_create(int cached)
+AS_t model_dijkstra_both_create(int cached)
{
- routing_component_dijkstra_t new_component = (routing_component_dijkstra_t)
- routmod_generic_create(sizeof(s_routing_component_dijkstra_t));
+ as_dijkstra_t new_component = (as_dijkstra_t)
+ routmod_generic_create(sizeof(s_as_dijkstra_t));
- new_component->generic_routing.set_route = model_dijkstra_both_set_route;
- new_component->generic_routing.set_ASroute = model_dijkstra_both_set_route;
+ new_component->generic_routing.parse_route = model_dijkstra_both_parse_route;
+ new_component->generic_routing.parse_ASroute = model_dijkstra_both_parse_route;
new_component->generic_routing.get_route = dijkstra_get_route;
new_component->generic_routing.get_onelink_routes =
dijkstra_get_onelink_routes;
new_component->generic_routing.finalize = dijkstra_finalize;
new_component->cached = cached;
- return (routing_component_t)new_component;
+ return (AS_t)new_component;
}
-routing_component_t model_dijkstra_create(void)
+AS_t model_dijkstra_create(void)
{
return model_dijkstra_both_create(0);
}
-routing_component_t model_dijkstracache_create(void)
+AS_t model_dijkstracache_create(void)
{
return model_dijkstra_both_create(1);
}
void model_dijkstra_both_end(void)
{
- routing_component_dijkstra_t routing =
- (routing_component_dijkstra_t) current_routing;
+ as_dijkstra_t routing =
+ (as_dijkstra_t) current_routing;
xbt_node_t node = NULL;
unsigned int cursor2;
}
}
-void model_dijkstra_both_set_route (routing_component_t rc, const char *src,
- const char *dst, name_route_extended_t route)
+void model_dijkstra_both_parse_route (AS_t asg, const char *src,
+ const char *dst, route_extended_t route)
{
- routing_component_dijkstra_t routing = (routing_component_dijkstra_t) rc;
+ as_dijkstra_t as = (as_dijkstra_t) asg;
int *src_id, *dst_id;
- src_id = xbt_dict_get_or_null(rc->to_index, src);
- dst_id = xbt_dict_get_or_null(rc->to_index, dst);
+ src_id = xbt_dict_get_or_null(asg->to_index, src);
+ dst_id = xbt_dict_get_or_null(asg->to_index, dst);
xbt_assert(src_id, "Network elements %s not found", src);
xbt_assert(dst_id, "Network elements %s not found", dst);
/* Create the topology graph */
- if(!routing->route_graph)
- routing->route_graph = xbt_graph_new_graph(1, NULL);
- if(!routing->graph_node_map)
- routing->graph_node_map = xbt_dict_new();
+ if(!as->route_graph)
+ as->route_graph = xbt_graph_new_graph(1, NULL);
+ if(!as->graph_node_map)
+ as->graph_node_map = xbt_dict_new();
- if (routing->cached && !routing->route_cache)
- routing->route_cache = xbt_dict_new();
+ if (as->cached && !as->route_cache)
+ as->route_cache = xbt_dict_new();
if( A_surfxml_route_symmetrical == A_surfxml_route_symmetrical_YES
|| A_surfxml_ASroute_symmetrical == A_surfxml_ASroute_symmetrical_YES )
route_extended_t e_route =
generic_new_extended_route(current_routing->hierarchy, route, 1);
- route_new_dijkstra(routing, *src_id, *dst_id, e_route);
+ route_new_dijkstra(as, *src_id, *dst_id, e_route);
}
