X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/48dee806cd44787b186fd5ea7afe26d913568d46..e1d9c1d28c6bbf8c0ad26b067f8a67a5a36a7f63:/src/surf/surf_routing.c diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c index 9dc1bcc443..4b4858ac1d 100644 --- a/src/surf/surf_routing.c +++ b/src/surf/surf_routing.c @@ -62,6 +62,7 @@ static void model_none_unload(void); /* none routing model */ static void model_none_end(void); /* none routing model */ static void routing_parse_Scluster(void); /*cluster bypass */ +static void routing_parse_Speer(void); /*peer bypass */ static void routing_parse_Sconfig(void); /*config Tag */ static void routing_parse_Econfig(void); /*config Tag */ @@ -206,7 +207,7 @@ static double vivaldi_get_link_latency (routing_component_t rc, /** * \brief Add a "host" to the network element list */ -static void parse_S_host(char *host_id, char* coord) +static void parse_S_host(const char *host_id, const char* coord) { network_element_info_t info = NULL; if (current_routing->hierarchy == SURF_ROUTING_NULL) @@ -223,7 +224,7 @@ static void parse_S_host(char *host_id, char* coord) info->rc_component = current_routing; info->rc_type = SURF_NETWORK_ELEMENT_HOST; xbt_dict_set(global_routing->where_network_elements, host_id, - (void *) info, NULL); + (void *) info, xbt_free); if (strcmp(coord,"")) { xbt_dynar_t ctn = xbt_str_split_str(coord, " "); @@ -232,6 +233,17 @@ static void parse_S_host(char *host_id, char* coord) } } +static void parse_E_host(void) +{ + 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); + } +} + /* * \brief Add a host to the network element list from XML */ @@ -239,11 +251,15 @@ static void parse_S_host_XML(void) { parse_S_host(A_surfxml_host_id, A_surfxml_host_coordinates); } +static void parse_E_host_XML(void) +{ + parse_E_host(); +} /* * \brief Add a host to the network element list from lua script */ -static void parse_S_host_lua(char *host_id, char *coord) +static void parse_S_host_lua(const char *host_id, const char *coord) { parse_S_host(host_id, coord); } @@ -272,10 +288,12 @@ static void parse_S_router(void) info->rc_component = current_routing; info->rc_type = SURF_NETWORK_ELEMENT_ROUTER; xbt_dict_set(global_routing->where_network_elements, A_surfxml_router_id, - (void *) info, NULL); -#ifdef HAVE_TRACING - TRACE_surf_host_declaration(A_surfxml_router_id, 0); -#endif + (void *) info, xbt_free); + if (strcmp(A_surfxml_router_coordinates,"")) { + xbt_dynar_t ctn = xbt_str_split_str(A_surfxml_router_coordinates, " "); + xbt_dynar_shrink(ctn,0); + xbt_dict_set (coordinates,A_surfxml_router_id,ctn,NULL); + } } /** @@ -353,7 +371,7 @@ static void parse_S_bypassRoute_new_and_endpoints(void) /** * \brief Set a new link on the actual list of link for a route or ASroute */ -static void parse_E_link_ctn_new_elem(char *link_id) +static void parse_E_link_ctn_new_elem(const char *link_id) { char *val; val = xbt_strdup(link_id); @@ -383,7 +401,7 @@ static void parse_E_link_ctn_new_elem_XML(void) /** * \brief Set a new link on the actual list of link for a route or ASroute from lua */ -static void parse_E_link_c_ctn_new_elem_lua(char *link_id) +static void parse_E_link_c_ctn_new_elem_lua(const char *link_id) { parse_E_link_ctn_new_elem(link_id); } @@ -539,7 +557,7 @@ static void parse_S_AS_lua(char *id, char *mode) * When you finish to read the routing component, other structures must be created. * the "end" method allow to do that for any routing model type */ -static void parse_E_AS(char *AS_id) +static void parse_E_AS(const char *AS_id) { if (current_routing == NULL) { @@ -554,7 +572,7 @@ static void parse_E_AS(char *AS_id) info->rc_component = current_routing->routing_father; info->rc_type = SURF_NETWORK_ELEMENT_AS; xbt_dict_set(global_routing->where_network_elements, - current_routing->name, info, NULL); + current_routing->name, info, xbt_free); (*(current_routing->routing->unload)) (); (*(current_routing->routing->end)) (); current_routing = current_routing->routing_father; @@ -574,7 +592,7 @@ static void parse_E_AS_XML(void) /* * \brief Finish the creation of a new routing component from lua */ -static void parse_E_AS_lua(char *id) +static void parse_E_AS_lua(const char *id) { parse_E_AS(id); } @@ -743,7 +761,7 @@ static route_extended_t _get_route(const char *src, const char *dst) "bad gateway for route between \"%s\" and \"%s\"", src, dst); - if (src != e_route_cnt->src_gateway) { + if (strcmp(src, e_route_cnt->src_gateway)) { e_route_src = _get_route(src, e_route_cnt->src_gateway); xbt_assert2(e_route_src, "no route between \"%s\" and \"%s\"", src, e_route_cnt->src_gateway); @@ -756,7 +774,7 @@ static route_extended_t _get_route(const char *src, const char *dst) xbt_dynar_push(e_route->generic_route.link_list, &link); } - if (e_route_cnt->dst_gateway != dst) { + if (strcmp(e_route_cnt->dst_gateway, dst)) { e_route_dst = _get_route(e_route_cnt->dst_gateway, dst); xbt_assert2(e_route_dst, "no route between \"%s\" and \"%s\"", e_route_cnt->dst_gateway, dst); @@ -786,7 +804,7 @@ static double _get_latency(const char *src, const char *dst) xbt_assert0(src && dst, "bad parameters for \"_get_route\" method"); - route_extended_t e_route, e_route_cnt; + route_extended_t e_route_cnt; xbt_dynar_t elem_father_list = elements_father(src, dst); @@ -797,12 +815,6 @@ static double _get_latency(const char *src, const char *dst) routing_component_t dst_father = xbt_dynar_get_as(elem_father_list, 2, routing_component_t); - 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); - if (src_father == dst_father) { /* SURF_ROUTING_BASE */ if (strcmp(src, dst)) { @@ -832,8 +844,8 @@ static double _get_latency(const char *src, const char *dst) "bad gateway for route between \"%s\" and \"%s\"", src, dst); latency = - (*(common_father->get_latency)) (common_father, src_father->name, - dst_father->name); + (*(common_father->get_latency)) (common_father, e_route_cnt->src_gateway, + e_route_cnt->src_gateway); xbt_assert2(latency>=0, "no route between \"%s\" and \"%s\"", src_father->name, dst_father->name); @@ -875,14 +887,19 @@ static xbt_dynar_t get_route(const char *src, const char *dst) { route_extended_t e_route; - xbt_dynar_t elem_father_list = elements_father(src, dst); - routing_component_t common_father = - xbt_dynar_get_as(elem_father_list, 0, routing_component_t); + xbt_dynar_t elem_father_list = NULL; + routing_component_t common_father = NULL; if (strcmp(src, dst)) e_route = _get_route(src, dst); - else + else { + elem_father_list = elements_father(src, dst); + common_father = + xbt_dynar_get_as(elem_father_list, 0, routing_component_t); + e_route = (*(common_father->get_route)) (common_father, src, dst); + xbt_dynar_free(&elem_father_list); + } xbt_assert2(e_route, "no route between \"%s\" and \"%s\"", src, dst); @@ -896,7 +913,6 @@ static xbt_dynar_t get_route(const char *src, const char *dst) xbt_free(e_route->dst_gateway); xbt_free(e_route); - xbt_dynar_free(&elem_father_list); /* if (xbt_dynar_length(global_routing->last_route) == 0) @@ -938,6 +954,7 @@ static double get_latency(const char *src, const char *dst) latency = (*(common_father->get_latency)) (common_father, src, dst); xbt_assert2(latency>=0.0, "no route between \"%s\" and \"%s\"", src, dst); + xbt_dynar_free(&elem_father_list); return latency; } @@ -1058,6 +1075,7 @@ void routing_model_create(size_t size_of_links, void *loopback, double_f_cpvoid_ /* parse generic elements */ surfxml_add_callback(STag_surfxml_host_cb_list, &parse_S_host_XML); + surfxml_add_callback(ETag_surfxml_host_cb_list, &parse_E_host_XML); surfxml_add_callback(STag_surfxml_router_cb_list, &parse_S_router); surfxml_add_callback(STag_surfxml_route_cb_list, @@ -1083,10 +1101,17 @@ void routing_model_create(size_t size_of_links, void *loopback, double_f_cpvoid_ surfxml_add_callback(STag_surfxml_cluster_cb_list, &routing_parse_Scluster); + 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 } /* ************************************************************************** */ @@ -1303,8 +1328,8 @@ 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); - xbt_free(link_route_to_test); + "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 { @@ -1344,7 +1369,7 @@ static void model_full_set_route(routing_component_t rc, const char *src, (void*)link_route_to_test, (int_f_cpvoid_cpvoid_t) surf_pointer_resource_cmp), "The route between \"%s\" and \"%s\" already exists", src,dst); - xbt_free(link_route_to_test); + xbt_dynar_free(&link_route_to_test); } else { @@ -1839,9 +1864,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), @@ -1851,6 +1877,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; @@ -2199,11 +2226,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) @@ -2226,6 +2255,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(); @@ -2364,8 +2399,8 @@ static void model_rulebased_set_ASroute(routing_component_t rc, ruleroute_e->re_src_gateway = route->src_gateway; ruleroute_e->re_dst_gateway = route->dst_gateway; xbt_dynar_push(routing->list_ASroute, &ruleroute_e); - xbt_free(route->src_gateway); - xbt_free(route->dst_gateway); +// xbt_free(route->src_gateway); +// xbt_free(route->dst_gateway); xbt_free(route); } @@ -2643,7 +2678,7 @@ static void *model_rulebased_create(void) 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_latency = generic_get_link_latency; - new_component->generic_routing.get_bypass_route = generic_get_bypassroute; //rulebased_get_bypass_route; + new_component->generic_routing.get_bypass_route = rulebased_get_bypass_route; new_component->generic_routing.finalize = rulebased_finalize; /* initialization of internal structures */ new_component->dict_processing_units = xbt_dict_new(); @@ -2863,6 +2898,7 @@ static double generic_get_link_latency(routing_component_t rc, xbt_dynar_foreach(route->generic_route.link_list,i,link) { latency += get_link_latency(link); } + generic_free_extended_route(route); return latency; } @@ -3232,12 +3268,24 @@ static void routing_parse_Scluster(void) char *cluster_suffix = A_surfxml_cluster_suffix; char *cluster_radical = A_surfxml_cluster_radical; char *cluster_power = A_surfxml_cluster_power; + char *cluster_core = A_surfxml_cluster_core; char *cluster_bw = A_surfxml_cluster_bw; 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 *cluster_availability_file = A_surfxml_cluster_availability_file; + char *cluster_state_file = A_surfxml_cluster_state_file; char *host_id, *groups, *link_id = NULL; char *router_id, *link_router, *link_backbone; + char *availability_file = bprintf("%s",cluster_availability_file); + char *state_file = bprintf("%s",cluster_state_file); + + xbt_dict_t patterns = xbt_dict_new(); + xbt_dict_set(patterns,"id",cluster_id,NULL); + xbt_dict_set(patterns,"prefix",cluster_prefix,NULL); + xbt_dict_set(patterns,"suffix",cluster_suffix,NULL); + + #ifdef HAVE_PCRE_LIB char *route_src_dst; #endif @@ -3284,13 +3332,20 @@ static void routing_parse_Scluster(void) #endif link_id = bprintf("%s_link_%d", cluster_id, start); - DEBUG2("", host_id, cluster_power); + 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_core, cluster_core); SURFXML_BUFFER_SET(host_availability, "1.0"); - SURFXML_BUFFER_SET(host_availability_file, ""); - SURFXML_BUFFER_SET(host_state_file, ""); + xbt_dict_set(patterns,"radical",bprintf("%d",start),NULL); + availability_file = bprintf("%s",cluster_availability_file); + state_file = bprintf("%s",cluster_state_file); + DEBUG1("\tavailability_file=\"%s\"",xbt_str_varsubst(availability_file,patterns)); + DEBUG1("\tstate_file=\"%s\"",xbt_str_varsubst(state_file,patterns)); + SURFXML_BUFFER_SET(host_availability_file, xbt_str_varsubst(availability_file,patterns)); + SURFXML_BUFFER_SET(host_state_file, xbt_str_varsubst(state_file,patterns)); + DEBUG0(""); SURFXML_START_TAG(host); SURFXML_END_TAG(host); @@ -3319,7 +3374,6 @@ static void routing_parse_Scluster(void) surf_parse_get_int(&start, xbt_dynar_get_as(radical_ends, 0, char *)); surf_parse_get_int(&end, xbt_dynar_get_as(radical_ends, 1, char *)); - DEBUG2("Create hosts and links from %d to %d", start, end); for (i = start; i <= end; i++) { host_id = bprintf("%s%d%s", cluster_prefix, i, cluster_suffix); #ifndef HAVE_PCRE_LIB @@ -3327,13 +3381,20 @@ static void routing_parse_Scluster(void) #endif link_id = bprintf("%s_link_%d", cluster_id, i); - DEBUG2("", host_id, cluster_power); + DEBUG2(""); SURFXML_START_TAG(host); SURFXML_END_TAG(host); @@ -3542,6 +3603,9 @@ static void routing_parse_Scluster(void) free(link_backbone); free(link_router); + xbt_dict_free(&patterns); + free(availability_file); + free(state_file); DEBUG0(""); SURFXML_END_TAG(AS); @@ -3550,6 +3614,154 @@ static void routing_parse_Scluster(void) surfxml_bufferstack_pop(1); } +static void routing_parse_Speer(void) +{ + static int AX_ptr = 0; + + char *peer_id = A_surfxml_peer_id; + char *peer_power = A_surfxml_peer_power; + char *peer_bw_in = A_surfxml_peer_bw_in; + char *peer_bw_out = A_surfxml_peer_bw_out; + char *peer_lat = A_surfxml_peer_lat; + char *peer_coord = A_surfxml_peer_coordinates; + char *peer_state_file = A_surfxml_peer_state_file; + char *peer_availability_file = A_surfxml_peer_availability_file; + + char *host_id = NULL; + char *router_id, *link_router, *link_backbone, *link_id_up, *link_id_down; + +#ifdef HAVE_PCRE_LIB + +#endif + + int peer_sharing_policy = AX_surfxml_peer_sharing_policy; + +#ifndef HAVE_PCRE_LIB + //xbt_dynar_t tab_elements_num = xbt_dynar_new(sizeof(int), NULL); + //char *route_src, *route_dst; + //int j; +#endif + + static unsigned int surfxml_buffer_stack_stack_ptr = 1; + static unsigned int surfxml_buffer_stack_stack[1024]; + + surfxml_buffer_stack_stack[0] = 0; + + surfxml_bufferstack_push(1); + + SURFXML_BUFFER_SET(AS_id, peer_id); +#ifdef HAVE_PCRE_LIB + SURFXML_BUFFER_SET(AS_routing, "RuleBased"); + DEBUG1("", peer_id); +#else + SURFXML_BUFFER_SET(AS_routing, "Full"); + DEBUG1("", peer_id); +#endif + SURFXML_START_TAG(AS); + + DEBUG0(" "); + host_id = bprintf("peer_%s", peer_id); + router_id = bprintf("router_%s", peer_id); + link_id_up = bprintf("link_%s_up", peer_id); + link_id_down = bprintf("link_%s_down", peer_id); + + link_router = bprintf("%s_link_router", peer_id); + link_backbone = bprintf("%s_backbone", peer_id); + + DEBUG2("", host_id, peer_power); + A_surfxml_host_state = A_surfxml_host_state_ON; + SURFXML_BUFFER_SET(host_id, host_id); + SURFXML_BUFFER_SET(host_power, peer_power); + SURFXML_BUFFER_SET(host_availability, "1.0"); + SURFXML_BUFFER_SET(host_availability_file, peer_availability_file); + SURFXML_BUFFER_SET(host_state_file, peer_state_file); + SURFXML_START_TAG(host); + SURFXML_END_TAG(host); + + DEBUG2("", router_id, peer_coord); + SURFXML_BUFFER_SET(router_id, router_id); + SURFXML_BUFFER_SET(router_coordinates, peer_coord); + SURFXML_START_TAG(router); + SURFXML_END_TAG(router); + + DEBUG3("", link_id_up, peer_bw_in, peer_lat); + A_surfxml_link_state = A_surfxml_link_state_ON; + A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED; + if(peer_sharing_policy == A_surfxml_peer_sharing_policy_FULLDUPLEX) +{A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FULLDUPLEX;} + SURFXML_BUFFER_SET(link_id, link_id_up); + SURFXML_BUFFER_SET(link_bandwidth, peer_bw_in); + SURFXML_BUFFER_SET(link_latency, peer_lat); + SURFXML_BUFFER_SET(link_bandwidth_file, ""); + SURFXML_BUFFER_SET(link_latency_file, ""); + SURFXML_BUFFER_SET(link_state_file, ""); + SURFXML_START_TAG(link); + SURFXML_END_TAG(link); + + DEBUG3("", link_id_down, peer_bw_out, peer_lat); + A_surfxml_link_state = A_surfxml_link_state_ON; + A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED; + if(peer_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_down); + SURFXML_BUFFER_SET(link_bandwidth, peer_bw_out); + SURFXML_BUFFER_SET(link_latency, peer_lat); + SURFXML_BUFFER_SET(link_bandwidth_file, ""); + SURFXML_BUFFER_SET(link_latency_file, ""); + SURFXML_BUFFER_SET(link_state_file, ""); + SURFXML_START_TAG(link); + SURFXML_END_TAG(link); + + DEBUG0(" "); + + // begin here + DEBUG2(""); + SURFXML_BUFFER_SET(route_src, peer_id); + SURFXML_BUFFER_SET(route_dst, router_id); + A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_NO; + SURFXML_START_TAG(route); + + DEBUG1("", link_id_up); + SURFXML_BUFFER_SET(link_ctn_id, link_id_up); + A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE; + if(peer_sharing_policy == A_surfxml_peer_sharing_policy_FULLDUPLEX) + {A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_UP;} + SURFXML_START_TAG(link_ctn); + SURFXML_END_TAG(link_ctn); + + DEBUG0(""); + SURFXML_END_TAG(route); + + //Opposite Route + DEBUG2(""); + SURFXML_BUFFER_SET(route_src, router_id); + SURFXML_BUFFER_SET(route_dst, peer_id); + A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_NO; + SURFXML_START_TAG(route); + + DEBUG1("", link_id_down); + SURFXML_BUFFER_SET(link_ctn_id, link_id_down); + A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE; + if(peer_sharing_policy == A_surfxml_peer_sharing_policy_FULLDUPLEX) + {A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_DOWN;} + SURFXML_START_TAG(link_ctn); + SURFXML_END_TAG(link_ctn); + + DEBUG0(""); + SURFXML_END_TAG(route); + + DEBUG0(""); + SURFXML_END_TAG(AS); + DEBUG0(" "); + + //xbt_dynar_free(&tab_elements_num); + + surfxml_bufferstack_pop(1); +} + + /* * New methods to init the routing model component from the lua script */