X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/39b9e5b7c5a9642f2cf286a8b1a4e5a089741242..f780443504c3b73f0b9d1c58c6c5a21e2affce2d:/src/surf/surf_routing.c diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c index 387c0ddd8e..b053b28ea9 100644 --- a/src/surf/surf_routing.c +++ b/src/surf/surf_routing.c @@ -289,9 +289,6 @@ static void parse_S_router(void) info->rc_type = SURF_NETWORK_ELEMENT_ROUTER; xbt_dict_set(global_routing->where_network_elements, A_surfxml_router_id, (void *) info, xbt_free); -#ifdef HAVE_TRACING - TRACE_surf_host_declaration(A_surfxml_router_id, 0); -#endif if (strcmp(A_surfxml_router_coordinates,"")) { xbt_dynar_t ctn = xbt_str_split_str(A_surfxml_router_coordinates, " "); xbt_dynar_shrink(ctn,0); @@ -1056,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(); @@ -1107,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 ********************************* */ @@ -1331,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 @@ -1867,9 +1866,10 @@ static void route_new_dijkstra(routing_component_dijkstra_t rc, int src_id, int dst_id, route_extended_t e_route) { routing_component_dijkstra_t routing = (routing_component_dijkstra_t) rc; - + DEBUG2("Load Route from \"%d\" to \"%d\"", src_id, dst_id); xbt_node_t src = NULL; xbt_node_t dst = NULL; + graph_node_map_element_t src_elm = (graph_node_map_element_t) xbt_dict_get_or_null_ext(routing->graph_node_map, (char *) (&src_id), @@ -1879,6 +1879,7 @@ static void route_new_dijkstra(routing_component_dijkstra_t rc, int src_id, (char *) (&dst_id), sizeof(int)); + if (src_elm) src = src_elm->node; @@ -2227,11 +2228,13 @@ static void model_dijkstra_both_end(void) 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(); + routing->route_cache = xbt_dict_new(); /* Add the loopback if needed */ if (current_routing->hierarchy == SURF_ROUTING_BASE) @@ -2254,6 +2257,12 @@ static void model_dijkstra_both_set_route (routing_component_t rc, const char *s src_id = xbt_dict_get_or_null(rc->to_index, src); dst_id = xbt_dict_get_or_null(rc->to_index, dst); + /* 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(); @@ -3236,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) @@ -3448,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)