static xbt_dict_t random_value = NULL;
+/** @brief Retrieve a routing edge from its name
+ *
+ * Routing edges are either CPU/workstation and routers, whatever
+ */
+sg_routing_edge_t sg_routing_edge_by_name_or_null(const char *name) {
+ sg_routing_edge_t net_elm = xbt_lib_get_or_null(host_lib, name, ROUTING_HOST_LEVEL);
+ if(!net_elm) net_elm = xbt_lib_get_or_null(as_router_lib, name, ROUTING_ASR_LEVEL);
+ return net_elm;
+}
+
/* Global vars */
-routing_global_t global_routing = NULL;
+routing_platf_t routing_platf = NULL;
AS_t current_routing = NULL;
/* global parse functions */
*/
static void parse_S_host(sg_platf_host_cbarg_t host)
{
- network_element_t info = NULL;
+ sg_routing_edge_t info = NULL;
if (current_routing->hierarchy == SURF_ROUTING_NULL)
current_routing->hierarchy = SURF_ROUTING_BASE;
xbt_assert(!xbt_lib_get_or_null(host_lib, host->id, ROUTING_HOST_LEVEL),
*/
static void parse_S_router(sg_platf_router_cbarg_t router)
{
- network_element_t info = NULL;
+ sg_routing_edge_t info = NULL;
if (current_routing->hierarchy == SURF_ROUTING_NULL)
current_routing->hierarchy = SURF_ROUTING_BASE;
xbt_assert(!xbt_lib_get_or_null(as_router_lib, router->id, ROUTING_ASR_LEVEL),
*/
static void routing_parse_S_route(void)
{
- if (src != NULL && dst != NULL && parsed_link_list != NULL)
- THROWF(arg_error, 0, "Route between %s to %s can not be defined",
- A_surfxml_route_src, A_surfxml_route_dst);
src = A_surfxml_route_src;
dst = A_surfxml_route_dst;
xbt_assert(strlen(src) > 0 || strlen(dst) > 0,
- "Some limits are null in the route between \"%s\" and \"%s\"",
+ "Missing end-points while defining route \"%s\"->\"%s\"",
src, dst);
parsed_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
}
*/
static void routing_parse_S_ASroute(void)
{
- if (src != NULL && dst != NULL && parsed_link_list != NULL)
- THROWF(arg_error, 0, "Route between %s to %s can not be defined",
- A_surfxml_ASroute_src, A_surfxml_ASroute_dst);
src = A_surfxml_ASroute_src;
dst = A_surfxml_ASroute_dst;
gw_src = A_surfxml_ASroute_gw_src;
gw_dst = A_surfxml_ASroute_gw_dst;
- xbt_assert(strlen(src) > 0 || strlen(dst) > 0 || strlen(gw_src) > 0
- || strlen(gw_dst) > 0,
- "Some limits are null in the route between \"%s\" and \"%s\"",
- src, dst);
+ xbt_assert(strlen(src) > 0 || strlen(dst) > 0 || strlen(gw_src) > 0 || strlen(gw_dst) > 0,
+ "Missing end-points while defining route \"%s\"->\"%s\" (with %s and %s as gateways)",
+ src, dst,gw_src,gw_dst);
parsed_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
}
*/
static void routing_parse_S_bypassRoute(void)
{
- if (src != NULL && dst != NULL && parsed_link_list != NULL)
- THROWF(arg_error, 0,
- "Bypass Route between %s to %s can not be defined",
- A_surfxml_bypassRoute_src, A_surfxml_bypassRoute_dst);
src = A_surfxml_bypassRoute_src;
dst = A_surfxml_bypassRoute_dst;
gw_src = NULL;
gw_dst = NULL;
- xbt_assert(strlen(src) > 0 || strlen(dst) > 0 || strlen(gw_src) > 0
- || strlen(gw_dst) > 0,
- "Some limits are null in the route between \"%s\" and \"%s\"",
- src, dst);
+ xbt_assert(strlen(src) > 0 || strlen(dst) > 0 || strlen(gw_src) > 0 || strlen(gw_dst) > 0,
+ "Missing end-points while defining route \"%s\"->\"%s\" (with %s and %s as gateways)",
+ src, dst,gw_src,gw_dst);
parsed_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
}
*/
static void routing_parse_S_bypassASroute(void)
{
- if (src != NULL && dst != NULL && parsed_link_list != NULL)
- THROWF(arg_error, 0,
- "Bypass AS Route between %s to %s can not be defined",
- A_surfxml_bypassASroute_src, A_surfxml_bypassASroute_dst);
src = A_surfxml_bypassASroute_src;
dst = A_surfxml_bypassASroute_dst;
gw_src = A_surfxml_bypassASroute_gw_src;
gw_dst = A_surfxml_bypassASroute_gw_dst;
- xbt_assert(strlen(src) > 0 || strlen(dst) > 0 || strlen(gw_src) > 0
- || strlen(gw_dst) > 0,
- "Some limits are null in the route between \"%s\" and \"%s\"",
- src, dst);
+ xbt_assert(strlen(src) > 0 || strlen(dst) > 0 || strlen(gw_src) > 0 || strlen(gw_dst) > 0,
+ "Missing end-points while defining route \"%s\"->\"%s\" (with %s and %s as gateways)",
+ src, dst,gw_src,gw_dst);
parsed_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
}
/**
e_route->link_list = parsed_link_list;
if (!strcmp(current_routing->model_desc->name,"RuleBased")) {
- e_route->src_gateway = (network_element_t) gw_src; // DIRTY HACK possible only
- e_route->dst_gateway = (network_element_t) gw_dst; // because of what is in routing_parse_E_ASroute
+ // DIRTY PERL HACK AHEAD: with the rulebased routing, the {src,dst}_gateway fields
+ // store the provided name instead of the entity directly (model_rulebased_parse_ASroute knows)
+ //
+ // This is because the user will provide something like "^AS_(.*)$" instead of the proper name of a given entity
+ e_route->src_gateway = (sg_routing_edge_t) gw_src;
+ e_route->dst_gateway = (sg_routing_edge_t) gw_dst;
} else {
- e_route->src_gateway = xbt_lib_get_or_null(as_router_lib, gw_src,
- ROUTING_ASR_LEVEL);
- if (!e_route->src_gateway)
- e_route->src_gateway = xbt_lib_get_or_null(host_lib, gw_src,
- ROUTING_HOST_LEVEL);
- e_route->dst_gateway = xbt_lib_get_or_null(as_router_lib, gw_dst,
- ROUTING_ASR_LEVEL);
- if (!e_route->dst_gateway)
- e_route->dst_gateway = xbt_lib_get_or_null(host_lib, gw_dst,
- ROUTING_HOST_LEVEL);
+ e_route->src_gateway = sg_routing_edge_by_name_or_null(gw_src);
+ e_route->dst_gateway = sg_routing_edge_by_name_or_null(gw_dst);
}
xbt_assert(current_routing->parse_ASroute,
"no defined method \"set_ASroute\" in \"%s\"",
{
route_t e_route = xbt_new0(s_route_t, 1);
e_route->link_list = parsed_link_list;
- e_route->src_gateway = xbt_lib_get_or_null(as_router_lib, gw_src,
- ROUTING_ASR_LEVEL);
- if (!e_route->src_gateway)
- e_route->src_gateway = xbt_lib_get_or_null(host_lib, gw_src,
- ROUTING_HOST_LEVEL);
- e_route->dst_gateway = xbt_lib_get_or_null(as_router_lib, gw_dst,
- ROUTING_ASR_LEVEL);
- if (!e_route->dst_gateway)
- e_route->dst_gateway = xbt_lib_get_or_null(host_lib, gw_dst,
- ROUTING_HOST_LEVEL);
+ e_route->src_gateway = sg_routing_edge_by_name_or_null(gw_src);
+ e_route->dst_gateway = sg_routing_edge_by_name_or_null(gw_dst);
xbt_assert(current_routing->parse_bypassroute,
"Bypassing mechanism not implemented by routing '%s'",
current_routing->name);
new_as->hierarchy = SURF_ROUTING_NULL;
new_as->name = xbt_strdup(AS_id);
- network_element_t info = NULL;
+ sg_routing_edge_t info = NULL;
info = xbt_new0(s_network_element_t, 1);
- if (current_routing == NULL && global_routing->root == NULL) {
+ if (current_routing == NULL && routing_platf->root == NULL) {
/* it is the first one */
new_as->routing_father = NULL;
- global_routing->root = new_as;
+ routing_platf->root = new_as;
info->id = -1;
- } else if (current_routing != NULL && global_routing->root != NULL) {
+ } else if (current_routing != NULL && routing_platf->root != NULL) {
xbt_assert(!xbt_dict_get_or_null
(current_routing->routing_sons, AS_id),
* Get the common father of the to processing units, and the first different
* father in the chain
*/
-static void elements_father(network_element_t src, network_element_t dst,
+static void elements_father(sg_routing_edge_t src, sg_routing_edge_t dst,
AS_t * res_father,
AS_t * res_src,
AS_t * res_dst)
AS_t father;
/* (1) find the as where the src and dst are located */
- network_element_t src_data = src;
- network_element_t dst_data = dst;
+ sg_routing_edge_t src_data = src;
+ sg_routing_edge_t dst_data = dst;
src_as = src_data->rc_component;
dst_as = dst_data->rc_component;
#ifndef NDEBUG
* This function is called by "get_route" and "get_latency". It allows to walk
* recursively through the ASes tree.
*/
-static void _get_route_and_latency(network_element_t src, network_element_t dst,
+static void _get_route_and_latency(sg_routing_edge_t src, sg_routing_edge_t dst,
xbt_dynar_t * links, double *latency)
{
s_route_t route;
route.link_list = xbt_dynar_new(sizeof(sg_routing_link_t), NULL);
// Find the net_card corresponding to father
- network_element_t src_father_net_elm = src_father->net_elem;
- network_element_t dst_father_net_elm = dst_father->net_elem;
+ sg_routing_edge_t src_father_net_elm = src_father->net_elem;
+ sg_routing_edge_t dst_father_net_elm = dst_father->net_elem;
common_father->get_route_and_latency(common_father, src_father_net_elm, dst_father_net_elm, &route,latency);
xbt_assert((route.src_gateway != NULL) && (route.dst_gateway != NULL),
"bad gateways for route from \"%s\" to \"%s\"", src->name, dst->name);
- network_element_t src_gateway_net_elm = route.src_gateway;
- network_element_t dst_gateway_net_elm = route.dst_gateway;
+ sg_routing_edge_t src_gateway_net_elm = route.src_gateway;
+ sg_routing_edge_t dst_gateway_net_elm = route.dst_gateway;
/* If source gateway is not our source, we have to recursively find our way up to this point */
if (src != src_gateway_net_elm)
* walk through the routing components tree and find a route between hosts
* by calling the differents "get_route" functions in each routing component.
*/
-void routing_get_route_and_latency(network_element_t src,
- network_element_t dst,
+void routing_get_route_and_latency(sg_routing_edge_t src,
+ sg_routing_edge_t dst,
xbt_dynar_t * route, double *latency)
{
XBT_DEBUG("routing_get_route_and_latency from %s to %s",src->name,dst->name);
if (!*route) {
- xbt_dynar_reset(global_routing->last_route);
- *route = global_routing->last_route;
+ xbt_dynar_reset(routing_platf->last_route);
+ *route = routing_platf->last_route;
}
_get_route_and_latency(src, dst, route, latency);
static xbt_dynar_t get_onelink_routes(void)
{
- return recursive_get_onelink_routes(global_routing->root);
+ return recursive_get_onelink_routes(routing_platf->root);
}
e_surf_network_element_type_t routing_get_network_element_type(const char *name)
{
- network_element_t rc = NULL;
-
- rc = xbt_lib_get_or_null(host_lib, name, ROUTING_HOST_LEVEL);
- if (rc)
- return rc->rc_type;
-
- rc = xbt_lib_get_or_null(as_router_lib, name, ROUTING_ASR_LEVEL);
+ sg_routing_edge_t rc = sg_routing_edge_by_name_or_null(name);
if (rc)
return rc->rc_type;
void routing_model_create( void *loopback)
{
/* config the uniq global routing */
- global_routing = xbt_new0(s_routing_global_t, 1);
- global_routing->root = NULL;
- global_routing->get_onelink_routes = get_onelink_routes;
- global_routing->loopback = loopback;
- global_routing->last_route = xbt_dynar_new(sizeof(sg_routing_link_t),NULL);
+ routing_platf = xbt_new0(s_routing_platf_t, 1);
+ routing_platf->root = NULL;
+ routing_platf->get_onelink_routes = get_onelink_routes;
+ routing_platf->loopback = loopback;
+ routing_platf->last_route = xbt_dynar_new(sizeof(sg_routing_link_t),NULL);
/* no current routing at moment */
current_routing = NULL;
}
/** \brief Frees all memory allocated by the routing module */
void routing_exit(void) {
- if (!global_routing)
+ if (!routing_platf)
return;
- xbt_dynar_free(&global_routing->last_route);
- finalize_rec(global_routing->root);
- xbt_free(global_routing);
+ xbt_dynar_free(&routing_platf->last_route);
+ finalize_rec(routing_platf->root);
+ xbt_free(routing_platf);
}
