X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7c6afa816fc1be84cf440d025e84331e63ee6827..39bbf791c23a1c90885b63c704aa37382f06d163:/src/surf/surf_routing.c
diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c
index dbe7b07bb7..942abe88be 100644
--- a/src/surf/surf_routing.c
+++ b/src/surf/surf_routing.c
@@ -54,9 +54,10 @@ static void model_none_load(void); /* none 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 {
@@ -146,7 +147,6 @@ static char *dst = NULL; /* temporary store the destination name of a rou
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
*/
@@ -307,7 +307,12 @@ static void parse_E_link_ctn_new_elem(char *link_id)
static void parse_E_link_ctn_new_elem_XML(void)
{
- parse_E_link_ctn_new_elem(A_surfxml_link_ctn_id);
+ if( A_surfxml_link_ctn_direction == A_surfxml_link_ctn_direction_NONE)
+ parse_E_link_ctn_new_elem(A_surfxml_link_ctn_id);
+ if( A_surfxml_link_ctn_direction == A_surfxml_link_ctn_direction_UP)
+ parse_E_link_ctn_new_elem(bprintf("%s_UP",A_surfxml_link_ctn_id));
+ if( A_surfxml_link_ctn_direction == A_surfxml_link_ctn_direction_DOWN)
+ parse_E_link_ctn_new_elem(bprintf("%s_DOWN",A_surfxml_link_ctn_id));
}
/**
@@ -315,7 +320,6 @@ static void parse_E_link_ctn_new_elem_XML(void)
*/
static void parse_E_link_c_ctn_new_elem_lua(char *link_id)
{
-
parse_E_link_ctn_new_elem(link_id);
}
@@ -326,8 +330,8 @@ 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);
+ //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);
xbt_assert1(current_routing->set_route,
"no defined method \"set_route\" in \"%s\"",
current_routing->name);
@@ -892,9 +896,12 @@ void routing_model_create(size_t size_of_links, void *loopback)
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);
}
/* ************************************************************************** */
@@ -907,7 +914,6 @@ void routing_model_create(size_t size_of_links, void *loopback)
typedef struct {
s_routing_component_t generic_routing;
xbt_dict_t parse_routes; /* store data during the parse process */
- xbt_dict_t bypassRoutes;
route_extended_t *routing_table;
} s_routing_component_full_t, *routing_component_full_t;
@@ -917,7 +923,7 @@ static xbt_dynar_t full_get_onelink_routes(routing_component_t rc)
xbt_dynar_t ret = xbt_dynar_new(sizeof(onelink_t), xbt_free);
routing_component_full_t routing = (routing_component_full_t) rc;
- int table_size = xbt_dict_length(routing->generic_routing.to_index);
+ size_t table_size = xbt_dict_length(routing->generic_routing.to_index);
xbt_dict_cursor_t c1 = NULL, c2 = NULL;
char *k1, *d1, *k2, *d2;
xbt_dict_foreach(routing->generic_routing.to_index, c1, k1, d1) {
@@ -962,7 +968,7 @@ static route_extended_t full_get_route(routing_component_t rc,
/* set utils vars */
routing_component_full_t routing = (routing_component_full_t) rc;
- int table_size = xbt_dict_length(routing->generic_routing.to_index);
+ size_t table_size = xbt_dict_length(routing->generic_routing.to_index);
generic_src_dst_check(rc, src, dst);
int *src_id = xbt_dict_get_or_null(routing->generic_routing.to_index, src);
@@ -995,7 +1001,7 @@ static route_extended_t full_get_route(routing_component_t rc,
static void full_finalize(routing_component_t rc)
{
routing_component_full_t routing = (routing_component_full_t) rc;
- int table_size = xbt_dict_length(routing->generic_routing.to_index);
+ size_t table_size = xbt_dict_length(routing->generic_routing.to_index);
int i, j;
if (routing) {
/* Delete routing table */
@@ -1004,9 +1010,9 @@ static void full_finalize(routing_component_t rc)
generic_free_extended_route(TO_ROUTE_FULL(i, j));
xbt_free(routing->routing_table);
/* Delete bypass dict */
- xbt_dict_free(&routing->bypassRoutes);
+ xbt_dict_free(&rc->bypassRoutes);
/* Delete index dict */
- xbt_dict_free(&(routing->generic_routing.to_index));
+ xbt_dict_free(&rc->to_index);
/* Delete structure */
xbt_free(rc);
}
@@ -1032,8 +1038,8 @@ static void *model_full_create(void)
generic_get_bypassroute;
new_component->generic_routing.finalize = full_finalize;
new_component->generic_routing.to_index = xbt_dict_new();
- new_component->bypassRoutes = xbt_dict_new();
- new_component->parse_routes = xbt_dict_new();
+ new_component->generic_routing.bypassRoutes = xbt_dict_new();
+ new_component->generic_routing.parse_routes = xbt_dict_new();
return new_component;
}
@@ -1064,14 +1070,14 @@ static void model_full_end(void)
/* set utils vars */
routing_component_full_t routing =
((routing_component_full_t) current_routing);
- int table_size = xbt_dict_length(routing->generic_routing.to_index);
+ 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->parse_routes, cursor, key, data) {
+ 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);
@@ -1081,14 +1087,14 @@ static void model_full_end(void)
}
/* delete the parse table */
- xbt_dict_foreach(routing->parse_routes, cursor, key, data) {
+ 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->parse_routes));
+ xbt_dict_free(&(routing->generic_routing.parse_routes));
/* Add the loopback if needed */
if (current_routing->hierarchy == SURF_ROUTING_BASE) {
@@ -1128,9 +1134,6 @@ typedef struct {
/* vars for calculate the floyd algorith. */
int *predecessor_table;
route_extended_t *link_table; /* char* -> int* */
- xbt_dict_t bypassRoutes;
- /* store data during the parse process */
- xbt_dict_t parse_routes;
} s_routing_component_floyd_t, *routing_component_floyd_t;
static route_extended_t floyd_get_route(routing_component_t rc,
@@ -1142,7 +1145,7 @@ static xbt_dynar_t floyd_get_onelink_routes(routing_component_t rc)
xbt_dynar_t ret = xbt_dynar_new(sizeof(onelink_t), xbt_free);
routing_component_floyd_t routing = (routing_component_floyd_t) rc;
- //int table_size = xbt_dict_length(routing->generic_routing.to_index);
+ //size_t table_size = xbt_dict_length(routing->generic_routing.to_index);
xbt_dict_cursor_t c1 = NULL, c2 = NULL;
char *k1, *d1, *k2, *d2;
xbt_dict_foreach(routing->generic_routing.to_index, c1, k1, d1) {
@@ -1181,7 +1184,7 @@ static route_extended_t floyd_get_route(routing_component_t rc,
/* set utils vars */
routing_component_floyd_t routing = (routing_component_floyd_t) rc;
- int table_size = xbt_dict_length(routing->generic_routing.to_index);
+ size_t table_size = xbt_dict_length(routing->generic_routing.to_index);
generic_src_dst_check(rc, src, dst);
int *src_id = xbt_dict_get_or_null(routing->generic_routing.to_index, src);
@@ -1262,7 +1265,8 @@ static route_extended_t floyd_get_route(routing_component_t rc,
static void floyd_finalize(routing_component_t rc)
{
routing_component_floyd_t routing = (routing_component_floyd_t) rc;
- int i, j, table_size;
+ int i, j;
+ size_t table_size;
if (routing) {
table_size = xbt_dict_length(routing->generic_routing.to_index);
/* Delete link_table */
@@ -1271,7 +1275,7 @@ static void floyd_finalize(routing_component_t rc)
generic_free_extended_route(TO_FLOYD_LINK(i, j));
xbt_free(routing->link_table);
/* Delete bypass dict */
- xbt_dict_free(&routing->bypassRoutes);
+ xbt_dict_free(&routing->generic_routing.bypassRoutes);
/* Delete index dict */
xbt_dict_free(&(routing->generic_routing.to_index));
/* Delete dictionary index dict, predecessor and links table */
@@ -1299,8 +1303,8 @@ static void *model_floyd_create(void)
generic_get_bypassroute;
new_component->generic_routing.finalize = floyd_finalize;
new_component->generic_routing.to_index = xbt_dict_new();
- new_component->bypassRoutes = xbt_dict_new();
- new_component->parse_routes = xbt_dict_new();
+ new_component->generic_routing.bypassRoutes = xbt_dict_new();
+ new_component->generic_routing.parse_routes = xbt_dict_new();
return new_component;
}
@@ -1328,7 +1332,7 @@ static void model_floyd_end(void)
unsigned int i, j, a, b, c;
/* set the size of inicial table */
- int table_size = xbt_dict_length(routing->generic_routing.to_index);
+ 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 */
@@ -1344,7 +1348,7 @@ static void model_floyd_end(void)
}
/* Put the routes in position */
- xbt_dict_foreach(routing->parse_routes, cursor, key, data) {
+ 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);
@@ -1392,14 +1396,14 @@ static void model_floyd_end(void)
}
/* delete the parse table */
- xbt_dict_foreach(routing->parse_routes, cursor, key, data) {
+ 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->parse_routes));
+ xbt_dict_free(&(routing->generic_routing.parse_routes));
/* cleanup */
xbt_free(cost_table);
@@ -1410,12 +1414,10 @@ static void model_floyd_end(void)
typedef struct {
s_routing_component_t generic_routing;
- xbt_dict_t bypassRoutes;
xbt_graph_t route_graph; /* xbt_graph */
xbt_dict_t graph_node_map; /* map */
xbt_dict_t route_cache; /* use in cache mode */
int cached;
- xbt_dict_t parse_routes;
} s_routing_component_dijkstra_t, *routing_component_dijkstra_t;
@@ -1801,7 +1803,7 @@ static void dijkstra_finalize(routing_component_t rc)
if (routing->cached)
xbt_dict_free(&routing->route_cache);
/* Delete bypass dict */
- xbt_dict_free(&routing->bypassRoutes);
+ xbt_dict_free(&routing->generic_routing.bypassRoutes);
/* Delete index dict */
xbt_dict_free(&(routing->generic_routing.to_index));
/* Delete structure */
@@ -1830,8 +1832,8 @@ static void *model_dijkstra_both_create(int cached)
new_component->generic_routing.finalize = dijkstra_finalize;
new_component->cached = cached;
new_component->generic_routing.to_index = xbt_dict_new();
- new_component->bypassRoutes = xbt_dict_new();
- new_component->parse_routes = xbt_dict_new();
+ new_component->generic_routing.bypassRoutes = xbt_dict_new();
+ new_component->generic_routing.parse_routes = xbt_dict_new();
return new_component;
}
@@ -1877,7 +1879,7 @@ static void model_dijkstra_both_end(void)
routing->route_cache = xbt_dict_new();
/* Put the routes in position */
- xbt_dict_foreach(routing->parse_routes, cursor, key, data) {
+ 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);
@@ -1888,14 +1890,14 @@ static void model_dijkstra_both_end(void)
}
/* delete the parse table */
- xbt_dict_foreach(routing->parse_routes, cursor, key, data) {
+ 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->parse_routes));
+ xbt_dict_free(&(routing->generic_routing.parse_routes));
/* Add the loopback if needed */
if (current_routing->hierarchy == SURF_ROUTING_BASE)
@@ -2306,18 +2308,15 @@ static void *model_rulebased_create(void)
model_rulebased_set_autonomous_system;
new_component->generic_routing.set_route = model_rulebased_set_route;
new_component->generic_routing.set_ASroute = model_rulebased_set_ASroute;
- new_component->generic_routing.set_bypassroute =
- model_rulebased_set_bypassroute;
- new_component->generic_routing.get_onelink_routes =
- rulebased_get_onelink_routes;
+ new_component->generic_routing.set_bypassroute = model_rulebased_set_bypassroute;
+ new_component->generic_routing.get_onelink_routes = rulebased_get_onelink_routes;
new_component->generic_routing.get_route = rulebased_get_route;
- new_component->generic_routing.get_bypass_route = NULL; //rulebased_get_bypass_route;
+ new_component->generic_routing.get_bypass_route = generic_get_bypassroute; //rulebased_get_bypass_route;
new_component->generic_routing.finalize = rulebased_finalize;
/* initialization of internal structures */
new_component->dict_processing_units = xbt_dict_new();
new_component->dict_autonomous_systems = xbt_dict_new();
- new_component->list_route =
- xbt_dynar_new(sizeof(rule_route_t), &rule_route_free);
+ new_component->list_route = xbt_dynar_new(sizeof(rule_route_t), &rule_route_free);
new_component->list_ASroute =
xbt_dynar_new(sizeof(rule_route_extended_t),
&rule_route_extended_free);
@@ -2486,25 +2485,15 @@ 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);
- model_type_t modeltype = rc->routing;
xbt_dict_t _parse_routes;
xbt_dict_t _to_index;
char *route_name;
int *src_id, *dst_id;
- _to_index = current_routing->to_index;
-
- if (modeltype == &routing_models[SURF_MODEL_FULL]) {
- _parse_routes = ((routing_component_full_t) rc)->parse_routes;
+ unsigned long nb_links = xbt_dynar_length(route->link_list);
- } else if (modeltype == &routing_models[SURF_MODEL_FLOYD]) {
- _parse_routes = ((routing_component_floyd_t) rc)->parse_routes;
-
- } else if (modeltype == &routing_models[SURF_MODEL_DIJKSTRA] ||
- modeltype == &routing_models[SURF_MODEL_DIJKSTRACACHE]) {
- _parse_routes = ((routing_component_dijkstra_t) rc)->parse_routes;
-
- } else
- xbt_die("\"generic_set_route\" not supported");
+ _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);
@@ -2522,6 +2511,21 @@ static void generic_set_route(routing_component_t rc, const char *src,
xbt_dict_set(_parse_routes, route_name, route, NULL);
xbt_free(route_name);
+
+ if(A_surfxml_route_symetrical == A_surfxml_route_symetrical_YES)
+ {
+ int i;
+ route_t route_sym = xbt_new0(s_route_t, 1);
+ route_sym->link_list = xbt_dynar_new(sizeof(char *),NULL);
+ for(i=nb_links ; i>0 ; i--)
+ {
+ char *link_name = xbt_new0(char,strlen(xbt_dynar_get_as(route->link_list, i-1, char *)));
+ link_name = bprintf("%s",xbt_dynar_get_as(route->link_list, i-1, char *));
+ xbt_dynar_push_as(route_sym->link_list ,char *, link_name);
+ }
+ DEBUG2("Load Route from \"%s\" to \"%s\"", dst, src);
+ xbt_dict_set(_parse_routes, bprintf("%d#%d",*dst_id, *src_id), route_sym, NULL);
+ }
}
static void generic_set_ASroute(routing_component_t rc, const char *src,
@@ -2529,25 +2533,14 @@ static void generic_set_ASroute(routing_component_t rc, const char *src,
{
DEBUG4("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src,
e_route->src_gateway, dst, e_route->dst_gateway);
- model_type_t modeltype = rc->routing;
+
xbt_dict_t _parse_routes;
xbt_dict_t _to_index;
char *route_name;
int *src_id, *dst_id;
_to_index = current_routing->to_index;
+ _parse_routes = current_routing->parse_routes;
- if (modeltype == &routing_models[SURF_MODEL_FULL]) {
- _parse_routes = ((routing_component_full_t) rc)->parse_routes;
-
- } else if (modeltype == &routing_models[SURF_MODEL_FLOYD]) {
- _parse_routes = ((routing_component_floyd_t) rc)->parse_routes;
-
- } else if (modeltype == &routing_models[SURF_MODEL_DIJKSTRA] ||
- modeltype == &routing_models[SURF_MODEL_DIJKSTRACACHE]) {
- _parse_routes = ((routing_component_dijkstra_t) rc)->parse_routes;
-
- } else
- xbt_die("\"generic_set_route\" not supported");
src_id = xbt_dict_get_or_null(_to_index, src);
dst_id = xbt_dict_get_or_null(_to_index, dst);
@@ -2565,6 +2558,26 @@ static void generic_set_ASroute(routing_component_t rc, const char *src,
xbt_dict_set(_parse_routes, route_name, e_route, NULL);
xbt_free(route_name);
+
+ unsigned long nb_links = xbt_dynar_length(e_route->generic_route.link_list);
+ if(A_surfxml_ASroute_symetrical == A_surfxml_ASroute_symetrical_YES)
+ {
+ int i;
+ route_extended_t route_sym = xbt_new0(s_route_extended_t, 1);
+ route_sym->generic_route.link_list = xbt_dynar_new(sizeof(char *),NULL);
+ for(i=nb_links ; i>0 ; i--)
+ {
+ char *link_name = xbt_new0(char,strlen(xbt_dynar_get_as(e_route->generic_route.link_list, i-1, char *)));
+ link_name = bprintf("%s",xbt_dynar_get_as(e_route->generic_route.link_list, i-1, char *));
+ xbt_dynar_push_as(route_sym->generic_route.link_list ,char *, link_name);
+ }
+ route_sym->src_gateway = xbt_new0( char,strlen(e_route->dst_gateway) );
+ route_sym->src_gateway = bprintf("%s",e_route->dst_gateway);
+ route_sym->dst_gateway = xbt_new0( char,strlen(e_route->src_gateway) );
+ route_sym->dst_gateway = bprintf("%s",e_route->src_gateway);
+ DEBUG4("Load ASroute from \"%s(%s)\" to \"%s(%s)\"",dst, route_sym->src_gateway,src,route_sym->dst_gateway);
+ xbt_dict_set(_parse_routes, bprintf("%d#%d", *dst_id, *src_id), route_sym, NULL);
+ }
}
static void generic_set_bypassroute(routing_component_t rc,
@@ -2572,18 +2585,9 @@ static void generic_set_bypassroute(routing_component_t rc,
route_extended_t e_route)
{
DEBUG2("Load bypassRoute from \"%s\" to \"%s\"", src, dst);
- model_type_t modeltype = rc->routing;
- xbt_dict_t dict_bypassRoutes;
+ xbt_dict_t dict_bypassRoutes = rc->bypassRoutes;
char *route_name;
- if (modeltype == &routing_models[SURF_MODEL_FULL]) {
- dict_bypassRoutes = ((routing_component_full_t) rc)->bypassRoutes;
- } else if (modeltype == &routing_models[SURF_MODEL_FLOYD]) {
- dict_bypassRoutes = ((routing_component_floyd_t) rc)->bypassRoutes;
- } else if (modeltype == &routing_models[SURF_MODEL_DIJKSTRA] ||
- modeltype == &routing_models[SURF_MODEL_DIJKSTRACACHE]) {
- dict_bypassRoutes = ((routing_component_dijkstra_t) rc)->bypassRoutes;
- } else
- xbt_die("\"generic_set_bypassroute\" not supported");
+
route_name = bprintf("%s#%s", src, dst);
xbt_assert2(xbt_dynar_length(e_route->generic_route.link_list) > 0,
"Invalid count of links, must be greater than zero (%s,%s)",
@@ -2614,20 +2618,7 @@ static route_extended_t generic_get_bypassroute(routing_component_t rc,
const char *src,
const char *dst)
{
- model_type_t modeltype = rc->routing;
- xbt_dict_t dict_bypassRoutes;
-
- if (modeltype == &routing_models[SURF_MODEL_FULL]) {
- dict_bypassRoutes = ((routing_component_full_t) rc)->bypassRoutes;
- } else if (modeltype == &routing_models[SURF_MODEL_FLOYD]) {
- dict_bypassRoutes = ((routing_component_floyd_t) rc)->bypassRoutes;
- } else if (modeltype == &routing_models[SURF_MODEL_DIJKSTRA] ||
- modeltype == &routing_models[SURF_MODEL_DIJKSTRACACHE]) {
- dict_bypassRoutes = ((routing_component_dijkstra_t) rc)->bypassRoutes;
- } else
- xbt_die("\"generic_get_bypassroute\" not supported");
-
-
+ xbt_dict_t dict_bypassRoutes = rc->bypassRoutes;
routing_component_t src_as, dst_as;
int index_src, index_dst;
xbt_dynar_t path_src = NULL;
@@ -2768,7 +2759,7 @@ generic_new_extended_route(e_surf_routing_hierarchy_t hierarchy,
route_extended_t e_route, new_e_route;
route_t route;
unsigned int cpt;
- xbt_dynar_t links, links_id;
+ xbt_dynar_t links = NULL, links_id = NULL;
new_e_route = xbt_new0(s_route_extended_t, 1);
new_e_route->generic_route.link_list =
@@ -2919,13 +2910,25 @@ static void generic_src_dst_check(routing_component_t rc, const char *src,
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_full_parse_Scluster(void)
+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_parse_Scluster(void)
{
static int AX_ptr = 0;
@@ -2938,12 +2941,19 @@ static void routing_full_parse_Scluster(void)
char *cluster_lat = A_surfxml_cluster_lat;
char *cluster_bb_bw = A_surfxml_cluster_bb_bw;
char *cluster_bb_lat = A_surfxml_cluster_bb_lat;
- char *host_id, *groups, *link_id;
+ char *host_id, *groups, *link_id = NULL;
char *router_id, *link_router, *link_backbone, *route_src_dst;
unsigned int iter;
int start, end, i;
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");}
+
#ifndef HAVE_PCRE_LIB
xbt_dynar_t tab_elements_num = xbt_dynar_new(sizeof(int), NULL);
char *route_src, *route_dst;
@@ -2981,25 +2991,26 @@ static void routing_full_parse_Scluster(void)
link_id = bprintf("%s_link_%d", cluster_id, start);
DEBUG2("", host_id, cluster_power);
+ A_surfxml_host_state = A_surfxml_host_state_ON;
SURFXML_BUFFER_SET(host_id, host_id);
SURFXML_BUFFER_SET(host_power, cluster_power);
SURFXML_BUFFER_SET(host_availability, "1.0");
SURFXML_BUFFER_SET(host_availability_file, "");
- A_surfxml_host_state = A_surfxml_host_state_ON;
SURFXML_BUFFER_SET(host_state_file, "");
SURFXML_START_TAG(host);
SURFXML_END_TAG(host);
- DEBUG3("", link_id,
- cluster_bw, cluster_lat);
+ DEBUG3("", link_id,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;}
SURFXML_BUFFER_SET(link_id, link_id);
SURFXML_BUFFER_SET(link_bandwidth, cluster_bw);
SURFXML_BUFFER_SET(link_latency, cluster_lat);
SURFXML_BUFFER_SET(link_bandwidth_file, "");
SURFXML_BUFFER_SET(link_latency_file, "");
- A_surfxml_link_state = A_surfxml_link_state_ON;
SURFXML_BUFFER_SET(link_state_file, "");
- A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
SURFXML_START_TAG(link);
SURFXML_END_TAG(link);
@@ -3019,26 +3030,26 @@ static void routing_full_parse_Scluster(void)
link_id = bprintf("%s_link_%d", cluster_id, i);
DEBUG2("", host_id, cluster_power);
+ A_surfxml_host_state = A_surfxml_host_state_ON;
SURFXML_BUFFER_SET(host_id, host_id);
SURFXML_BUFFER_SET(host_power, cluster_power);
SURFXML_BUFFER_SET(host_availability, "1.0");
SURFXML_BUFFER_SET(host_availability_file, "");
- A_surfxml_host_state = A_surfxml_host_state_ON;
SURFXML_BUFFER_SET(host_state_file, "");
SURFXML_START_TAG(host);
SURFXML_END_TAG(host);
- DEBUG3("", link_id,
- cluster_bw, cluster_lat);
+ DEBUG3("", link_id,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;}
SURFXML_BUFFER_SET(link_id, link_id);
SURFXML_BUFFER_SET(link_bandwidth, cluster_bw);
SURFXML_BUFFER_SET(link_latency, cluster_lat);
SURFXML_BUFFER_SET(link_bandwidth_file, "");
SURFXML_BUFFER_SET(link_latency_file, "");
- A_surfxml_link_state = A_surfxml_link_state_ON;
SURFXML_BUFFER_SET(link_state_file, "");
- A_surfxml_link_sharing_policy =
- A_surfxml_link_sharing_policy_SHARED;
SURFXML_START_TAG(link);
SURFXML_END_TAG(link);
}
@@ -3063,29 +3074,29 @@ static void routing_full_parse_Scluster(void)
SURFXML_START_TAG(router);
SURFXML_END_TAG(router);
- DEBUG3("", link_router,
- cluster_bw, cluster_lat);
+ DEBUG3("", 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;}
SURFXML_BUFFER_SET(link_id, link_router);
SURFXML_BUFFER_SET(link_bandwidth, cluster_bw);
SURFXML_BUFFER_SET(link_latency, cluster_lat);
SURFXML_BUFFER_SET(link_bandwidth_file, "");
SURFXML_BUFFER_SET(link_latency_file, "");
- A_surfxml_link_state = A_surfxml_link_state_ON;
SURFXML_BUFFER_SET(link_state_file, "");
- A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
SURFXML_START_TAG(link);
SURFXML_END_TAG(link);
- DEBUG3("", link_backbone,
- cluster_bb_bw, cluster_bb_lat);
+ DEBUG3("", 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;
SURFXML_BUFFER_SET(link_id, link_backbone);
SURFXML_BUFFER_SET(link_bandwidth, cluster_bb_bw);
SURFXML_BUFFER_SET(link_latency, cluster_bb_lat);
SURFXML_BUFFER_SET(link_bandwidth_file, "");
SURFXML_BUFFER_SET(link_latency_file, "");
- A_surfxml_link_state = A_surfxml_link_state_ON;
SURFXML_BUFFER_SET(link_state_file, "");
- A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
SURFXML_START_TAG(link);
SURFXML_END_TAG(link);
@@ -3103,23 +3114,32 @@ static void routing_full_parse_Scluster(void)
#ifdef HAVE_PCRE_LIB
- DEBUG2("", route_src_dst, route_src_dst);
+ DEBUG2("");
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("", cluster_id);
+ DEBUG1("", 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);
SURFXML_END_TAG(link_ctn);
- DEBUG1("", cluster_id);
+ DEBUG1("", 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("", cluster_id);
+ DEBUG1("", 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;}
SURFXML_START_TAG(link_ctn);
SURFXML_END_TAG(link_ctn);
@@ -3146,9 +3166,11 @@ static void routing_full_parse_Scluster(void)
cluster_suffix);
}
- DEBUG2("", route_src, route_dst);
+ DEBUG2("");
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)) {
@@ -3167,18 +3189,22 @@ static void routing_full_parse_Scluster(void)
xbt_dynar_get_as(tab_elements_num, j, int));
}
- DEBUG1("", route_src);
+ DEBUG1("", route_src);
SURFXML_BUFFER_SET(link_ctn_id, route_src);
+ 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);
SURFXML_END_TAG(link_ctn);
- DEBUG1("", cluster_id);
+ DEBUG1("", cluster_id);
SURFXML_BUFFER_SET(link_ctn_id, bprintf("%s_backbone", cluster_id));
SURFXML_START_TAG(link_ctn);
SURFXML_END_TAG(link_ctn);
- DEBUG1("", route_dst);
+ DEBUG1("", route_dst);
SURFXML_BUFFER_SET(link_ctn_id, route_dst);
+ 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);
SURFXML_END_TAG(link_ctn);