static void model_full_load(void); /* load parse functions for full routing model */
static void model_full_unload(void); /* unload parse functions for full routing model */
static void model_full_end(void); /* finalize the creation of full routing model */
+static void model_full_set_route( /* Set the route and ASroute between src and dst */
+ routing_component_t rc, const char *src, const char *dst, name_route_extended_t route);
static void *model_floyd_create(void); /* create structures for floyd routing model */
static void model_floyd_load(void); /* load parse functions for floyd routing model */
static void model_floyd_unload(void); /* unload parse functions for floyd routing model */
static void model_floyd_end(void); /* finalize the creation of floyd routing model */
+static void model_floyd_set_route(routing_component_t rc, const char *src,
+ const char *dst, name_route_extended_t route);
static void *model_dijkstra_both_create(int cached); /* create by calling dijkstra or dijkstracache */
static void *model_dijkstra_create(void); /* create structures for dijkstra routing model */
static void model_dijkstra_both_load(void); /* load parse functions for dijkstra routing model */
static void model_dijkstra_both_unload(void); /* unload parse functions for dijkstra routing model */
static void model_dijkstra_both_end(void); /* finalize the creation of dijkstra routing model */
+static void model_dijkstra_both_set_route (routing_component_t rc, const char *src,
+ const char *dst, name_route_extended_t route);
static void *model_rulebased_create(void); /* create structures for rulebased routing model */
static void model_rulebased_load(void); /* load parse functions for rulebased routing model */
static void model_none_unload(void); /* none routing model */
static void model_none_end(void); /* none routing model */
-static void routing_full_parse_Scluster(void); /*cluster bypass */
+static void routing_parse_Scluster(void); /*cluster bypass */
-static void parse_Sconfig(void); /*config Tag */
+static void routing_parse_Sconfig(void); /*config Tag */
+static void routing_parse_Econfig(void); /*config Tag */
/* this lines are only for replace use like index in the model table */
typedef enum {
const char *name);
static void generic_set_autonomous_system(routing_component_t rc,
const char *name);
-static void generic_set_route(routing_component_t rc, const char *src,
- const char *dst, route_t route);
-static void generic_set_ASroute(routing_component_t rc, const char *src,
- const char *dst, route_extended_t e_route);
static void generic_set_bypassroute(routing_component_t rc,
const char *src, const char *dst,
route_extended_t e_route);
+static int surf_link_resource_cmp(const void *a, const void *b);
+static int surf_pointer_resource_cmp(const void *a, const void *b);
+
/* ************************************************************************** */
/* *************** GENERIC BUSINESS METHODS (declarations) ****************** */
static char *gw_src = NULL; /* temporary store the gateway source name of a route */
static char *gw_dst = NULL; /* temporary store the gateway destination name of a route */
static xbt_dynar_t link_list = NULL; /* temporary store of current list link of a route */
-
/**
* \brief Add a "host" to the network element list
*/
parse_S_host(host_id);
}
-/*
- *
- */
/**
* \brief Add a "router" to the network element list
*/
static void parse_E_route_store_route(void)
{
- route_t route = xbt_new0(s_route_t, 1);
- route->link_list = link_list;
-// xbt_assert1(generic_processing_units_exist(current_routing,src),"the \"%s\" processing units gateway does not exist",src);
-// xbt_assert1(generic_processing_units_exist(current_routing,dst),"the \"%s\" processing units gateway does not exist",dst);
+ name_route_extended_t route = xbt_new0(s_name_route_extended_t, 1);
+ route->generic_route.link_list = link_list;
xbt_assert1(current_routing->set_route,
"no defined method \"set_route\" in \"%s\"",
current_routing->name);
*/
static void parse_E_ASroute_store_route(void)
{
- route_extended_t e_route = xbt_new0(s_route_extended_t, 1);
+ name_route_extended_t e_route = xbt_new0(s_name_route_extended_t, 1);
e_route->generic_route.link_list = link_list;
e_route->src_gateway = xbt_strdup(gw_src);
e_route->dst_gateway = xbt_strdup(gw_dst);
-// xbt_assert1(generic_autonomous_system_exist(current_routing,src),"the \"%s\" autonomous system does not exist",src);
-// xbt_assert1(generic_autonomous_system_exist(current_routing,dst),"the \"%s\" autonomous system does not exist",dst);
-// xbt_assert1(generic_processing_units_exist(current_routing,gw_src),"the \"%s\" processing units gateway does not exist",gw_src);
-// xbt_assert1(generic_processing_units_exist(current_routing,gw_dst),"the \"%s\" processing units gateway does not exist",gw_dst);
xbt_assert1(current_routing->set_ASroute,
"no defined method \"set_ASroute\" in \"%s\"",
current_routing->name);
e_route->generic_route.link_list = link_list;
e_route->src_gateway = xbt_strdup(gw_src);
e_route->dst_gateway = xbt_strdup(gw_dst);
-// xbt_assert1(generic_autonomous_system_exist(current_routing,src),"the \"%s\" autonomous system does not exist",src);
-// xbt_assert1(generic_autonomous_system_exist(current_routing,dst),"the \"%s\" autonomous system does not exist",dst);
-// xbt_assert1(generic_processing_units_exist(current_routing,gw_src),"the \"%s\" processing units gateway does not exist",gw_src);
-// xbt_assert1(generic_processing_units_exist(current_routing,gw_dst),"the \"%s\" processing units gateway does not exist",gw_dst);
xbt_assert1(current_routing->set_bypassroute,
"no defined method \"set_bypassroute\" in \"%s\"",
current_routing->name);
new_routing->hierarchy = SURF_ROUTING_NULL;
new_routing->name = xbt_strdup(AS_id);
new_routing->routing_sons = xbt_dict_new();
- //INFO2("Routing %s for AS %s",A_surfxml_AS_routing,A_surfxml_AS_id);
if (current_routing == NULL && global_routing->root == NULL) {
* \param dst the destination host name
*
* walk through the routing components tree and find a route between hosts
- * by calling the differents "get_route" functions in each routing component
+ * by calling the differents "get_route" functions in each routing component.
+ * No need to free the returned dynar. It will be freed at the next call.
*/
static xbt_dynar_t get_route(const char *src, const char *dst)
{
return global_routing->last_route;
}
+/**
+ * \brief Generic method: find a route between hosts
+ *
+ * \param src the source host name
+ * \param dst the destination host name
+ *
+ * walk through the routing components tree and find a route between hosts
+ * by calling the differents "get_route" functions in each routing component.
+ * Leaves the caller the responsability to clean the returned dynar.
+ */
+static xbt_dynar_t get_route_no_cleanup(const char *src, const char *dst)
+{
+ xbt_dynar_t d = get_route(src,dst);
+ global_routing->last_route = NULL;
+ return d;
+}
+
/**
* \brief Recursive function for finalize
*
global_routing->where_network_elements = xbt_dict_new();
global_routing->root = NULL;
global_routing->get_route = get_route;
+ global_routing->get_route_no_cleanup = get_route_no_cleanup;
global_routing->get_onelink_routes = get_onelink_routes;
global_routing->get_network_element_type = get_network_element_type;
global_routing->finalize = finalize;
global_routing->loopback = loopback;
global_routing->size_of_link = size_of_links;
- global_routing->last_route = xbt_dynar_new(size_of_links, NULL);
+ global_routing->last_route = NULL;
/* no current routing at moment */
current_routing = NULL;
surfxml_add_callback(ETag_surfxml_AS_cb_list, &parse_E_AS_XML);
surfxml_add_callback(STag_surfxml_cluster_cb_list,
- &routing_full_parse_Scluster);
+ &routing_parse_Scluster);
- surfxml_add_callback(STag_surfxml_config_cb_list, &parse_Sconfig);
+ surfxml_add_callback(STag_surfxml_config_cb_list,
+ &routing_parse_Sconfig);
+ surfxml_add_callback(ETag_surfxml_config_cb_list,
+ &routing_parse_Econfig);
}
/* ************************************************************************** */
typedef struct {
s_routing_component_t generic_routing;
- xbt_dict_t parse_routes; /* store data during the parse process */
route_extended_t *routing_table;
} s_routing_component_full_t, *routing_component_full_t;
generic_set_processing_unit;
new_component->generic_routing.set_autonomous_system =
generic_set_autonomous_system;
- new_component->generic_routing.set_route = generic_set_route;
- new_component->generic_routing.set_ASroute = generic_set_ASroute;
+ new_component->generic_routing.set_route = model_full_set_route;
+ new_component->generic_routing.set_ASroute = model_full_set_route;
new_component->generic_routing.set_bypassroute = generic_set_bypassroute;
new_component->generic_routing.get_route = full_get_route;
new_component->generic_routing.get_onelink_routes =
new_component->generic_routing.finalize = full_finalize;
new_component->generic_routing.to_index = xbt_dict_new();
new_component->generic_routing.bypassRoutes = xbt_dict_new();
- new_component->generic_routing.parse_routes = xbt_dict_new();
return new_component;
}
static void model_full_end(void)
{
-
- char *key, *end;
- const char *sep = "#";
- int src_id, dst_id;
- unsigned int i, j;
- route_t route;
+ unsigned int i;
route_extended_t e_route;
- void *data;
-
- xbt_dict_cursor_t cursor = NULL;
- xbt_dynar_t keys = NULL;
/* set utils vars */
routing_component_full_t routing =
((routing_component_full_t) current_routing);
size_t table_size = xbt_dict_length(routing->generic_routing.to_index);
- /* Create the routing table */
- routing->routing_table =
- xbt_new0(route_extended_t, table_size * table_size);
-
- /* Put the routes in position */
- xbt_dict_foreach(routing->generic_routing.parse_routes, cursor, key, data) {
- keys = xbt_str_split_str(key, sep);
- src_id = strtol(xbt_dynar_get_as(keys, 0, char *), &end, 10);
- dst_id = strtol(xbt_dynar_get_as(keys, 1, char *), &end, 10);
- TO_ROUTE_FULL(src_id, dst_id) =
- generic_new_extended_route(current_routing->hierarchy, data, 1);
- xbt_dynar_free(&keys);
- }
-
- /* delete the parse table */
- xbt_dict_foreach(routing->generic_routing.parse_routes, cursor, key, data) {
- route = (route_t) data;
- xbt_dynar_free(&(route->link_list));
- xbt_free(data);
- }
-
- /* delete parse dict */
- xbt_dict_free(&(routing->generic_routing.parse_routes));
+ /* Create table if necessary */
+ if(!routing->routing_table)
+ routing->routing_table = xbt_new0(route_extended_t, table_size * table_size);
/* Add the loopback if needed */
if (current_routing->hierarchy == SURF_ROUTING_BASE) {
}
}
}
+}
- /* Shrink the dynar routes (save unused slots) */
- for (i = 0; i < table_size; i++)
- for (j = 0; j < table_size; j++)
- if (TO_ROUTE_FULL(i, j))
- xbt_dynar_shrink(TO_ROUTE_FULL(i, j)->generic_route.link_list, 0);
+static void model_full_set_route(routing_component_t rc, const char *src,
+ const char *dst, name_route_extended_t route)
+{
+ 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);
+ routing_component_full_t routing = ((routing_component_full_t) rc);
+ size_t table_size = xbt_dict_length(routing->generic_routing.to_index);
+
+ xbt_assert2(src_id
+ && dst_id, "Network elements %s or %s not found", src, dst);
+
+ xbt_assert2(xbt_dynar_length(route->generic_route.link_list) > 0,
+ "Invalid count of links, must be greater than zero (%s,%s)",
+ src, dst);
+
+ if(!routing->routing_table)
+ routing->routing_table = xbt_new0(route_extended_t, table_size * table_size);
+
+ if(TO_ROUTE_FULL(*src_id, *dst_id))
+ {
+ char * link_name;
+ unsigned int i;
+ xbt_dynar_t link_route_to_test = xbt_dynar_new(global_routing->size_of_link, NULL);
+ xbt_dynar_foreach(route->generic_route.link_list,i,link_name)
+ {
+ void *link = xbt_dict_get_or_null(surf_network_model->resource_set, link_name);
+ xbt_assert1(link,"Link : '%s' doesn't exists.",link_name);
+ xbt_dynar_push(link_route_to_test,&link);
+ }
+ xbt_assert2(!xbt_dynar_compare(
+ (void*)TO_ROUTE_FULL(*src_id, *dst_id)->generic_route.link_list,
+ (void*)link_route_to_test,
+ (int_f_cpvoid_cpvoid_t) surf_pointer_resource_cmp),
+ "The route between \"%s\" and \"%s\" already exist", src,dst);
+ xbt_free(link_route_to_test);
+ }
+ else
+ {
+ if(!route->dst_gateway && !route->src_gateway)
+ DEBUG2("Load Route from \"%s\" to \"%s\"", src, dst);
+ else
+ DEBUG4("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src,
+ route->src_gateway, dst, route->dst_gateway);
+ TO_ROUTE_FULL(*src_id, *dst_id) = generic_new_extended_route(rc->hierarchy,route,1);
+ xbt_dynar_shrink(TO_ROUTE_FULL(*src_id, *dst_id)->generic_route.link_list, 0);
+ }
+
+ if( A_surfxml_route_symetrical == A_surfxml_route_symetrical_YES
+ || A_surfxml_ASroute_symetrical == A_surfxml_ASroute_symetrical_YES )
+ {
+ if(route->dst_gateway && route->src_gateway)
+ {
+ char * gw_src = bprintf("%s",route->src_gateway);
+ char * gw_dst = bprintf("%s",route->dst_gateway);
+ route->src_gateway = bprintf("%s",gw_dst);
+ route->dst_gateway = bprintf("%s",gw_src);
+ }
+ if(TO_ROUTE_FULL(*dst_id, *src_id))
+ {
+ char * link_name;
+ unsigned int i;
+ xbt_dynar_t link_route_to_test = xbt_dynar_new(global_routing->size_of_link, NULL);
+ for(i=xbt_dynar_length(route->generic_route.link_list) ;i>0 ;i--)
+ {
+ link_name = xbt_dynar_get_as(route->generic_route.link_list,i-1,void *);
+ void *link = xbt_dict_get_or_null(surf_network_model->resource_set, link_name);
+ xbt_assert1(link,"Link : '%s' doesn't exists.",link_name);
+ xbt_dynar_push(link_route_to_test,&link);
+ }
+ xbt_assert2(!xbt_dynar_compare(
+ (void*)TO_ROUTE_FULL(*dst_id, *src_id)->generic_route.link_list,
+ (void*)link_route_to_test,
+ (int_f_cpvoid_cpvoid_t) surf_pointer_resource_cmp),
+ "The route between \"%s\" and \"%s\" already exist", src,dst);
+ xbt_free(link_route_to_test);
+ }
+ else
+ {
+ if(!route->dst_gateway && !route->src_gateway)
+ DEBUG2("Load Route from \"%s\" to \"%s\"", dst, src);
+ else
+ DEBUG4("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", dst,
+ route->src_gateway, src, route->dst_gateway);
+ TO_ROUTE_FULL(*dst_id, *src_id) = generic_new_extended_route(rc->hierarchy,route,0);
+ xbt_dynar_shrink(TO_ROUTE_FULL(*dst_id, *src_id)->generic_route.link_list, 0);
+ }
+
+ }
}
/* ************************************************************************** */
/* *************************** FLOYD ROUTING ******************************** */
-#define TO_FLOYD_COST(i,j) cost_table[(i)+(j)*table_size]
+#define TO_FLOYD_COST(i,j) (routing->cost_table)[(i)+(j)*table_size]
#define TO_FLOYD_PRED(i,j) (routing->predecessor_table)[(i)+(j)*table_size]
#define TO_FLOYD_LINK(i,j) (routing->link_table)[(i)+(j)*table_size]
s_routing_component_t generic_routing;
/* vars for calculate the floyd algorith. */
int *predecessor_table;
+ double *cost_table;
route_extended_t *link_table; /* char* -> int* */
} s_routing_component_floyd_t, *routing_component_floyd_t;
generic_set_processing_unit;
new_component->generic_routing.set_autonomous_system =
generic_set_autonomous_system;
- new_component->generic_routing.set_route = generic_set_route;
- new_component->generic_routing.set_ASroute = generic_set_ASroute;
+ new_component->generic_routing.set_route = model_floyd_set_route;
+ new_component->generic_routing.set_ASroute = model_floyd_set_route;
new_component->generic_routing.set_bypassroute = generic_set_bypassroute;
new_component->generic_routing.get_route = floyd_get_route;
new_component->generic_routing.get_onelink_routes =
new_component->generic_routing.finalize = floyd_finalize;
new_component->generic_routing.to_index = xbt_dict_new();
new_component->generic_routing.bypassRoutes = xbt_dict_new();
- new_component->generic_routing.parse_routes = xbt_dict_new();
return new_component;
}
static void model_floyd_end(void)
{
- routing_component_floyd_t routing =
- ((routing_component_floyd_t) current_routing);
- xbt_dict_cursor_t cursor = NULL;
- double *cost_table;
- char *key, *data, *end;
- const char *sep = "#";
- xbt_dynar_t keys;
- int src_id, dst_id;
- unsigned int i, j, a, b, c;
-
- /* set the size of inicial table */
- size_t table_size = xbt_dict_length(routing->generic_routing.to_index);
-
- /* Create Cost, Predecessor and Link tables */
- cost_table = xbt_new0(double, table_size * table_size); /* link cost from host to host */
- routing->predecessor_table = xbt_new0(int, table_size * table_size); /* predecessor host numbers */
- routing->link_table = xbt_new0(route_extended_t, table_size * table_size); /* actual link between src and dst */
-
- /* Initialize costs and predecessors */
- for (i = 0; i < table_size; i++)
- for (j = 0; j < table_size; j++) {
- TO_FLOYD_COST(i, j) = DBL_MAX;
- TO_FLOYD_PRED(i, j) = -1;
- TO_FLOYD_LINK(i, j) = NULL; /* fixed, missing in the previous version */
- }
-
- /* Put the routes in position */
- xbt_dict_foreach(routing->generic_routing.parse_routes, cursor, key, data) {
- keys = xbt_str_split_str(key, sep);
- src_id = strtol(xbt_dynar_get_as(keys, 0, char *), &end, 10);
- dst_id = strtol(xbt_dynar_get_as(keys, 1, char *), &end, 10);
- TO_FLOYD_LINK(src_id, dst_id) =
- generic_new_extended_route(current_routing->hierarchy, data, 0);
- TO_FLOYD_PRED(src_id, dst_id) = src_id;
- /* set link cost */
- TO_FLOYD_COST(src_id, dst_id) = ((TO_FLOYD_LINK(src_id, dst_id))->generic_route.link_list)->used; /* count of links, old model assume 1 */
- xbt_dynar_free(&keys);
- }
-
- /* Add the loopback if needed */
- if (current_routing->hierarchy == SURF_ROUTING_BASE) {
- for (i = 0; i < table_size; i++) {
- route_extended_t e_route = TO_FLOYD_LINK(i, i);
- if (!e_route) {
- e_route = xbt_new0(s_route_extended_t, 1);
- e_route->src_gateway = NULL;
- e_route->dst_gateway = NULL;
- e_route->generic_route.link_list =
- xbt_dynar_new(global_routing->size_of_link, NULL);
- xbt_dynar_push(e_route->generic_route.link_list,
- &global_routing->loopback);
- TO_FLOYD_LINK(i, i) = e_route;
- TO_FLOYD_PRED(i, i) = i;
- TO_FLOYD_COST(i, i) = 1;
- }
- }
- }
- /* Calculate path costs */
- for (c = 0; c < table_size; c++) {
- for (a = 0; a < table_size; a++) {
- for (b = 0; b < table_size; b++) {
- if (TO_FLOYD_COST(a, c) < DBL_MAX && TO_FLOYD_COST(c, b) < DBL_MAX) {
- if (TO_FLOYD_COST(a, b) == DBL_MAX ||
- (TO_FLOYD_COST(a, c) + TO_FLOYD_COST(c, b) <
- TO_FLOYD_COST(a, b))) {
- TO_FLOYD_COST(a, b) =
- TO_FLOYD_COST(a, c) + TO_FLOYD_COST(c, b);
- TO_FLOYD_PRED(a, b) = TO_FLOYD_PRED(c, b);
- }
- }
- }
- }
- }
-
- /* delete the parse table */
- xbt_dict_foreach(routing->generic_routing.parse_routes, cursor, key, data) {
- route_t route = (route_t) data;
- xbt_dynar_free(&(route->link_list));
- xbt_free(data);
- }
-
- /* delete parse dict */
- xbt_dict_free(&(routing->generic_routing.parse_routes));
-
- /* cleanup */
- xbt_free(cost_table);
+ routing_component_floyd_t routing =
+ ((routing_component_floyd_t) current_routing);
+
+ unsigned int i, j, a, b, c;
+
+ /* set the size of table routing */
+ size_t table_size = xbt_dict_length(routing->generic_routing.to_index);
+
+ if(!routing->link_table)
+ {
+ /* Create Cost, Predecessor and Link tables */
+ routing->cost_table = xbt_new0(double, table_size * table_size); /* link cost from host to host */
+ routing->predecessor_table = xbt_new0(int, table_size * table_size); /* predecessor host numbers */
+ routing->link_table = xbt_new0(route_extended_t, table_size * table_size); /* actual link between src and dst */
+
+ /* Initialize costs and predecessors */
+ for (i = 0; i < table_size; i++)
+ for (j = 0; j < table_size; j++) {
+ TO_FLOYD_COST(i, j) = DBL_MAX;
+ TO_FLOYD_PRED(i, j) = -1;
+ TO_FLOYD_LINK(i, j) = NULL; /* fixed, missing in the previous version */
+ }
+ }
+
+ /* Add the loopback if needed */
+ if (current_routing->hierarchy == SURF_ROUTING_BASE) {
+ for (i = 0; i < table_size; i++) {
+ route_extended_t e_route = TO_FLOYD_LINK(i, i);
+ if (!e_route) {
+ e_route = xbt_new0(s_route_extended_t, 1);
+ e_route->src_gateway = NULL;
+ e_route->dst_gateway = NULL;
+ e_route->generic_route.link_list =
+ xbt_dynar_new(global_routing->size_of_link, NULL);
+ xbt_dynar_push(e_route->generic_route.link_list,
+ &global_routing->loopback);
+ TO_FLOYD_LINK(i, i) = e_route;
+ TO_FLOYD_PRED(i, i) = i;
+ TO_FLOYD_COST(i, i) = 1;
+ }
+ }
+ }
+ /* Calculate path costs */
+ for (c = 0; c < table_size; c++) {
+ for (a = 0; a < table_size; a++) {
+ for (b = 0; b < table_size; b++) {
+ if (TO_FLOYD_COST(a, c) < DBL_MAX && TO_FLOYD_COST(c, b) < DBL_MAX) {
+ if (TO_FLOYD_COST(a, b) == DBL_MAX ||
+ (TO_FLOYD_COST(a, c) + TO_FLOYD_COST(c, b) <
+ TO_FLOYD_COST(a, b))) {
+ TO_FLOYD_COST(a, b) =
+ TO_FLOYD_COST(a, c) + TO_FLOYD_COST(c, b);
+ TO_FLOYD_PRED(a, b) = TO_FLOYD_PRED(c, b);
+ }
+ }
+ }
+ }
+ }
+}
+
+static void model_floyd_set_route(routing_component_t rc, const char *src,
+ const char *dst, name_route_extended_t route)
+{
+ routing_component_floyd_t routing = (routing_component_floyd_t) rc;
+
+ /* set the size of table routing */
+ size_t table_size = xbt_dict_length(rc->to_index);
+ int *src_id, *dst_id;
+ int i,j;
+
+ src_id = xbt_dict_get_or_null(rc->to_index, src);
+ dst_id = xbt_dict_get_or_null(rc->to_index, dst);
+
+ if(!routing->link_table)
+ {
+ /* Create Cost, Predecessor and Link tables */
+ routing->cost_table = xbt_new0(double, table_size * table_size); /* link cost from host to host */
+ routing->predecessor_table = xbt_new0(int, table_size * table_size); /* predecessor host numbers */
+ routing->link_table = xbt_new0(route_extended_t, table_size * table_size); /* actual link between src and dst */
+
+ /* Initialize costs and predecessors */
+ for (i = 0; i < table_size; i++)
+ for (j = 0; j < table_size; j++) {
+ TO_FLOYD_COST(i, j) = DBL_MAX;
+ TO_FLOYD_PRED(i, j) = -1;
+ TO_FLOYD_LINK(i, j) = NULL; /* fixed, missing in the previous version */
+ }
+ }
+
+ if(TO_FLOYD_LINK(*src_id, *dst_id))
+ {
+ if(!route->dst_gateway && !route->src_gateway)
+ DEBUG2("See Route from \"%s\" to \"%s\"", src, dst);
+ else
+ DEBUG4("See ASroute from \"%s(%s)\" to \"%s(%s)\"", src,
+ route->src_gateway, dst, route->dst_gateway);
+ char * link_name;
+ unsigned int cpt;
+ xbt_dynar_t link_route_to_test = xbt_dynar_new(global_routing->size_of_link, NULL);
+ xbt_dynar_foreach(route->generic_route.link_list,cpt,link_name)
+ {
+ void *link = xbt_dict_get_or_null(surf_network_model->resource_set, link_name);
+ xbt_assert1(link,"Link : '%s' doesn't exists.",link_name);
+ xbt_dynar_push(link_route_to_test,&link);
+ }
+ xbt_assert2(!xbt_dynar_compare(
+ (void*)TO_FLOYD_LINK(*src_id, *dst_id)->generic_route.link_list,
+ (void*)link_route_to_test,
+ (int_f_cpvoid_cpvoid_t) surf_pointer_resource_cmp),
+ "The route between \"%s\" and \"%s\" already exist", src,dst);
+ xbt_free(link_route_to_test);
+ }
+ else
+ {
+ if(!route->dst_gateway && !route->src_gateway)
+ DEBUG2("Load Route from \"%s\" to \"%s\"", src, dst);
+ else
+ DEBUG4("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src,
+ route->src_gateway, dst, route->dst_gateway);
+
+ TO_FLOYD_LINK(*src_id, *dst_id) =
+ generic_new_extended_route(rc->hierarchy, route, 1);
+ TO_FLOYD_PRED(*src_id, *dst_id) = *src_id;
+ TO_FLOYD_COST(*src_id, *dst_id) =
+ ((TO_FLOYD_LINK(*src_id, *dst_id))->generic_route.link_list)->used; /* count of links, old model assume 1 */
+ }
+
+ if( A_surfxml_route_symetrical == A_surfxml_route_symetrical_YES
+ || A_surfxml_ASroute_symetrical == A_surfxml_ASroute_symetrical_YES )
+ {
+ if(TO_FLOYD_LINK(*dst_id, *src_id))
+ {
+ if(!route->dst_gateway && !route->src_gateway)
+ DEBUG2("See Route from \"%s\" to \"%s\"", dst, src);
+ else
+ DEBUG4("See ASroute from \"%s(%s)\" to \"%s(%s)\"", dst,
+ route->src_gateway, src, route->dst_gateway);
+ char * link_name;
+ unsigned int i;
+ xbt_dynar_t link_route_to_test = xbt_dynar_new(global_routing->size_of_link, NULL);
+ for(i=xbt_dynar_length(route->generic_route.link_list) ;i>0 ;i--)
+ {
+ link_name = xbt_dynar_get_as(route->generic_route.link_list,i-1,void *);
+ void *link = xbt_dict_get_or_null(surf_network_model->resource_set, link_name);
+ xbt_assert1(link,"Link : '%s' doesn't exists.",link_name);
+ xbt_dynar_push(link_route_to_test,&link);
+ }
+ xbt_assert2(!xbt_dynar_compare(
+ (void*)TO_FLOYD_LINK(*dst_id, *src_id)->generic_route.link_list,
+ (void*)link_route_to_test,
+ (int_f_cpvoid_cpvoid_t) surf_pointer_resource_cmp),
+ "The route between \"%s\" and \"%s\" already exist", src,dst);
+ xbt_free(link_route_to_test);
+ }
+ else
+ {
+ if(route->dst_gateway && route->src_gateway)
+ {
+ char * gw_src = bprintf("%s",route->src_gateway);
+ char * gw_dst = bprintf("%s",route->dst_gateway);
+ route->src_gateway = bprintf("%s",gw_dst);
+ route->dst_gateway = bprintf("%s",gw_src);
+ }
+
+ if(!route->dst_gateway && !route->src_gateway)
+ DEBUG2("Load Route from \"%s\" to \"%s\"", dst, src);
+ else
+ DEBUG4("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", dst,
+ route->src_gateway, src, route->dst_gateway);
+
+ TO_FLOYD_LINK(*dst_id, *src_id) =
+ generic_new_extended_route(rc->hierarchy, route, 0);
+ TO_FLOYD_PRED(*dst_id, *src_id) = *dst_id;
+ TO_FLOYD_COST(*dst_id, *src_id) =
+ ((TO_FLOYD_LINK(*dst_id, *src_id))->generic_route.link_list)->used; /* count of links, old model assume 1 */
+ }
+ }
}
/* ************************************************************************** */
generic_set_processing_unit;
new_component->generic_routing.set_autonomous_system =
generic_set_autonomous_system;
- new_component->generic_routing.set_route = generic_set_route;
- new_component->generic_routing.set_ASroute = generic_set_ASroute;
+ new_component->generic_routing.set_route = model_dijkstra_both_set_route;
+ new_component->generic_routing.set_ASroute = model_dijkstra_both_set_route; //TODO
new_component->generic_routing.set_bypassroute = generic_set_bypassroute;
new_component->generic_routing.get_route = dijkstra_get_route;
new_component->generic_routing.get_onelink_routes =
new_component->cached = cached;
new_component->generic_routing.to_index = xbt_dict_new();
new_component->generic_routing.bypassRoutes = xbt_dict_new();
- new_component->generic_routing.parse_routes = xbt_dict_new();
return new_component;
}
{
routing_component_dijkstra_t routing =
(routing_component_dijkstra_t) current_routing;
- xbt_dict_cursor_t cursor = NULL;
- char *key, *data, *end;
- const char *sep = "#";
- xbt_dynar_t keys;
+
xbt_node_t node = NULL;
unsigned int cursor2;
xbt_dynar_t nodes = NULL;
- int src_id, dst_id;
- route_t route;
/* Create the topology graph */
routing->route_graph = xbt_graph_new_graph(1, NULL);
routing->graph_node_map = xbt_dict_new();
- if (routing->cached)
+ if (routing->cached && !routing->route_cache)
routing->route_cache = xbt_dict_new();
- /* Put the routes in position */
- xbt_dict_foreach(routing->generic_routing.parse_routes, cursor, key, data) {
- keys = xbt_str_split_str(key, sep);
- src_id = strtol(xbt_dynar_get_as(keys, 0, char *), &end, 10);
- dst_id = strtol(xbt_dynar_get_as(keys, 1, char *), &end, 10);
- route_extended_t e_route =
- generic_new_extended_route(current_routing->hierarchy, data, 0);
- route_new_dijkstra(routing, src_id, dst_id, e_route);
- xbt_dynar_free(&keys);
- }
-
- /* delete the parse table */
- xbt_dict_foreach(routing->generic_routing.parse_routes, cursor, key, data) {
- route = (route_t) data;
- xbt_dynar_free(&(route->link_list));
- xbt_free(data);
- }
-
- /* delete parse dict */
- xbt_dict_free(&(routing->generic_routing.parse_routes));
-
/* Add the loopback if needed */
if (current_routing->hierarchy == SURF_ROUTING_BASE)
add_loopback_dijkstra(routing);
}
}
+static void model_dijkstra_both_set_route (routing_component_t rc, const char *src,
+ const char *dst, name_route_extended_t route)
+{
+ routing_component_dijkstra_t routing = (routing_component_dijkstra_t) rc;
+ 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);
+
+ if (routing->cached && !routing->route_cache)
+ routing->route_cache = xbt_dict_new();
+
+ if( A_surfxml_route_symetrical == A_surfxml_route_symetrical_YES
+ || A_surfxml_ASroute_symetrical == A_surfxml_ASroute_symetrical_YES )
+ xbt_die("Route symmetrical not supported on model dijkstra");
+
+ if(!route->dst_gateway && !route->src_gateway)
+ DEBUG2("Load Route from \"%s\" to \"%s\"", src, dst);
+ else
+ DEBUG4("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src,
+ route->src_gateway, dst, route->dst_gateway);
+
+ route_extended_t e_route =
+ generic_new_extended_route(current_routing->hierarchy, route, 1);
+ route_new_dijkstra(routing, *src_id, *dst_id, e_route);
+}
#ifdef HAVE_PCRE_LIB
/* ************************************************** */
static void model_rulebased_set_route(routing_component_t rc,
const char *src, const char *dst,
- route_t route)
+ name_route_extended_t route)
{
routing_component_rulebased_t routing =
(routing_component_rulebased_t) rc;
xbt_assert3(ruleroute->re_src,
"PCRE compilation failed at offset %d (\"%s\"): %s\n",
erroffset, dst, error);
- ruleroute->re_str_link = route->link_list;
+ ruleroute->re_str_link = route->generic_route.link_list;
xbt_dynar_push(routing->list_route, &ruleroute);
xbt_free(route);
}
static void model_rulebased_set_ASroute(routing_component_t rc,
const char *src, const char *dst,
- route_extended_t route)
+ name_route_extended_t route)
{
routing_component_rulebased_t routing =
(routing_component_rulebased_t) rc;
xbt_dict_set(_to_index, name, id, xbt_free);
}
-static void generic_set_route(routing_component_t rc, const char *src,
- const char *dst, route_t route)
-{
- DEBUG2("Load Route from \"%s\" to \"%s\"", src, dst);
- xbt_dict_t _parse_routes;
- xbt_dict_t _to_index;
- char *route_name;
- int *src_id, *dst_id;
- _to_index = current_routing->to_index;
- //TODO
- _parse_routes = current_routing->parse_routes;
-
- src_id = xbt_dict_get_or_null(_to_index, src);
- dst_id = xbt_dict_get_or_null(_to_index, dst);
-
- xbt_assert2(src_id
- && dst_id, "Network elements %s or %s not found", src, dst);
- route_name = bprintf("%d#%d", *src_id, *dst_id);
-
- xbt_assert2(xbt_dynar_length(route->link_list) > 0,
- "Invalid count of links, must be greater than zero (%s,%s)",
- src, dst);
- xbt_assert2(!xbt_dict_get_or_null(_parse_routes, route_name),
- "The route between \"%s\" and \"%s\" already exist", src,
- dst);
-
- xbt_dict_set(_parse_routes, route_name, route, NULL);
- xbt_free(route_name);
+static int surf_pointer_resource_cmp(const void *a, const void *b) {
+ if(a == b)
+ return 0;
+ return 1;
}
-static void generic_set_ASroute(routing_component_t rc, const char *src,
- const char *dst, route_extended_t e_route)
-{
- DEBUG4("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src,
- e_route->src_gateway, dst, e_route->dst_gateway);
-
- xbt_dict_t _parse_routes;
- xbt_dict_t _to_index;
- char *route_name;
- int *src_id, *dst_id;
- _to_index = current_routing->to_index;
- //TODO
- _parse_routes = current_routing->parse_routes;
-
- src_id = xbt_dict_get_or_null(_to_index, src);
- dst_id = xbt_dict_get_or_null(_to_index, dst);
-
- xbt_assert2(src_id
- && dst_id, "Network elements %s or %s not found", src, dst);
- route_name = bprintf("%d#%d", *src_id, *dst_id);
-
- xbt_assert2(xbt_dynar_length(e_route->generic_route.link_list) > 0,
- "Invalid count of links, must be greater than zero (%s,%s)",
- src, dst);
- xbt_assert4(!xbt_dict_get_or_null(_parse_routes, route_name),
- "The route between \"%s\"(\"%s\") and \"%s\"(\"%s\") already exist",
- src, e_route->src_gateway, dst, e_route->dst_gateway);
-
- xbt_dict_set(_parse_routes, route_name, e_route, NULL);
- xbt_free(route_name);
+static int surf_link_resource_cmp(const void *a, const void *b) {
+ if( memcmp(a,b,global_routing->size_of_link) == 0 );
+ return 0;
+ return 1;
}
static void generic_set_bypassroute(routing_component_t rc,
rc->name, dst_as->name);
}
-static void parse_Sconfig(void)
+static void routing_parse_Sconfig(void)
{
//TODO
DEBUG0("WARNING tag config not yet implemented.");
+ DEBUG1("Configuration name = %s",A_surfxml_config_id);
+}
+
+static void routing_parse_Econfig(void)
+{
+ //TODO
+ xbt_dict_cursor_t cursor = NULL;
+ char *key;
+ char *elem;
+ xbt_dict_foreach(current_property_set, cursor, key, elem) {
+ DEBUG2("property : %s = %s",key,elem);
+ }
}
-static void routing_full_parse_Scluster(void)
+static void routing_parse_Scluster(void)
{
static int AX_ptr = 0;
xbt_dynar_t radical_elements;
xbt_dynar_t radical_ends;
int cluster_sharing_policy = AX_surfxml_cluster_sharing_policy;
-
- if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
- {DEBUG0("cluster with sharing_policy FULLDUPLEX");}
- if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_SHARED)
- {DEBUG0("cluster with sharing_policy SHARED");}
+ int cluster_bb_sharing_policy = AX_surfxml_cluster_bb_sharing_policy;
#ifndef HAVE_PCRE_LIB
xbt_dynar_t tab_elements_num = xbt_dynar_new(sizeof(int), NULL);
A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
{A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FULLDUPLEX;}
+ if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FATPIPE)
+ {A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FATPIPE;}
SURFXML_BUFFER_SET(link_id, link_id);
SURFXML_BUFFER_SET(link_bandwidth, cluster_bw);
SURFXML_BUFFER_SET(link_latency, cluster_lat);
A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
{A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FULLDUPLEX;}
+ if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FATPIPE)
+ {A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FATPIPE;}
SURFXML_BUFFER_SET(link_id, link_id);
SURFXML_BUFFER_SET(link_bandwidth, cluster_bw);
SURFXML_BUFFER_SET(link_latency, cluster_lat);
SURFXML_START_TAG(router);
SURFXML_END_TAG(router);
- DEBUG3("<link\tid=\"%s\"\tbw=\"%s\"\tlat=\"%s\"/>", link_id,cluster_bw, cluster_lat);
+ DEBUG3("<link\tid=\"%s\" bw=\"%s\" lat=\"%s\"/>", link_router,cluster_bw, cluster_lat);
A_surfxml_link_state = A_surfxml_link_state_ON;
A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
{A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FULLDUPLEX;}
+ if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FATPIPE)
+ {A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FATPIPE;}
SURFXML_BUFFER_SET(link_id, link_router);
SURFXML_BUFFER_SET(link_bandwidth, cluster_bw);
SURFXML_BUFFER_SET(link_latency, cluster_lat);
SURFXML_START_TAG(link);
SURFXML_END_TAG(link);
- DEBUG3("<link\tid=\"%s\"\tbw=\"%s\"\tlat=\"%s\"/>", link_id,cluster_bw, cluster_lat);
+ DEBUG3("<link\tid=\"%s\" bw=\"%s\" lat=\"%s\"/>", link_backbone,cluster_bw, cluster_lat);
A_surfxml_link_state = A_surfxml_link_state_ON;
A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
+ if(cluster_bb_sharing_policy == A_surfxml_cluster_bb_sharing_policy_FATPIPE)
+ {A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FATPIPE;}
SURFXML_BUFFER_SET(link_id, link_backbone);
SURFXML_BUFFER_SET(link_bandwidth, cluster_bb_bw);
SURFXML_BUFFER_SET(link_latency, cluster_bb_lat);
#ifdef HAVE_PCRE_LIB
- DEBUG2("<route\tsrc=\"%s\"\tdst=\"%s\">", route_src_dst, route_src_dst);
+ DEBUG2("<route\tsrc=\"%s\"\tdst=\"%s\"", route_src_dst, route_src_dst);
+ DEBUG0("symetrical=\"NO\">");
SURFXML_BUFFER_SET(route_src, route_src_dst);
SURFXML_BUFFER_SET(route_dst, route_src_dst);
+ A_surfxml_route_symetrical = A_surfxml_route_symetrical_NO;
SURFXML_START_TAG(route);
DEBUG1("<link_ctn\tid=\"%s_link_$1src\"/>", cluster_id);
SURFXML_BUFFER_SET(link_ctn_id, bprintf("%s_link_$1src", cluster_id));
+ A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
{A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_UP;}
SURFXML_START_TAG(link_ctn);
DEBUG1("<link_ctn\tid=\"%s_link_$1dst\"/>", cluster_id);
SURFXML_BUFFER_SET(link_ctn_id, bprintf("%s_link_$1dst", cluster_id));
+ A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
- {A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_UP;}
+ {A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_DOWN;}
SURFXML_START_TAG(link_ctn);
SURFXML_END_TAG(link_ctn);
cluster_suffix);
}
- DEBUG2("<route\tsrc=\"%s\"\tdst=\"%s\">", route_src, route_dst);
+ DEBUG2("<route\tsrc=\"%s\"\tdst=\"%s\"", route_src, route_dst);
+ DEBUG0("symetrical=\"NO\">");
SURFXML_BUFFER_SET(route_src, route_src);
SURFXML_BUFFER_SET(route_dst, route_dst);
+ A_surfxml_route_symetrical = A_surfxml_route_symetrical_NO;
SURFXML_START_TAG(route);
if (i == xbt_dynar_length(tab_elements_num)) {
DEBUG1("<link_ctn\tid=\"%s\"/>", route_src);
SURFXML_BUFFER_SET(link_ctn_id, route_src);
+ A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
{A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_UP;}
SURFXML_START_TAG(link_ctn);
DEBUG1("<link_ctn\tid=\"%s_backbone\"/>", cluster_id);
SURFXML_BUFFER_SET(link_ctn_id, bprintf("%s_backbone", cluster_id));
+ A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
SURFXML_START_TAG(link_ctn);
SURFXML_END_TAG(link_ctn);
DEBUG1("<link_ctn\tid=\"%s\"/>", route_dst);
SURFXML_BUFFER_SET(link_ctn_id, route_dst);
+ A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
- {A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_UP;}
+ {A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_DOWN;}
SURFXML_START_TAG(link_ctn);
SURFXML_END_TAG(link_ctn);
