X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ccc5ecd2a44dfbd9740d894c3e3ec9f33a2d5748..f780443504c3b73f0b9d1c58c6c5a21e2affce2d:/src/surf/surf_routing.c
diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c
index 44a6e90d65..b053b28ea9 100644
--- a/src/surf/surf_routing.c
+++ b/src/surf/surf_routing.c
@@ -1053,7 +1053,6 @@ static e_surf_network_element_type_t get_network_element_type(const char
*/
void routing_model_create(size_t size_of_links, void *loopback, double_f_cpvoid_t get_link_latency_fun)
{
-
/* config the uniq global routing */
global_routing = xbt_new0(s_routing_global_t, 1);
global_routing->where_network_elements = xbt_dict_new();
@@ -1104,16 +1103,19 @@ void routing_model_create(size_t size_of_links, void *loopback, double_f_cpvoid_
surfxml_add_callback(STag_surfxml_peer_cb_list,
&routing_parse_Speer);
- surfxml_add_callback(STag_surfxml_config_cb_list,
- &routing_parse_Sconfig);
- surfxml_add_callback(ETag_surfxml_config_cb_list,
- &routing_parse_Econfig);
-
#ifdef HAVE_TRACING
instr_routing_define_callbacks();
#endif
}
+void surf_config_add_callback(void)
+{
+ surf_parse_reset_parser();
+ surfxml_add_callback(STag_surfxml_config_cb_list, &routing_parse_Sconfig);
+ surfxml_add_callback(ETag_surfxml_config_cb_list, &routing_parse_Econfig);
+ surfxml_add_callback(STag_surfxml_prop_cb_list, &parse_properties);
+}
+
/* ************************************************************************** */
/* *************************** FULL ROUTING ********************************* */
@@ -1328,7 +1330,7 @@ static void model_full_set_route(routing_component_t rc, const char *src,
(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 exists", src,dst);
+ "The route between \"%s\" and \"%s\" already exists. If you are trying to define a reverse route, you must set the symmetrical=no attribute to your routes tags.", src,dst);
xbt_dynar_free(&link_route_to_test);
}
else
@@ -2225,6 +2227,15 @@ static void model_dijkstra_both_end(void)
unsigned int cursor2;
xbt_dynar_t nodes = NULL;
+ /* Create the topology graph */
+ if(!routing->route_graph)
+ routing->route_graph = xbt_graph_new_graph(1, NULL);
+ if(!routing->graph_node_map)
+ routing->graph_node_map = xbt_dict_new();
+
+ if (routing->cached && !routing->route_cache)
+ routing->route_cache = xbt_dict_new();
+
/* Add the loopback if needed */
if (current_routing->hierarchy == SURF_ROUTING_BASE)
add_loopback_dijkstra(routing);
@@ -2247,7 +2258,7 @@ static void model_dijkstra_both_set_route (routing_component_t rc, const char *s
dst_id = xbt_dict_get_or_null(rc->to_index, dst);
/* Create the topology graph */
- if(!routing->route_cache)
+ if(!routing->route_graph)
routing->route_graph = xbt_graph_new_graph(1, NULL);
if(!routing->graph_node_map)
routing->graph_node_map = xbt_dict_new();
@@ -3234,20 +3245,25 @@ static void generic_src_dst_check(routing_component_t rc, const char *src,
static void routing_parse_Sconfig(void)
{
- //TODO
- DEBUG0("WARNING tag config not yet implemented.");
- DEBUG1("Configuration name = %s",A_surfxml_config_id);
+ DEBUG1("START configuration name = %s",A_surfxml_config_id);
}
static void routing_parse_Econfig(void)
{
- //TODO
xbt_dict_cursor_t cursor = NULL;
+ xbt_cfgelm_t variable;
char *key;
char *elem;
+ char *cfg;
xbt_dict_foreach(current_property_set, cursor, key, elem) {
- DEBUG2("property : %s = %s",key,elem);
+ cfg = bprintf("%s:%s",key,elem);
+ variable = xbt_cfgelm_get(_surf_cfg_set, key, xbt_cfgelm_any);
+ if(variable->isdefault)
+ xbt_cfg_set_parse(_surf_cfg_set, cfg);
+ else
+ INFO1("The custom configuration '%s' is already define by user!",key);
}
+ DEBUG1("End configuration name = %s",A_surfxml_config_id);
}
static void routing_parse_Scluster(void)
@@ -3446,7 +3462,7 @@ static void routing_parse_Scluster(void)
SURFXML_START_TAG(link);
SURFXML_END_TAG(link);
- DEBUG3("", link_backbone,cluster_bw, cluster_lat);
+ DEBUG3("", link_backbone,cluster_bb_bw, cluster_bb_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)