/* 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. */
/* 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 "simgrid/platf_interface.h" // platform creation API internal interface
#include "surf_routing_private.h"
#include "simgrid/platf_interface.h" // platform creation API internal interface
#include "surf_routing_private.h"
int ROUTING_ASR_LEVEL; //Routing level
int COORD_ASR_LEVEL; //Coordinates level
int NS3_ASR_LEVEL; //host node for ns3
int ROUTING_ASR_LEVEL; //Routing level
int COORD_ASR_LEVEL; //Coordinates level
int NS3_ASR_LEVEL; //host node for ns3
xbt_assert(!xbt_lib_get_or_null(host_lib, host->id, ROUTING_HOST_LEVEL),
"Reading a host, processing unit \"%s\" already exists", host->id);
xbt_assert(!xbt_lib_get_or_null(host_lib, host->id, ROUTING_HOST_LEVEL),
"Reading a host, processing unit \"%s\" already exists", host->id);
info->rc_component = current_routing;
info->rc_type = SURF_NETWORK_ELEMENT_HOST;
info->name = xbt_strdup(host->id);
info->rc_component = current_routing;
info->rc_type = SURF_NETWORK_ELEMENT_HOST;
info->name = xbt_strdup(host->id);
info->rc_component = current_routing;
info->rc_type = SURF_NETWORK_ELEMENT_ROUTER;
info->name = xbt_strdup(router->id);
info->rc_component = current_routing;
info->rc_type = SURF_NETWORK_ELEMENT_ROUTER;
info->name = xbt_strdup(router->id);
xbt_assert(current_routing->parse_route,
"no defined method \"set_route\" in \"%s\"",
current_routing->name);
xbt_assert(current_routing->parse_route,
"no defined method \"set_route\" in \"%s\"",
current_routing->name);
- current_routing->parse_route(current_routing,
- route->src, route->dst, created_route);
- generic_free_route(created_route);
+ current_routing->parse_route(current_routing, route);
- route_t e_route = xbt_new0(s_route_t, 1);
- e_route->link_list = ASroute->link_list;
- e_route->src_gateway = ASroute->gw_src;
- e_route->dst_gateway = ASroute->gw_dst;
-
xbt_assert(current_routing->parse_ASroute,
"no defined method \"set_ASroute\" in \"%s\"",
current_routing->name);
xbt_assert(current_routing->parse_ASroute,
"no defined method \"set_ASroute\" in \"%s\"",
current_routing->name);
- current_routing->parse_ASroute(current_routing, ASroute->src, ASroute->dst, e_route);
- generic_free_route(e_route);
+ current_routing->parse_ASroute(current_routing, ASroute);
xbt_assert(current_routing->parse_bypassroute,
"Bypassing mechanism not implemented by routing '%s'",
current_routing->name);
xbt_assert(current_routing->parse_bypassroute,
"Bypassing mechanism not implemented by routing '%s'",
current_routing->name);
- route_t e_route = xbt_new0(s_route_t, 1);
- e_route->link_list = ASroute->link_list;
- e_route->src_gateway = ASroute->gw_src;
- e_route->dst_gateway = ASroute->gw_dst;
xbt_assert(current_routing->parse_bypassroute,
"Bypassing mechanism not implemented by routing '%s'",
current_routing->name);
xbt_assert(current_routing->parse_bypassroute,
"Bypassing mechanism not implemented by routing '%s'",
current_routing->name);
* @param AS_id name of this autonomous system. Must be unique in the platform
* @param wanted_routing_type one of Full, Floyd, Dijkstra or similar. Full list in the variable routing_models, in src/surf/surf_routing.c
*/
* @param AS_id name of this autonomous system. Must be unique in the platform
* @param wanted_routing_type one of Full, Floyd, Dijkstra or similar. Full list in the variable routing_models, in src/surf/surf_routing.c
*/
{
XBT_DEBUG("routing_AS_begin");
AS_t new_as;
routing_model_description_t model = NULL;
xbt_assert(!xbt_lib_get_or_null
{
XBT_DEBUG("routing_AS_begin");
AS_t new_as;
routing_model_description_t model = NULL;
xbt_assert(!xbt_lib_get_or_null
- (as_router_lib, AS_id, ROUTING_ASR_LEVEL),
- "The AS \"%s\" already exists", AS_id);
+ (as_router_lib, AS->id, ROUTING_ASR_LEVEL),
+ "The AS \"%s\" already exists", AS->id);
+
+ _sg_init_status = 2; /* horrible hack: direct access to the global controlling the level of configuration to prevent any further config */
case A_surfxml_AS_routing_Cluster: model = &routing_models[SURF_MODEL_CLUSTER];break;
case A_surfxml_AS_routing_Dijkstra: model = &routing_models[SURF_MODEL_DIJKSTRA];break;
case A_surfxml_AS_routing_DijkstraCache: model = &routing_models[SURF_MODEL_DIJKSTRACACHE];break;
case A_surfxml_AS_routing_Cluster: model = &routing_models[SURF_MODEL_CLUSTER];break;
case A_surfxml_AS_routing_Dijkstra: model = &routing_models[SURF_MODEL_DIJKSTRA];break;
case A_surfxml_AS_routing_DijkstraCache: model = &routing_models[SURF_MODEL_DIJKSTRACACHE];break;
new_as = (AS_t) model->create();
new_as->model_desc = model;
new_as->hierarchy = SURF_ROUTING_NULL;
new_as = (AS_t) model->create();
new_as->model_desc = model;
new_as->hierarchy = SURF_ROUTING_NULL;
} else if (current_routing != NULL && routing_platf->root != NULL) {
xbt_assert(!xbt_dict_get_or_null
} else if (current_routing != NULL && routing_platf->root != NULL) {
xbt_assert(!xbt_dict_get_or_null
- (current_routing->routing_sons, AS_id),
- "The AS \"%s\" already exists", AS_id);
+ (current_routing->routing_sons, AS->id),
+ "The AS \"%s\" already exists", AS->id);
/* it is a part of the tree */
new_as->routing_father = current_routing;
/* set the father behavior */
if (current_routing->hierarchy == SURF_ROUTING_NULL)
current_routing->hierarchy = SURF_ROUTING_RECURSIVE;
/* add to the sons dictionary */
/* it is a part of the tree */
new_as->routing_father = current_routing;
/* set the father behavior */
if (current_routing->hierarchy == SURF_ROUTING_NULL)
current_routing->hierarchy = SURF_ROUTING_RECURSIVE;
/* add to the sons dictionary */
(void *) new_as, NULL);
/* add to the father element list */
info->id = current_routing->parse_AS(current_routing, (void *) info);
(void *) new_as, NULL);
/* add to the father element list */
info->id = current_routing->parse_AS(current_routing, (void *) info);
- xbt_lib_set(as_router_lib, new_as->name, ROUTING_ASR_LEVEL,
+ xbt_lib_set(as_router_lib, info->name, ROUTING_ASR_LEVEL,
static void _get_route_and_latency(sg_routing_edge_t src, sg_routing_edge_t dst,
xbt_dynar_t * links, double *latency)
{
static void _get_route_and_latency(sg_routing_edge_t src, sg_routing_edge_t dst,
xbt_dynar_t * links, double *latency)
{
/* Find how src and dst are interconnected */
AS_t common_father, src_father, dst_father;
/* Find how src and dst are interconnected */
AS_t common_father, src_father, dst_father;
common_father->name,src_father->name,dst_father->name);
/* Check whether a direct bypass is defined */
common_father->name,src_father->name,dst_father->name);
/* Check whether a direct bypass is defined */
if (common_father->get_bypass_route)
e_route_bypass = common_father->get_bypass_route(common_father, src, dst, latency);
if (common_father->get_bypass_route)
e_route_bypass = common_father->get_bypass_route(common_father, src, dst, latency);
- sg_routing_edge_t src_gateway_net_elm = route.src_gateway;
- sg_routing_edge_t dst_gateway_net_elm = route.dst_gateway;
+ sg_routing_edge_t src_gateway_net_elm = route.gw_src;
+ sg_routing_edge_t dst_gateway_net_elm = route.gw_dst;
/* If source gateway is not our source, we have to recursively find our way up to this point */
if (src != src_gateway_net_elm)
/* If source gateway is not our source, we have to recursively find our way up to this point */
if (src != src_gateway_net_elm)
- sg_platf_new_AS_begin(cluster->id, A_surfxml_AS_routing_Cluster);
+ s_sg_platf_AS_cbarg_t AS = SG_PLATF_AS_INITIALIZER;
+ AS.id = cluster->id;
+ AS.routing = A_surfxml_AS_routing_Cluster;
+ sg_platf_new_AS_begin(&AS);
current_routing->link_up_down_list
= xbt_dynar_new(sizeof(s_surf_parsing_link_up_down_t),NULL);
current_routing->link_up_down_list
= xbt_dynar_new(sizeof(s_surf_parsing_link_up_down_t),NULL);
min = surf_parse_get_double(A_surfxml_random_min);
max = surf_parse_get_double(A_surfxml_random_max);
seed = surf_parse_get_double(A_surfxml_random_seed);
min = surf_parse_get_double(A_surfxml_random_min);
max = surf_parse_get_double(A_surfxml_random_max);
seed = surf_parse_get_double(A_surfxml_random_seed);