X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/792ee50ee3c72fbd12a6693dda4b5792844b50ab..3c072dea92bbf0e4df46b1d8d56cd62e68883b33:/src/surf/surf_routing.c diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c index 00356453a3..84a21f6fa8 100644 --- a/src/surf/surf_routing.c +++ b/src/surf/surf_routing.c @@ -14,6 +14,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route,surf,"Routing part of surf"); routing_t used_routing = NULL; +xbt_dict_t onelink_routes = NULL; /* Prototypes of each model */ static void routing_model_full_create(size_t size_of_link,void *loopback); @@ -65,8 +66,18 @@ typedef struct { #define ROUTE_FULL(i,j) ((routing_full_t)used_routing)->routing_table[(i)+(j)*(used_routing)->host_count] #define HOST2ROUTER(id) ((id)+(2<<29)) -#define ROUTER2HOST(id) ((id)-(2>>20)) -#define ROUTER(id) ((id)>=(2<<29)) +#define ROUTER2HOST(id) ((id)-(2>>29)) +#define ISROUTER(id) ((id)>=(2<<29)) + +/* + * Free the onelink routes + */ +static void onelink_route_elem_free(void *e) { + s_onelink_t tmp = (s_onelink_t)e; + if(tmp) { + free(tmp); + } +} /* * Parsing @@ -156,7 +167,9 @@ static void routing_full_parse_Scluster(void) surfxml_bufferstack_push(1); - /* Make set */ + /* Make set a set to parse the prefix/suffix/radical into a neat list of names */ + DEBUG4("Make ", + cluster_id,cluster_prefix,cluster_suffix,cluster_radical); SURFXML_BUFFER_SET(set_id, cluster_id); SURFXML_BUFFER_SET(set_prefix, cluster_prefix); SURFXML_BUFFER_SET(set_suffix, cluster_suffix); @@ -165,27 +178,26 @@ static void routing_full_parse_Scluster(void) SURFXML_START_TAG(set); SURFXML_END_TAG(set); - /* Make foreach */ - SURFXML_BUFFER_SET(foreach_set_id, cluster_id); - - SURFXML_START_TAG(foreach); - - /* Make host for the foreach */ - routing_full_parse_change_cpu_data("$1", cluster_power, "1.0", "", ""); - A_surfxml_host_state = A_surfxml_host_state_ON; + xbt_dynar_t names = xbt_dict_get(set_list,cluster_id); - SURFXML_START_TAG(host); - SURFXML_END_TAG(host); + unsigned int it1,it2; + char *name1,*name2; + xbt_dynar_foreach(names,it1,name1) { + /* create the host */ + routing_full_parse_change_cpu_data(name1, cluster_power, "1.0", "", ""); + A_surfxml_host_state = A_surfxml_host_state_ON; - /* Make link for the foreach */ - routing_full_parse_change_link_data("$1", 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_START_TAG(host); + SURFXML_END_TAG(host); - SURFXML_START_TAG(link); - SURFXML_END_TAG(link); + /* Here comes the link */ + routing_full_parse_change_link_data(name1, 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_END_TAG(foreach); + SURFXML_START_TAG(link); + SURFXML_END_TAG(link); + } /* Make backbone link */ backbone_name = bprintf("%s_bb", cluster_id); @@ -197,11 +209,53 @@ static void routing_full_parse_Scluster(void) SURFXML_START_TAG(link); SURFXML_END_TAG(link); + /* And now the internal routes */ + xbt_dynar_foreach(names,it1,name1) { + xbt_dynar_foreach(names,it2,name2) { + if (strcmp(name1,name2)) { + A_surfxml_route_action = A_surfxml_route_action_POSTPEND; + SURFXML_BUFFER_SET(route_src,name1); + SURFXML_BUFFER_SET(route_dst,name2); + SURFXML_START_TAG(route); { + /* FIXME: name1 link is added by error about 20 lines below, so don't add it here + SURFXML_BUFFER_SET(link_c_ctn_id, name1); + SURFXML_START_TAG(link_c_ctn); + SURFXML_END_TAG(link_c_ctn); + */ + SURFXML_BUFFER_SET(link_c_ctn_id, backbone_name); + SURFXML_START_TAG(link_c_ctn); + SURFXML_END_TAG(link_c_ctn); + + SURFXML_BUFFER_SET(link_c_ctn_id, name2); + SURFXML_START_TAG(link_c_ctn); + SURFXML_END_TAG(link_c_ctn); + + } SURFXML_END_TAG(route); + } + } + } + /* Make route multi with the outside world, i.e. cluster->$* */ + + /* FIXME + * This also adds an elements to the routes within the cluster, + * and I guess it's wrong, but since this element is commented out in the above + * code creating the internal routes, we're good. + * To fix it, I'd say that we need a way to understand "$*-${cluster_id}" as "whole world, but the guys in that cluster" + * But for that, we need to install a real expression parser for src/dst attributes + * + * FIXME + * This also adds a dumb element (the private link) in place of the loopback. Then, since + * the loopback is added only if no link to self already exist, this fails. + * That's really dumb. + * + * FIXME + * It seems to me that it does not add the backbone to the path to outside world... + */ SURFXML_BUFFER_SET(route_c_multi_src, cluster_id); SURFXML_BUFFER_SET(route_c_multi_dst, "$*"); A_surfxml_route_c_multi_symmetric = A_surfxml_route_c_multi_symmetric_NO; - A_surfxml_route_c_multi_action = A_surfxml_route_c_multi_action_OVERRIDE; + A_surfxml_route_c_multi_action = A_surfxml_route_c_multi_action_PREPEND; SURFXML_START_TAG(route_c_multi); @@ -212,21 +266,6 @@ static void routing_full_parse_Scluster(void) SURFXML_END_TAG(route_c_multi); - /* Make route multi between cluster hosts, i.e. cluster->cluster */ - SURFXML_BUFFER_SET(route_c_multi_src, cluster_id); - SURFXML_BUFFER_SET(route_c_multi_dst, cluster_id); - A_surfxml_route_c_multi_action = A_surfxml_route_c_multi_action_POSTPEND; - A_surfxml_route_c_multi_symmetric = A_surfxml_route_c_multi_symmetric_NO; - - SURFXML_START_TAG(route_c_multi); - - SURFXML_BUFFER_SET(link_c_ctn_id, backbone_name); - - SURFXML_START_TAG(link_c_ctn); - SURFXML_END_TAG(link_c_ctn); - - SURFXML_END_TAG(route_c_multi); - free(backbone_name); /* Restore buff */ @@ -263,7 +302,17 @@ static void routing_full_parse_end(void) { dst_id = strtol(xbt_dynar_get_as(keys, 1, char *), &end, 16); xbt_dynar_free(&keys); - if(ROUTER(src_id) || ROUTER(dst_id)) { + if(xbt_dynar_length(links) == 1){ + s_onelink_t new_link = (s_onelink_t) xbt_malloc0(sizeof(s_onelink)); + new_link->src_id = src_id; + new_link->dst_id = dst_id; + link_name = xbt_dynar_getfirst_as(links, char*); + new_link->link_ptr = xbt_dict_get_or_null(surf_network_model->resource_set, link_name); + DEBUG3("Adding onelink route from (#%d) to (#%d), link_name %s",src_id, dst_id, link_name); + xbt_dict_set(onelink_routes, link_name, (void *)new_link, onelink_route_elem_free); + } + + if(ISROUTER(src_id) || ISROUTER(dst_id)) { DEBUG2("There is route with a router here: (%d ,%d)",src_id,dst_id); /* Check there is only one link in the route and store the information */ continue; @@ -295,9 +344,18 @@ static void routing_full_parse_end(void) { * Business methods */ static xbt_dynar_t routing_full_get_route(int src,int dst) { + xbt_assert0(!(ISROUTER(src) || ISROUTER(dst)), "Ask for route \"from\" or \"to\" a router node"); return ROUTE_FULL(src,dst); } +static xbt_dict_t routing_full_get_onelink_routes(void){ + return onelink_routes; +} + +static int routing_full_is_router(int id){ + return ISROUTER(id); +} + static void routing_full_finalize(void) { routing_full_t routing = (routing_full_t)used_routing; int i,j; @@ -319,13 +377,19 @@ static void routing_model_full_create(size_t size_of_link,void *loopback) { routing->generic_routing.name = "Full"; routing->generic_routing.host_count = 0; routing->generic_routing.get_route = routing_full_get_route; + routing->generic_routing.get_onelink_routes = routing_full_get_onelink_routes; + routing->generic_routing.is_router = routing_full_is_router; routing->generic_routing.finalize = routing_full_finalize; + routing->size_of_link = size_of_link; routing->loopback = loopback; /* Set it in position */ used_routing = (routing_t) routing; + /* Set the dict for onehop routes */ + onelink_routes = xbt_dict_new(); + /* Setup the parsing callbacks we need */ routing->generic_routing.host_id = xbt_dict_new(); surfxml_add_callback(STag_surfxml_host_cb_list, &routing_full_parse_Shost); @@ -536,6 +600,14 @@ static void routing_floyd_finalize(void) { } } +static xbt_dict_t routing_floyd_get_onelink_routes(void){ + xbt_assert0(0,"The get_onelink_routes feature is not supported in routing model Floyd"); +} + +static int routing_floyd_is_router(int id){ + xbt_assert0(0,"The get_is_router feature is not supported in routing model Floyd"); +} + static void routing_model_floyd_create(size_t size_of_link,void *loopback) { /* initialize our structure */ routing_floyd_t routing = xbt_new0(s_routing_floyd_t,1); @@ -543,6 +615,8 @@ static void routing_model_floyd_create(size_t size_of_link,void *loopback) { routing->generic_routing.host_count = 0; routing->generic_routing.host_id = xbt_dict_new(); routing->generic_routing.get_route = routing_floyd_get_route; + routing->generic_routing.get_onelink_routes = routing_floyd_get_onelink_routes; + routing->generic_routing.is_router = routing_floyd_is_router; routing->generic_routing.finalize = routing_floyd_finalize; routing->size_of_link = size_of_link; routing->loopback = loopback; @@ -883,6 +957,14 @@ static void routing_dijkstra_finalize(void) { } } +static xbt_dict_t routing_dijkstraboth_get_onelink_routes(void){ + xbt_assert0(0,"The get_onelink_routes feature is not supported in routing model dijkstraboth"); +} + +static int routing_dijkstraboth_is_router(int id){ + xbt_assert0(0,"The get_is_router feature is not supported in routing model dijkstraboth"); +} + /* * */ @@ -892,6 +974,8 @@ static void routing_model_dijkstraboth_create(size_t size_of_link,void *loopback routing->generic_routing.name = "Dijkstra"; routing->generic_routing.host_count = 0; routing->generic_routing.get_route = routing_dijkstra_get_route; + routing->generic_routing.get_onelink_routes = routing_dijkstraboth_get_onelink_routes; + routing->generic_routing.is_router = routing_dijkstraboth_is_router; routing->generic_routing.finalize = routing_dijkstra_finalize; routing->size_of_link = size_of_link; routing->loopback = loopback; @@ -921,6 +1005,7 @@ static void routing_model_dijkstracache_create(size_t size_of_link,void *loopbac /* ************************************************** */ /* ********** NO ROUTING **************************** */ + static void routing_none_finalize(void) { if (used_routing) { xbt_dict_free(&used_routing->host_id); @@ -935,7 +1020,10 @@ static void routing_model_none_create(size_t size_of_link,void *loopback) { routing->name = "none"; routing->host_count = 0; routing->host_id = xbt_dict_new(); + routing->get_onelink_routes = NULL; + routing->is_router = NULL; routing->get_route = NULL; + routing->finalize = routing_none_finalize; /* Set it in position */