*/
void routing_AS_begin(const char *AS_id, const char *wanted_routing_type)
{
- AS_t new_routing;
+ AS_t new_as;
routing_model_description_t model = NULL;
int cpt;
}
/* make a new routing component */
- new_routing = (AS_t) (*(model->create)) ();
- new_routing->routing = model;
- new_routing->hierarchy = SURF_ROUTING_NULL;
- new_routing->name = xbt_strdup(AS_id);
- new_routing->routing_sons = xbt_dict_new();
+ new_as = (AS_t) (*(model->create)) ();
+ new_as->model_desc = model;
+ new_as->hierarchy = SURF_ROUTING_NULL;
+ new_as->name = xbt_strdup(AS_id);
+ new_as->routing_sons = xbt_dict_new();
if (current_routing == NULL && global_routing->root == NULL) {
/* it is the first one */
- new_routing->routing_father = NULL;
- global_routing->root = new_routing;
+ new_as->routing_father = NULL;
+ global_routing->root = new_as;
} else if (current_routing != NULL && global_routing->root != NULL) {
(current_routing->routing_sons, AS_id),
"The AS \"%s\" already exists", AS_id);
/* it is a part of the tree */
- new_routing->routing_father = current_routing;
+ 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 */
xbt_dict_set(current_routing->routing_sons, AS_id,
- (void *) new_routing, NULL);
+ (void *) new_as, NULL);
/* add to the father element list */
(*(current_routing->parse_AS)) (current_routing, AS_id);
} else {
THROWF(arg_error, 0, "All defined components must be belong to a AS");
}
/* set the new current component of the tree */
- current_routing = new_routing;
+ current_routing = new_as;
}
/**
xbt_lib_set(as_router_lib, current_routing->name, ROUTING_ASR_LEVEL,
(void *) info);
- if (current_routing->routing->end)
- (*(current_routing->routing->end)) (current_routing);
+ if (current_routing->model_desc->end)
+ (*(current_routing->model_desc->end)) (current_routing);
current_routing = current_routing->routing_father;
}
}
static void get_route_latency(const char *src, const char *dst,
xbt_dynar_t * route, double *latency, int cleanup)
{
+ static xbt_dynar_t last_route = NULL;
+
_get_route_latency(src, dst, route, latency);
xbt_assert(!route || *route, "no route between \"%s\" and \"%s\"", src, dst);
xbt_assert(!latency || *latency >= 0.0,
"latency error on route between \"%s\" and \"%s\"", src, dst);
if (route) {
- xbt_dynar_free(&global_routing->last_route);
- global_routing->last_route = cleanup ? *route : NULL;
+ xbt_dynar_free(&last_route);
+ last_route = cleanup ? *route : NULL;
}
}
return route;
}
-/**
- * \brief Generic method: find a route between hosts
- *
- * \param src the source host name
- * \param dst the destination host name
- *
- * same as get_route, but return NULL if any exception is raised.
- */
-static xbt_dynar_t get_route_or_null(const char *src, const char *dst)
-{
- xbt_dynar_t route = NULL;
- xbt_ex_t exception;
- TRY {
- get_route_latency(src, dst, &route, NULL, 1);
- } CATCH(exception) {
- xbt_ex_free(exception);
- return NULL;
- }
- return route;
-}
-
/**
* \brief Generic method: find a route between hosts
*
return route;
}
-static double get_latency(const char *src, const char *dst) {
- double latency = -1.0;
- get_route_latency(src, dst, NULL, &latency, 0);
- return latency;
-}
-
-
static xbt_dynar_t recursive_get_onelink_routes(AS_t rc)
{
xbt_dynar_t ret = xbt_dynar_new(sizeof(onelink_t), xbt_free);
return recursive_get_onelink_routes(global_routing->root);
}
-e_surf_network_element_type_t get_network_element_type(const char *name)
+e_surf_network_element_type_t routing_get_network_element_type(const char *name)
{
network_element_info_t rc = NULL;
/* config the uniq global routing */
global_routing = xbt_new0(s_routing_global_t, 1);
global_routing->root = NULL;
- global_routing->get_route_or_null = get_route_or_null;
- global_routing->get_latency = get_latency;
global_routing->get_route_no_cleanup = get_route_no_cleanup;
global_routing->get_onelink_routes = get_onelink_routes;
global_routing->get_route_latency = get_route_latency;
- global_routing->get_network_element_type = get_network_element_type;
global_routing->loopback = loopback;
global_routing->size_of_link = size_of_links;
- global_routing->last_route = NULL;
/* no current routing at moment */
current_routing = NULL;
}
if (!global_routing)
return;
finalize_rec(global_routing->root);
- xbt_dynar_free(&global_routing->last_route);
xbt_free(global_routing);
}