-/* Copyright (c) 2009, 2010, 2011. The SimGrid Team.
+/* Copyright (c) 2009-2013. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
#include "surf_routing_private.h"
/* Global vars */
-extern routing_global_t global_routing;
+extern routing_platf_t routing_platf;
extern int surf_parse_lineno;
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_full, surf, "Routing part of surf");
typedef struct s_routing_component_full {
s_as_t generic_routing;
- route_t *routing_table;
+ sg_platf_route_cbarg_t *routing_table;
} s_routing_component_full_t, *routing_component_full_t;
/* Business methods */
for(src=0; src < table_size; src++) {
for(dst=0; dst< table_size; dst++) {
- route_t route = TO_ROUTE_FULL(src, dst);
+ sg_platf_route_cbarg_t route = TO_ROUTE_FULL(src, dst);
if (route) {
if (xbt_dynar_length(route->link_list) == 1) {
void *link = *(void **) xbt_dynar_get_ptr(route->link_list, 0);
onelink->dst = xbt_dynar_get_as(rc->index_network_elm,dst,sg_routing_edge_t);
onelink->dst->id = dst;
} else if (rc->hierarchy == SURF_ROUTING_RECURSIVE) {
- onelink->src = route->src_gateway;
- onelink->dst = route->dst_gateway;
+ onelink->src = route->gw_src;
+ onelink->dst = route->gw_dst;
}
xbt_dynar_push(ret, &onelink);
XBT_DEBUG("Push route from '%d' to '%d'",
static void full_get_route_and_latency(AS_t rc,
sg_routing_edge_t src, sg_routing_edge_t dst,
- route_t res, double *lat)
+ sg_platf_route_cbarg_t res, double *lat)
{
XBT_DEBUG("full_get_route_and_latency from %s[%d] to %s[%d]",
src->name,
routing_component_full_t routing = (routing_component_full_t) rc;
size_t table_size = xbt_dynar_length(routing->generic_routing.index_network_elm);
- route_t e_route = NULL;
+ sg_platf_route_cbarg_t e_route = NULL;
void *link;
unsigned int cpt = 0;
e_route = TO_ROUTE_FULL(src->id, dst->id);
if (e_route) {
- res->src_gateway = e_route->src_gateway;
- res->dst_gateway = e_route->dst_gateway;
+ res->gw_src = e_route->gw_src;
+ res->gw_dst = e_route->gw_dst;
xbt_dynar_foreach(e_route->link_list, cpt, link) {
xbt_dynar_push(res->link_list, &link);
if (lat)
new_component->generic_routing.parse_ASroute = model_full_set_route;
new_component->generic_routing.get_route_and_latency =
full_get_route_and_latency;
+ new_component->generic_routing.get_graph = generic_get_graph;
+
new_component->generic_routing.get_onelink_routes = full_get_onelink_routes;
new_component->generic_routing.finalize = full_finalize;
void model_full_end(AS_t current_routing)
{
unsigned int i;
- route_t e_route;
+ sg_platf_route_cbarg_t e_route;
/* set utils vars */
routing_component_full_t routing =
/* Create table if necessary */
if (!routing->routing_table)
- routing->routing_table = xbt_new0(route_t, table_size * table_size);
+ routing->routing_table = xbt_new0(sg_platf_route_cbarg_t, table_size * table_size);
/* Add the loopback if needed */
- if (global_routing->loopback && current_routing->hierarchy == SURF_ROUTING_BASE) {
+ if (routing_platf->loopback && current_routing->hierarchy == SURF_ROUTING_BASE) {
for (i = 0; i < table_size; i++) {
e_route = TO_ROUTE_FULL(i, i);
if (!e_route) {
- e_route = xbt_new0(s_route_t, 1);
- e_route->src_gateway = NULL;
- e_route->dst_gateway = NULL;
+ e_route = xbt_new0(s_sg_platf_route_cbarg_t, 1);
+ e_route->gw_src = NULL;
+ e_route->gw_dst = NULL;
e_route->link_list = xbt_dynar_new(sizeof(sg_routing_link_t), NULL);
- xbt_dynar_push(e_route->link_list, &global_routing->loopback);
+ xbt_dynar_push(e_route->link_list, &routing_platf->loopback);
TO_ROUTE_FULL(i, i) = e_route;
}
}
return a != b;
}
-void model_full_set_route(AS_t rc, const char *src,
- const char *dst, route_t route)
+void model_full_set_route(AS_t rc, sg_platf_route_cbarg_t route)
{
- sg_routing_edge_t src_net_elm, dst_net_elm;
int as_route = 0;
- src_net_elm = xbt_lib_get_or_null(host_lib, src, ROUTING_HOST_LEVEL);
- dst_net_elm = xbt_lib_get_or_null(host_lib, dst, ROUTING_HOST_LEVEL);
- if (!src_net_elm)
- src_net_elm = xbt_lib_get_or_null(as_router_lib, src, ROUTING_ASR_LEVEL);
- if (!dst_net_elm)
- dst_net_elm = xbt_lib_get_or_null(as_router_lib, dst, ROUTING_ASR_LEVEL);
+ char *src = (char*)(route->src);
+ char *dst = (char*)(route->dst);
+ sg_routing_edge_t src_net_elm, dst_net_elm;
+ src_net_elm = sg_routing_edge_by_name_or_null(src);
+ dst_net_elm = sg_routing_edge_by_name_or_null(dst);
xbt_assert(src_net_elm, "Network elements %s not found", src);
xbt_assert(dst_net_elm, "Network elements %s not found", dst);
src, dst);
if (!routing->routing_table)
- routing->routing_table = xbt_new0(route_t, table_size * table_size);
+ routing->routing_table = xbt_new0(sg_platf_route_cbarg_t, table_size * table_size);
if (TO_ROUTE_FULL(src_net_elm->id, dst_net_elm->id)) {
char *link_name;
"between \"%s\" and \"%s\"", src, dst);
}
} else {
- if (!route->dst_gateway && !route->src_gateway)
+ if (!route->gw_dst && !route->gw_dst)
XBT_DEBUG("Load Route from \"%s\" to \"%s\"", src, dst);
else {
- // FIXME We can call a gw wich is down the current AS (cf g5k.xml) but not upper.
+ // FIXME We can call a gw which is down the current AS (cf g5k.xml) but not upper.
// AS_t subas = xbt_dict_get_or_null(rc->routing_sons, src);
// if (subas == NULL)
// surf_parse_error("The source of an ASroute must be a sub-AS "
// route->dst_gateway, subas->name);
as_route = 1;
XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"",
- src, route->src_gateway->name, dst, route->dst_gateway->name);
- if (route->dst_gateway->rc_type == SURF_NETWORK_ELEMENT_NULL)
- xbt_die("The dst_gateway '%s' does not exist!", route->dst_gateway->name);
- if (route->src_gateway->rc_type == SURF_NETWORK_ELEMENT_NULL)
- xbt_die("The src_gateway '%s' does not exist!", route->src_gateway->name);
+ src, route->gw_src->name, dst, route->gw_dst->name);
+ if (route->gw_dst->rc_type == SURF_NETWORK_ELEMENT_NULL)
+ xbt_die("The dst_gateway '%s' does not exist!", route->gw_dst->name);
+ if (route->gw_src->rc_type == SURF_NETWORK_ELEMENT_NULL)
+ xbt_die("The src_gateway '%s' does not exist!", route->gw_src->name);
}
TO_ROUTE_FULL(src_net_elm->id, dst_net_elm->id) =
generic_new_extended_route(rc->hierarchy, route, 1);
xbt_dynar_shrink(TO_ROUTE_FULL(src_net_elm->id, dst_net_elm->id)->link_list, 0);
}
- if ( (A_surfxml_route_symmetrical == A_surfxml_route_symmetrical_YES && as_route == 0)
- || (A_surfxml_ASroute_symmetrical == A_surfxml_ASroute_symmetrical_YES && as_route == 1)
+ if ( (route->symmetrical == TRUE && as_route == 0)
+ || (route->symmetrical == TRUE && as_route == 1)
) {
- if (route->dst_gateway && route->src_gateway) {
+ if (route->gw_dst && route->gw_src) {
sg_routing_edge_t gw_tmp;
- gw_tmp = route->src_gateway;
- route->src_gateway = route->dst_gateway;
- route->dst_gateway = gw_tmp;
+ gw_tmp = route->gw_src;
+ route->gw_src = route->gw_dst;
+ route->gw_dst = gw_tmp;
}
if (TO_ROUTE_FULL(dst_net_elm->id, src_net_elm->id)) {
char *link_name;
"The route between \"%s\" and \"%s\" already exists", src,
dst);
} else {
- if (!route->dst_gateway && !route->src_gateway)
+ if (!route->gw_dst && !route->gw_src)
XBT_DEBUG("Load Route from \"%s\" to \"%s\"", dst, src);
else
XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"",
- dst, route->src_gateway->name, src, route->dst_gateway->name);
+ dst, route->gw_src->name, src, route->gw_dst->name);
TO_ROUTE_FULL(dst_net_elm->id, src_net_elm->id) =
generic_new_extended_route(rc->hierarchy, route, 0);
xbt_dynar_shrink(TO_ROUTE_FULL(dst_net_elm->id, src_net_elm->id)->link_list, 0);
}
}
+ xbt_dynar_free(&route->link_list);
}