X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4055c3365c0644e74d06aa1dc70b2188166da41b..aea5cd54d7bc57803095a419ce5e9f1765634921:/src/surf/surf_routing.c?ds=sidebyside diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c index c2dbd83630..7839ddfb3f 100644 --- a/src/surf/surf_routing.c +++ b/src/surf/surf_routing.c @@ -12,7 +12,12 @@ #include "surf/surf_routing.h" #include "surf/surfxml_parse_values.h" +/** + * @ingroup SURF_build_api + * @brief A library containing all known workstations + */ xbt_lib_t host_lib; + int ROUTING_HOST_LEVEL; //Routing level int SURF_CPU_LEVEL; //Surf cpu level int SURF_WKS_LEVEL; //Surf workstation level @@ -22,6 +27,10 @@ int SD_HOST_LEVEL; //Simdag level int COORD_HOST_LEVEL=0; //Coordinates level int NS3_HOST_LEVEL; //host node for ns3 +/** + * @ingroup SURF_build_api + * @brief A library containing all known links + */ xbt_lib_t link_lib; int SD_LINK_LEVEL; //Simdag level int SURF_LINK_LEVEL; //Surf level @@ -34,21 +43,14 @@ int NS3_ASR_LEVEL; //host node for ns3 static xbt_dict_t random_value = NULL; -xbt_lib_t storage_lib; -int ROUTING_STORAGE_LEVEL; //Routing for storagelevel -int ROUTING_STORAGE_HOST_LEVEL; -int SURF_STORAGE_LEVEL; - -xbt_lib_t storage_type_lib; -int ROUTING_STORAGE_TYPE_LEVEL; //Routing for storage_type level - /* Global vars */ routing_global_t global_routing = NULL; AS_t current_routing = NULL; /* global parse functions */ xbt_dynar_t parsed_link_list = NULL; /* temporary store of current list link of a route */ -xbt_dynar_t mount_list = NULL; /* temporary store of current mount storage */ +extern xbt_dynar_t mount_list; + static const char *src = NULL; /* temporary store the source name of a route */ static const char *dst = NULL; /* temporary store the destination name of a route */ static char *gw_src = NULL; /* temporary store the gateway source name of a route */ @@ -86,7 +88,7 @@ struct s_model_type routing_models[] = { {"DijkstraCache", "Dijkstra routing data (fast initialization, fast lookup, small memory requirements, shortest path routing only)", model_dijkstracache_create, model_dijkstra_both_end}, - {"none", "No routing (usable with Constant network only)", + {"none", "No routing (Unless you know what you are doing, avoid using this mode in combination with a non Constant network model).", model_none_create, NULL}, {"RuleBased", "Rule-Based routing data (...)", model_rulebased_create, NULL}, @@ -228,8 +230,8 @@ static void routing_parse_S_bypassRoute(void) A_surfxml_bypassRoute_src, A_surfxml_bypassRoute_dst); src = A_surfxml_bypassRoute_src; dst = A_surfxml_bypassRoute_dst; - gw_src = A_surfxml_bypassRoute_gw_src; - gw_dst = A_surfxml_bypassRoute_gw_dst; + gw_src = NULL; + gw_dst = NULL; xbt_assert(strlen(src) > 0 || strlen(dst) > 0 || strlen(gw_src) > 0 || strlen(gw_dst) > 0, "Some limits are null in the route between \"%s\" and \"%s\"", @@ -237,6 +239,25 @@ static void routing_parse_S_bypassRoute(void) parsed_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref); } +/** + * \brief Set the end points for a bypassASroute + */ +static void routing_parse_S_bypassASroute(void) +{ + if (src != NULL && dst != NULL && parsed_link_list != NULL) + THROWF(arg_error, 0, + "Bypass AS Route between %s to %s can not be defined", + A_surfxml_bypassASroute_src, A_surfxml_bypassASroute_dst); + src = A_surfxml_bypassASroute_src; + dst = A_surfxml_bypassASroute_dst; + gw_src = A_surfxml_bypassASroute_gw_src; + gw_dst = A_surfxml_bypassASroute_gw_dst; + xbt_assert(strlen(src) > 0 || strlen(dst) > 0 || strlen(gw_src) > 0 + || strlen(gw_dst) > 0, + "Some limits are null in the route between \"%s\" and \"%s\"", + src, dst); + parsed_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref); +} /** * \brief Set a new link on the actual list of link for a route or ASroute from XML */ @@ -284,17 +305,20 @@ static void routing_parse_E_ASroute(void) route_t e_route = xbt_new0(s_route_t, 1); e_route->link_list = parsed_link_list; - if(!strcmp(current_routing->model_desc->name,"RuleBased")) { + if (!strcmp(current_routing->model_desc->name,"RuleBased")) { e_route->src_gateway = (network_element_t) gw_src; // DIRTY HACK possible only e_route->dst_gateway = (network_element_t) gw_dst; // because of what is in routing_parse_E_ASroute - } - else{ - e_route->src_gateway = ((network_element_t)xbt_lib_get_or_null(as_router_lib,gw_src,ROUTING_ASR_LEVEL)); - if(!e_route->src_gateway) - e_route->src_gateway = ((network_element_t)xbt_lib_get_or_null(host_lib,gw_src,ROUTING_HOST_LEVEL)); - e_route->dst_gateway = ((network_element_t)xbt_lib_get_or_null(as_router_lib,gw_dst,ROUTING_ASR_LEVEL)); - if(!e_route->dst_gateway) - e_route->dst_gateway = ((network_element_t)xbt_lib_get_or_null(host_lib,gw_dst,ROUTING_HOST_LEVEL)); + } else { + e_route->src_gateway = xbt_lib_get_or_null(as_router_lib, gw_src, + ROUTING_ASR_LEVEL); + if (!e_route->src_gateway) + e_route->src_gateway = xbt_lib_get_or_null(host_lib, gw_src, + ROUTING_HOST_LEVEL); + e_route->dst_gateway = xbt_lib_get_or_null(as_router_lib, gw_dst, + ROUTING_ASR_LEVEL); + if (!e_route->dst_gateway) + e_route->dst_gateway = xbt_lib_get_or_null(host_lib, gw_dst, + ROUTING_HOST_LEVEL); } xbt_assert(current_routing->parse_ASroute, "no defined method \"set_ASroute\" in \"%s\"", @@ -315,12 +339,35 @@ static void routing_parse_E_bypassRoute(void) { route_t e_route = xbt_new0(s_route_t, 1); e_route->link_list = parsed_link_list; - e_route->src_gateway = ((network_element_t)xbt_lib_get_or_null(as_router_lib,gw_src,ROUTING_ASR_LEVEL)); - if(!e_route->src_gateway) - e_route->src_gateway = ((network_element_t)xbt_lib_get_or_null(host_lib,gw_src,ROUTING_HOST_LEVEL)); - e_route->dst_gateway = ((network_element_t)xbt_lib_get_or_null(as_router_lib,gw_dst,ROUTING_ASR_LEVEL)); - if(!e_route->dst_gateway) - e_route->dst_gateway = ((network_element_t)xbt_lib_get_or_null(host_lib,gw_dst,ROUTING_HOST_LEVEL)); + + xbt_assert(current_routing->parse_bypassroute, + "Bypassing mechanism not implemented by routing '%s'", + current_routing->name); + + current_routing->parse_bypassroute(current_routing, src, dst, e_route); + parsed_link_list = NULL; + src = NULL; + dst = NULL; + gw_src = NULL; + gw_dst = NULL; +} +/** + * \brief Store the bypass route by calling the set_bypassroute function of the current routing component + */ +static void routing_parse_E_bypassASroute(void) +{ + route_t e_route = xbt_new0(s_route_t, 1); + e_route->link_list = parsed_link_list; + e_route->src_gateway = xbt_lib_get_or_null(as_router_lib, gw_src, + ROUTING_ASR_LEVEL); + if (!e_route->src_gateway) + e_route->src_gateway = xbt_lib_get_or_null(host_lib, gw_src, + ROUTING_HOST_LEVEL); + e_route->dst_gateway = xbt_lib_get_or_null(as_router_lib, gw_dst, + ROUTING_ASR_LEVEL); + if (!e_route->dst_gateway) + e_route->dst_gateway = xbt_lib_get_or_null(host_lib, gw_dst, + ROUTING_HOST_LEVEL); xbt_assert(current_routing->parse_bypassroute, "Bypassing mechanism not implemented by routing '%s'", current_routing->name); @@ -473,8 +520,10 @@ static void elements_father(network_element_t src, network_element_t dst, network_element_t dst_data = dst; src_as = src_data->rc_component; dst_as = dst_data->rc_component; +#ifndef NDEBUG char* src_name = src_data->name; char* dst_name = dst_data->name; +#endif xbt_assert(src_as && dst_as, "Ask for route \"from\"(%s) or \"to\"(%s) no found", src_name, dst_name); @@ -539,35 +588,30 @@ static void _get_route_and_latency(network_element_t src, network_element_t dst, XBT_DEBUG("elements_father: common father '%s' src_father '%s' dst_father '%s'", common_father->name,src_father->name,dst_father->name); - /* If src and dst are in the same AS, life is good */ - if (src_father == dst_father) { /* SURF_ROUTING_BASE */ - - route.link_list = *links; + /* Check whether a direct bypass is defined */ + route_t e_route_bypass = NULL; + if (common_father->get_bypass_route) + e_route_bypass = common_father->get_bypass_route(common_father, src, dst, latency); - common_father->get_route_and_latency(common_father, src, dst, &route,latency); + /* Common ancestor is kind enough to declare a bypass route from src to dst -- use it and bail out */ + if (e_route_bypass) { + xbt_dynar_merge(links,&(e_route_bypass->link_list)); + generic_free_route(e_route_bypass); return; } - /* If we are here, src and dst are not in the same AS; check whether a direct bypass is defined */ - - route_t e_route_bypass = NULL; - if (common_father->get_bypass_route) - e_route_bypass = common_father->get_bypass_route(common_father, src, dst); + /* If src and dst are in the same AS, life is good */ + if (src_father == dst_father) { /* SURF_ROUTING_BASE */ - if (e_route_bypass) { /* Common ancestor is kind enough to declare a bypass route from src to dst -- use it and bail out */ - if (latency) - xbt_die("Bypass cannot work yet with get_latency"); // FIXME: get_bypass_route should update the latency itself, just like get_route + route.link_list = *links; -// // FIXME this path is never tested. I need examples to check the bypass mechanism... -// THROW_UNIMPLEMENTED; // let's warn the users of the problem - xbt_dynar_merge(links,&(e_route_bypass->link_list)); - generic_free_route(e_route_bypass); + common_father->get_route_and_latency(common_father, src, dst, &route,latency); return; } /* Not in the same AS, no bypass. We'll have to find our path between the ASes recursively*/ - route.link_list = xbt_dynar_new(global_routing->size_of_link, NULL); + route.link_list = xbt_dynar_new(sizeof(sg_routing_link_t), NULL); // Find the net_card corresponding to father network_element_t src_father_net_elm = src_father->net_elem; network_element_t dst_father_net_elm = dst_father->net_elem; @@ -581,14 +625,14 @@ static void _get_route_and_latency(network_element_t src, network_element_t dst, network_element_t dst_gateway_net_elm = route.dst_gateway; /* If source gateway is not our source, we have to recursively find our way up to this point */ - if (strcmp(src->name, src_gateway_net_elm->name)) + if (src != src_gateway_net_elm) _get_route_and_latency(src, src_gateway_net_elm, links, latency); xbt_dynar_merge(links,&(route.link_list)); /* If dest gateway is not our destination, we have to recursively find our way from this point */ // FIXME why can't I factorize it the same way than [src;src_gw] without breaking the examples?? - if (strcmp(dst_gateway_net_elm->name, dst->name)) { + if (dst_gateway_net_elm != dst) { _get_route_and_latency(dst_gateway_net_elm, dst, links, latency); } xbt_dynar_free(&route.link_list); @@ -608,9 +652,11 @@ static void _get_route_and_latency(network_element_t src, network_element_t dst, * walk through the routing components tree and find a route between hosts * by calling the differents "get_route" functions in each routing component. */ -void routing_get_route_and_latency(network_element_t src, network_element_t dst, +void routing_get_route_and_latency(network_element_t src, + network_element_t dst, xbt_dynar_t * route, double *latency) { + XBT_DEBUG("routing_get_route_and_latency from %s to %s",src->name,dst->name); if (!*route) { xbt_dynar_reset(global_routing->last_route); *route = global_routing->last_route; @@ -668,15 +714,14 @@ e_surf_network_element_type_t routing_get_network_element_type(const char *name) * * Make a global routing structure and set all the parsing functions. */ -void routing_model_create(size_t size_of_links, void *loopback) +void routing_model_create( void *loopback) { /* config the uniq global routing */ global_routing = xbt_new0(s_routing_global_t, 1); global_routing->root = NULL; global_routing->get_onelink_routes = get_onelink_routes; global_routing->loopback = loopback; - global_routing->size_of_link = size_of_links; - global_routing->last_route = xbt_dynar_new(global_routing->size_of_link,NULL); + global_routing->last_route = xbt_dynar_new(sizeof(sg_routing_link_t),NULL); /* no current routing at moment */ current_routing = NULL; } @@ -728,89 +773,6 @@ void routing_model_create(size_t size_of_links, void *loopback) /* ************************************************************************** */ /* ************************* GENERIC PARSE FUNCTIONS ************************ */ -static void routing_parse_storage(sg_platf_storage_cbarg_t storage) -{ - xbt_assert(!xbt_lib_get_or_null(storage_lib, storage->id,ROUTING_STORAGE_LEVEL), - "Reading a storage, processing unit \"%s\" already exists", storage->id); - - // Verification of an existing type_id - void* storage_type = xbt_lib_get_or_null(storage_type_lib, storage->type_id,ROUTING_STORAGE_TYPE_LEVEL); - xbt_assert(storage_type,"Reading a storage, type id \"%s\" does not exists", storage->type_id); - - XBT_DEBUG("ROUTING Create a storage name '%s' with type_id '%s'", - storage->id, - storage->type_id); - - xbt_lib_set(storage_lib, - storage->id, - ROUTING_STORAGE_LEVEL, - (void *) xbt_strdup(storage->type_id)); -} -static void routing_parse_storage_type(sg_platf_storage_type_cbarg_t storage_type) -{ - xbt_assert(!xbt_lib_get_or_null(storage_type_lib, storage_type->id,ROUTING_STORAGE_TYPE_LEVEL), - "Reading a storage type, processing unit \"%s\" already exists", storage_type->id); - - storage_type_t stype = xbt_new0(s_storage_type_t, 1); - stype->model = xbt_strdup(storage_type->model); - stype->properties = storage_type->properties; - stype->content = xbt_strdup(storage_type->content); - stype->type_id = xbt_strdup(storage_type->id); - - XBT_DEBUG("ROUTING Create a storage type id '%s' with model '%s' content '%s' and properties '%p'", - stype->type_id, - stype->model, - stype->content, - stype->properties); - - xbt_lib_set(storage_type_lib, - stype->type_id, - ROUTING_STORAGE_TYPE_LEVEL, - (void *) stype); -} -static void routing_parse_mstorage(sg_platf_mstorage_cbarg_t mstorage) -{ - THROW_UNIMPLEMENTED; -// mount_t mnt = xbt_new0(s_mount_t, 1); -// mnt->id = xbt_strdup(mstorage->type_id); -// mnt->name = xbt_strdup(mstorage->name); -// -// if(!mount_list){ -// XBT_DEBUG("Creata a Mount list for %s",A_surfxml_host_id); -// mount_list = xbt_dynar_new(sizeof(char *), NULL); -// } -// xbt_dynar_push(mount_list,(void *) mnt); -// free(mnt->id); -// free(mnt->name); -// xbt_free(mnt); -// XBT_DEBUG("ROUTING Mount a storage name '%s' with type_id '%s'",mstorage->name, mstorage->id); -} - -static void mount_free(void *p) -{ - mount_t mnt = p; - xbt_free(mnt->name); -} - -static void routing_parse_mount(sg_platf_mount_cbarg_t mount) -{ - // Verification of an existing storage - void* storage = xbt_lib_get_or_null(storage_lib, mount->id,ROUTING_STORAGE_LEVEL); - xbt_assert(storage,"Disk id \"%s\" does not exists", mount->id); - - XBT_DEBUG("ROUTING Mount '%s' on '%s'",mount->id, mount->name); - - s_mount_t mnt; - mnt.id = surf_storage_resource_by_name(mount->id); - mnt.name = xbt_strdup(mount->name); - - if(!mount_list){ - XBT_DEBUG("Create a Mount list for %s",A_surfxml_host_id); - mount_list = xbt_dynar_new(sizeof(s_mount_t), mount_free); - } - xbt_dynar_push(mount_list,&mnt); -} - static void routing_parse_cluster(sg_platf_cluster_cbarg_t cluster) { char *host_id, *groups, *link_id = NULL; @@ -1218,6 +1180,8 @@ void routing_register_callbacks() surfxml_add_callback(STag_surfxml_ASroute_cb_list, &routing_parse_S_ASroute); surfxml_add_callback(STag_surfxml_bypassRoute_cb_list, &routing_parse_S_bypassRoute); + surfxml_add_callback(STag_surfxml_bypassASroute_cb_list, + &routing_parse_S_bypassASroute); surfxml_add_callback(ETag_surfxml_link_ctn_cb_list, &routing_parse_link_ctn); @@ -1225,17 +1189,14 @@ void routing_register_callbacks() surfxml_add_callback(ETag_surfxml_ASroute_cb_list, &routing_parse_E_ASroute); surfxml_add_callback(ETag_surfxml_bypassRoute_cb_list, &routing_parse_E_bypassRoute); + surfxml_add_callback(ETag_surfxml_bypassASroute_cb_list, + &routing_parse_E_bypassASroute); sg_platf_cluster_add_cb(routing_parse_cluster); sg_platf_peer_add_cb(routing_parse_peer); sg_platf_postparse_add_cb(routing_parse_postparse); - sg_platf_storage_add_cb(routing_parse_storage); - sg_platf_mstorage_add_cb(routing_parse_mstorage); - sg_platf_storage_type_add_cb(routing_parse_storage_type); - sg_platf_mount_add_cb(routing_parse_mount); - /* we care about the ASes while parsing the platf. Incredible, isnt it? */ sg_platf_AS_end_add_cb(routing_AS_end); sg_platf_AS_begin_add_cb(routing_AS_begin);