X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e9969d7016d2fdfc32e95b14472d2b7c78653acb..9687670d5440f10286a0dbc5aab95bb4eb9b6138:/src/surf/surf_routing.cpp diff --git a/src/surf/surf_routing.cpp b/src/surf/surf_routing.cpp index 60fcd0fc8f..47fbded489 100644 --- a/src/surf/surf_routing.cpp +++ b/src/surf/surf_routing.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2009, 2010, 2011, 2013. The SimGrid Team. +/* Copyright (c) 2009-2011, 2013-2014. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -7,39 +7,30 @@ #include "surf_routing.hpp" #include "surf_routing_private.hpp" #include "surf_routing_cluster.hpp" +#include "surf_routing_cluster_torus.hpp" +#include "surf_routing_cluster_fat_tree.hpp" #include "simgrid/platf_interface.h" // platform creation API internal interface #include "simgrid/sg_config.h" +#include "storage_interface.hpp" #include "surf/surfxml_parse_values.h" + /** * @ingroup SURF_build_api - * @brief A library containing all known workstations + * @brief A library containing all known hosts */ 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 -int SIMIX_HOST_LEVEL; //Simix host level +int SURF_HOST_LEVEL; //Surf host level int SIMIX_STORAGE_LEVEL; //Simix storage level -int MSG_HOST_LEVEL; //Msg host level int MSG_STORAGE_LEVEL; //Msg storage level -int SD_HOST_LEVEL; //Simdag host level +int MSG_FILE_LEVEL; //Msg file level int SD_STORAGE_LEVEL; //Simdag storage 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 -int NS3_LINK_LEVEL; //link for ns3 - xbt_lib_t as_router_lib; int ROUTING_ASR_LEVEL; //Routing level int COORD_ASR_LEVEL; //Coordinates level @@ -51,10 +42,11 @@ static xbt_dict_t random_value = NULL; /** @brief Retrieve a routing edge from its name * - * Routing edges are either CPU/workstation and routers, whatever + * Routing edges are either host and routers, whatever */ RoutingEdgePtr sg_routing_edge_by_name_or_null(const char *name) { - RoutingEdgePtr net_elm = (RoutingEdgePtr) xbt_lib_get_or_null(host_lib, name, ROUTING_HOST_LEVEL); + sg_host_t h = sg_host_by_name(name); + RoutingEdgePtr net_elm = h==NULL?NULL: sg_host_edge(h); if (!net_elm) net_elm = (RoutingEdgePtr) xbt_lib_get_or_null(as_router_lib, name, ROUTING_ASR_LEVEL); return net_elm; @@ -82,7 +74,9 @@ typedef enum { SURF_MODEL_DIJKSTRACACHE, SURF_MODEL_NONE, SURF_MODEL_VIVALDI, - SURF_MODEL_CLUSTER + SURF_MODEL_CLUSTER, + SURF_MODEL_TORUS_CLUSTER, + SURF_MODEL_FAT_TREE_CLUSTER, } e_routing_types; struct s_model_type routing_models[] = { @@ -104,6 +98,10 @@ struct s_model_type routing_models[] = { model_vivaldi_create, NULL}, {"Cluster", "Cluster routing", model_cluster_create, NULL}, + {"Torus_Cluster", "Torus Cluster routing", + model_torus_cluster_create, NULL}, + {"Fat_Tree_Cluster", "Fat Tree Cluster routing", + model_fat_tree_cluster_create, NULL}, {NULL, NULL, NULL, NULL} }; @@ -112,15 +110,15 @@ struct s_model_type routing_models[] = { */ static void parse_S_host_link(sg_platf_host_link_cbarg_t host) { - RoutingEdgePtr info = static_cast(xbt_lib_get_or_null(host_lib, host->id, ROUTING_HOST_LEVEL)); + RoutingEdgePtr info = sg_host_edge(sg_host_by_name(host->id)); xbt_assert(info, "Host '%s' not found!", host->id); xbt_assert(current_routing->p_modelDesc == &routing_models[SURF_MODEL_CLUSTER] || current_routing->p_modelDesc == &routing_models[SURF_MODEL_VIVALDI], "You have to be in model Cluster to use tag host_link!"); s_surf_parsing_link_up_down_t link_up_down; - link_up_down.link_up = xbt_lib_get_or_null(link_lib, host->link_up, SURF_LINK_LEVEL); - link_up_down.link_down = xbt_lib_get_or_null(link_lib, host->link_down, SURF_LINK_LEVEL); + link_up_down.link_up = Link::byName(host->link_up); + link_up_down.link_down = Link::byName(host->link_down); xbt_assert(link_up_down.link_up, "Link '%s' not found!",host->link_up); xbt_assert(link_up_down.link_down, "Link '%s' not found!",host->link_down); @@ -129,12 +127,12 @@ static void parse_S_host_link(sg_platf_host_link_cbarg_t host) current_routing->p_linkUpDownList = xbt_dynar_new(sizeof(s_surf_parsing_link_up_down_t),NULL); // If dynar is is greater than edge id and if the host_link is already defined - if((int)xbt_dynar_length(current_routing->p_linkUpDownList) > info->m_id && - xbt_dynar_get_as(current_routing->p_linkUpDownList, info->m_id, void*)) - xbt_die("Host_link for '%s' is already defined!",host->id); + if((int)xbt_dynar_length(current_routing->p_linkUpDownList) > info->getId() && + xbt_dynar_get_as(current_routing->p_linkUpDownList, info->getId(), void*)) + surf_parse_error("Host_link for '%s' is already defined!",host->id); - XBT_DEBUG("Push Host_link for host '%s' to position %d", info->p_name, info->m_id); - xbt_dynar_set_as(current_routing->p_linkUpDownList, info->m_id, s_surf_parsing_link_up_down_t, link_up_down); + XBT_DEBUG("Push Host_link for host '%s' to position %d", info->getName(), info->getId()); + xbt_dynar_set_as(current_routing->p_linkUpDownList, info->getId(), s_surf_parsing_link_up_down_t, link_up_down); } /** @@ -144,16 +142,16 @@ static void parse_S_host(sg_platf_host_cbarg_t host) { if (current_routing->p_hierarchy == SURF_ROUTING_NULL) current_routing->p_hierarchy = SURF_ROUTING_BASE; - xbt_assert(!xbt_lib_get_or_null(host_lib, host->id, ROUTING_HOST_LEVEL), - "Reading a host, processing unit \"%s\" already exists", host->id); + xbt_assert(!sg_host_by_name(host->id), + "Reading a host, processing unit \"%s\" already exists", host->id); - RoutingEdgePtr info = new RoutingEdge(); - info->p_rcComponent = current_routing; - info->p_rcType = SURF_NETWORK_ELEMENT_HOST; - info->p_name = xbt_strdup(host->id); - info->m_id = current_routing->parsePU(info); - xbt_lib_set(host_lib, host->id, ROUTING_HOST_LEVEL, (void *) info); - XBT_DEBUG("Having set name '%s' id '%d'", host->id, info->m_id); + RoutingEdgePtr info = new RoutingEdgeImpl(xbt_strdup(host->id), + -1, + SURF_NETWORK_ELEMENT_HOST, + current_routing); + info->setId(current_routing->parsePU(info)); + sg_host_edge_set(sg_host_by_name_or_create(host->id), info); + XBT_DEBUG("Having set name '%s' id '%d'", host->id, info->getId()); if(mount_list){ xbt_lib_set(storage_lib, host->id, ROUTING_STORAGE_HOST_LEVEL, (void *) mount_list); @@ -191,13 +189,13 @@ static void parse_S_router(sg_platf_router_cbarg_t router) "Reading a router, processing unit \"%s\" already exists", router->id); - RoutingEdgePtr info = new RoutingEdge(); - info->p_rcComponent = current_routing; - info->p_rcType = SURF_NETWORK_ELEMENT_ROUTER; - info->p_name = xbt_strdup(router->id); - info->m_id = current_routing->parsePU(info); + RoutingEdgePtr info = new RoutingEdgeImpl(xbt_strdup(router->id), + -1, + SURF_NETWORK_ELEMENT_ROUTER, + current_routing); + info->setId(current_routing->parsePU(info)); xbt_lib_set(as_router_lib, router->id, ROUTING_ASR_LEVEL, (void *) info); - XBT_DEBUG("Having set name '%s' id '%d'", router->id, info->m_id); + XBT_DEBUG("Having set name '%s' id '%d'", router->id, info->getId()); if (router->coord && strcmp(router->coord, "")) { unsigned int cursor; @@ -313,7 +311,7 @@ static void routing_parse_trace_connect(sg_platf_trace_connect_cbarg_t trace_con xbt_strdup(trace_connect->element), NULL); break; default: - xbt_die("Cannot connect trace %s to %s: kind of trace unknown", + surf_parse_error("Cannot connect trace %s to %s: kind of trace unknown", trace_connect->trace, trace_connect->element); break; } @@ -347,13 +345,15 @@ void routing_AS_begin(sg_platf_AS_cbarg_t AS) /* search the routing model */ switch(AS->routing){ - case A_surfxml_AS_routing_Cluster: model = &routing_models[SURF_MODEL_CLUSTER];break; - case A_surfxml_AS_routing_Dijkstra: model = &routing_models[SURF_MODEL_DIJKSTRA];break; - case A_surfxml_AS_routing_DijkstraCache: model = &routing_models[SURF_MODEL_DIJKSTRACACHE];break; - case A_surfxml_AS_routing_Floyd: model = &routing_models[SURF_MODEL_FLOYD];break; - case A_surfxml_AS_routing_Full: model = &routing_models[SURF_MODEL_FULL];break; - case A_surfxml_AS_routing_None: model = &routing_models[SURF_MODEL_NONE];break; - case A_surfxml_AS_routing_Vivaldi: model = &routing_models[SURF_MODEL_VIVALDI];break; + case A_surfxml_AS_routing_Cluster: model = &routing_models[SURF_MODEL_CLUSTER];break; + case A_surfxml_AS_routing_Cluster___torus: model = &routing_models[SURF_MODEL_TORUS_CLUSTER];break; + case A_surfxml_AS_routing_Cluster___fat___tree: model = &routing_models[SURF_MODEL_FAT_TREE_CLUSTER];break; + case A_surfxml_AS_routing_Dijkstra: model = &routing_models[SURF_MODEL_DIJKSTRA];break; + case A_surfxml_AS_routing_DijkstraCache: model = &routing_models[SURF_MODEL_DIJKSTRACACHE];break; + case A_surfxml_AS_routing_Floyd: model = &routing_models[SURF_MODEL_FLOYD];break; + case A_surfxml_AS_routing_Full: model = &routing_models[SURF_MODEL_FULL];break; + case A_surfxml_AS_routing_None: model = &routing_models[SURF_MODEL_NONE];break; + case A_surfxml_AS_routing_Vivaldi: model = &routing_models[SURF_MODEL_VIVALDI];break; default: xbt_die("Not a valid model!!!"); break; } @@ -365,14 +365,16 @@ void routing_AS_begin(sg_platf_AS_cbarg_t AS) new_as->p_hierarchy = SURF_ROUTING_NULL; new_as->p_name = xbt_strdup(AS->id); - RoutingEdgePtr info = new RoutingEdge(); - + RoutingEdgePtr info = new RoutingEdgeImpl(xbt_strdup(new_as->p_name), + -1, + SURF_NETWORK_ELEMENT_AS, + current_routing); if (current_routing == NULL && routing_platf->p_root == NULL) { /* it is the first one */ new_as->p_routingFather = NULL; routing_platf->p_root = new_as; - info->m_id = -1; + info->setId(-1); } else if (current_routing != NULL && routing_platf->p_root != NULL) { xbt_assert(!xbt_dict_get_or_null @@ -387,18 +389,14 @@ void routing_AS_begin(sg_platf_AS_cbarg_t AS) xbt_dict_set(current_routing->p_routingSons, AS->id, (void *) new_as, NULL); /* add to the father element list */ - info->m_id = current_routing->parseAS(info); + info->setId(current_routing->parseAS(info)); } else { - THROWF(arg_error, 0, "All defined components must be belong to a AS"); + THROWF(arg_error, 0, "All defined components must belong to a AS"); } - info->p_rcComponent = new_as->p_routingFather; - info->p_rcType = SURF_NETWORK_ELEMENT_AS; - info->p_name = xbt_strdup(new_as->p_name); - - xbt_lib_set(as_router_lib, info->p_name, ROUTING_ASR_LEVEL, + xbt_lib_set(as_router_lib, info->getName(), ROUTING_ASR_LEVEL, (void *) info); - XBT_DEBUG("Having set name '%s' id '%d'", new_as->p_name, info->m_id); + XBT_DEBUG("Having set name '%s' id '%d'", new_as->p_name, info->getId()); /* set the new current component of the tree */ current_routing = new_as; @@ -460,11 +458,11 @@ static void elements_father(sg_routing_edge_t src, sg_routing_edge_t dst, /* (1) find the as where the src and dst are located */ sg_routing_edge_t src_data = src; sg_routing_edge_t dst_data = dst; - src_as = src_data->p_rcComponent; - dst_as = dst_data->p_rcComponent; + src_as = src_data->getRcComponent(); + dst_as = dst_data->getRcComponent(); #ifndef NDEBUG - char* src_name = src_data->p_name; - char* dst_name = dst_data->p_name; + char* src_name = src_data->getName(); + char* dst_name = dst_data->getName(); #endif xbt_assert(src_as && dst_as, @@ -522,7 +520,7 @@ static void _get_route_and_latency(RoutingEdgePtr src, RoutingEdgePtr dst, memset(&route,0,sizeof(route)); xbt_assert(src && dst, "bad parameters for \"_get_route_latency\" method"); - XBT_DEBUG("Solve route/latency \"%s\" to \"%s\"", src->p_name, dst->p_name); + XBT_DEBUG("Solve route/latency \"%s\" to \"%s\"", src->getName(), dst->getName()); /* Find how src and dst are interconnected */ AsPtr common_father, src_father, dst_father; @@ -562,7 +560,7 @@ static void _get_route_and_latency(RoutingEdgePtr src, RoutingEdgePtr dst, &route, latency); xbt_assert((route.gw_src != NULL) && (route.gw_dst != NULL), - "bad gateways for route from \"%s\" to \"%s\"", src->p_name, dst->p_name); + "bad gateways for route from \"%s\" to \"%s\"", src->getName(), dst->getName()); sg_routing_edge_t src_gateway_net_elm = route.gw_src; sg_routing_edge_t dst_gateway_net_elm = route.gw_dst; @@ -584,7 +582,7 @@ AS_t surf_platf_get_root(routing_platf_t platf){ } e_surf_network_element_type_t surf_routing_edge_get_rc_type(sg_routing_edge_t edge){ - return edge->p_rcType; + return edge->getRcType(); } @@ -605,7 +603,7 @@ e_surf_network_element_type_t surf_routing_edge_get_rc_type(sg_routing_edge_t ed void RoutingPlatf::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, xbt_dynar_t* route, double *latency) { - XBT_DEBUG("routing_get_route_and_latency from %s to %s", src->p_name, dst->p_name); + XBT_DEBUG("routing_get_route_and_latency from %s to %s", src->getName(), dst->getName()); if (!*route) { xbt_dynar_reset(routing_platf->p_lastRoute); *route = routing_platf->p_lastRoute; @@ -614,7 +612,7 @@ void RoutingPlatf::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, _get_route_and_latency(src, dst, route, latency); xbt_assert(!latency || *latency >= 0.0, - "negative latency on route between \"%s\" and \"%s\"", src->p_name, dst->p_name); + "negative latency on route between \"%s\" and \"%s\"", src->getName(), dst->getName()); } xbt_dynar_t RoutingPlatf::getOneLinkRoutes(){ @@ -623,7 +621,7 @@ xbt_dynar_t RoutingPlatf::getOneLinkRoutes(){ xbt_dynar_t RoutingPlatf::recursiveGetOneLinkRoutes(AsPtr rc) { - xbt_dynar_t ret = xbt_dynar_new(sizeof(OnelinkPtr), xbt_free); + xbt_dynar_t ret = xbt_dynar_new(sizeof(OnelinkPtr), xbt_free_f); //adding my one link routes xbt_dynar_t onelink_mine = rc->getOneLinkRoutes(); @@ -646,7 +644,7 @@ e_surf_network_element_type_t routing_get_network_element_type(const char *name) { RoutingEdgePtr rc = sg_routing_edge_by_name_or_null(name); if (rc) - return rc->p_rcType; + return rc->getRcType(); return SURF_NETWORK_ELEMENT_NULL; } @@ -751,36 +749,36 @@ static void routing_parse_cabinet(sg_platf_cabinet_cbarg_t cabinet) s_sg_platf_host_cbarg_t host; memset(&host, 0, sizeof(host)); host.initial_state = SURF_RESOURCE_ON; - host.pstate = 0; - host.power_scale = 1.0; - host.core_amount = 1; + host.pstate = 0; + host.power_scale = 1.0; + host.core_amount = 1; s_sg_platf_link_cbarg_t link; memset(&link, 0, sizeof(link)); - link.state = SURF_RESOURCE_ON; - link.policy = SURF_LINK_FULLDUPLEX; - link.latency = cabinet->lat; + link.state = SURF_RESOURCE_ON; + link.policy = SURF_LINK_FULLDUPLEX; + link.latency = cabinet->lat; link.bandwidth = cabinet->bw; s_sg_platf_host_link_cbarg_t host_link; memset(&host_link, 0, sizeof(host_link)); for (i = start; i <= end; i++) { - host_id = bprintf("%s%d%s",cabinet->prefix,i,cabinet->suffix); - link_id = bprintf("link_%s%d%s",cabinet->prefix,i,cabinet->suffix); - host.id = host_id; - link.id = link_id; + host_id = bprintf("%s%d%s",cabinet->prefix,i,cabinet->suffix); + link_id = bprintf("link_%s%d%s",cabinet->prefix,i,cabinet->suffix); + host.id = host_id; + link.id = link_id; xbt_dynar_t power_state_list = xbt_dynar_new(sizeof(double), NULL); xbt_dynar_push(power_state_list,&cabinet->power); host.power_peak = power_state_list; sg_platf_new_host(&host); sg_platf_new_link(&link); - char* link_up = bprintf("%s_UP",link_id); - char* link_down = bprintf("%s_DOWN",link_id); - host_link.id = host_id; - host_link.link_up = link_up; - host_link.link_down= link_down; + char* link_up = bprintf("%s_UP",link_id); + char* link_down = bprintf("%s_DOWN",link_id); + host_link.id = host_id; + host_link.link_up = link_up; + host_link.link_down = link_down; sg_platf_new_host_link(&host_link); free(host_id); @@ -798,13 +796,12 @@ static void routing_parse_cluster(sg_platf_cluster_cbarg_t cluster) { char *host_id, *groups, *link_id = NULL; xbt_dict_t patterns = NULL; - xbt_dynar_t dimensions; int rankId=0; s_sg_platf_host_cbarg_t host; s_sg_platf_link_cbarg_t link; - unsigned int iter, totalRanks=0; + unsigned int iter; int start, end, i; xbt_dynar_t radical_elements; xbt_dynar_t radical_ends; @@ -817,48 +814,43 @@ static void routing_parse_cluster(sg_platf_cluster_cbarg_t cluster) xbt_dict_set(patterns, "suffix", xbt_strdup(cluster->suffix), NULL); } - dimensions = xbt_str_split(cluster->torus_dimensions, ","); - - - int nb_links_per_node = 1; - - if (!xbt_dynar_is_empty(dimensions)) { - /** - * We are in a torus cluster - * Parse attribute dimensions="dim1,dim2,dim3,...,dimN" - * and safe it in a dynarray. - * Additionally, we need to know how many ranks we have in total - */ - xbt_dynar_foreach(dimensions, iter, groups) { - int tmp = surf_parse_get_int(xbt_dynar_get_as(dimensions, iter, char *)); - xbt_dynar_set_as(dimensions, iter, int, tmp); - - if (totalRanks == 0) - totalRanks = tmp; - else - totalRanks *= tmp; - } + /* parse the topology attribute. If we are not in a flat cluster, + * switch to the right mode and initialize the routing with + * the parameters in topo_parameters attribute + */ + s_sg_platf_AS_cbarg_t AS = SG_PLATF_AS_INITIALIZER; + AS.id = cluster->id; - nb_links_per_node = xbt_dynar_length(dimensions); - ((AsClusterPtr)current_routing)-> p_dimensions = dimensions; + if(cluster->topology == SURF_CLUSTER_TORUS){ + XBT_DEBUG("", cluster->id); + AS.routing = A_surfxml_AS_routing_Cluster___torus; + sg_platf_new_AS_begin(&AS); + ((AsClusterTorusPtr)current_routing)->parse_specific_arguments(cluster); + } + else if (cluster->topology == SURF_CLUSTER_FAT_TREE) { + XBT_DEBUG("", cluster->id); + AS.routing = A_surfxml_AS_routing_Cluster___fat___tree; + sg_platf_new_AS_begin(&AS); + ((AsClusterFatTree*)current_routing)->parse_specific_arguments(cluster); + } + else{ + XBT_DEBUG("", cluster->id); + AS.routing = A_surfxml_AS_routing_Cluster; + sg_platf_new_AS_begin(&AS); } if(cluster->loopback_bw!=0 || cluster->loopback_lat!=0){ - nb_links_per_node++; + ((AsClusterPtr)current_routing)->p_nb_links_per_node++; ((AsClusterPtr)current_routing)->p_has_loopback=1; } if(cluster->limiter_link!=0){ - nb_links_per_node++; + ((AsClusterPtr)current_routing)->p_nb_links_per_node++; ((AsClusterPtr)current_routing)->p_has_limiter=1; } - XBT_DEBUG("", cluster->id); - s_sg_platf_AS_cbarg_t AS = SG_PLATF_AS_INITIALIZER; - AS.id = cluster->id; - AS.routing = A_surfxml_AS_routing_Cluster; - sg_platf_new_AS_begin(&AS); + current_routing->p_linkUpDownList = xbt_dynar_new(sizeof(s_surf_parsing_link_up_down_t),NULL); @@ -890,6 +882,15 @@ static void routing_parse_cluster(sg_platf_cluster_cbarg_t cluster) memset(&host, 0, sizeof(host)); host.id = host_id; + if ((cluster->properties != NULL) && (!xbt_dict_is_empty(cluster->properties))) { + xbt_dict_cursor_t cursor=NULL; + char *key,*data; + host.properties = xbt_dict_new(); + + xbt_dict_foreach(cluster->properties,cursor,key,data) { + xbt_dict_set(host.properties, key, xbt_strdup(data),free); + } + } if (cluster->availability_trace && strcmp(cluster->availability_trace, "")) { xbt_dict_set(patterns, "radical", bprintf("%d", i), NULL); char *avail_file = xbt_str_varsubst(cluster->availability_trace, patterns); @@ -926,13 +927,13 @@ static void routing_parse_cluster(sg_platf_cluster_cbarg_t cluster) cluster->bw, cluster->lat); - s_surf_parsing_link_up_down_t info, info_lim, info_loop; + s_surf_parsing_link_up_down_t info_lim, info_loop; // All links are saved in a matrix; // every row describes a single node; every node // may have multiple links. // the first column may store a link from x to x if p_has_loopback is set // the second column may store a limiter link if p_has_limiter is set - // other columns are to store one or more link, if we are in a torus + // other columns are to store one or more link for the node //add a loopback link if(cluster->loopback_bw!=0 || cluster->loopback_lat!=0){ @@ -942,17 +943,16 @@ static void routing_parse_cluster(sg_platf_cluster_cbarg_t cluster) memset(&link, 0, sizeof(link)); - link.id = tmp_link; + link.id = tmp_link; link.bandwidth = cluster->loopback_bw; - link.latency = cluster->loopback_lat; - link.state = SURF_RESOURCE_ON; - link.policy = SURF_LINK_FATPIPE; + link.latency = cluster->loopback_lat; + link.state = SURF_RESOURCE_ON; + link.policy = SURF_LINK_FATPIPE; sg_platf_new_link(&link); - info_loop.link_up = - xbt_lib_get_or_null(link_lib, tmp_link, SURF_LINK_LEVEL); - info_loop.link_down = info.link_up; + info_loop.link_up = Link::byName(tmp_link); + info_loop.link_down = info_loop.link_up; free(tmp_link); - xbt_dynar_set(current_routing->p_linkUpDownList, rankId*nb_links_per_node, &info_loop); + xbt_dynar_set(current_routing->p_linkUpDownList, rankId*((AsClusterPtr)current_routing)->p_nb_links_per_node, &info_loop); } //add a limiter link (shared link to account for maximal bandwidth of the node) @@ -969,100 +969,25 @@ static void routing_parse_cluster(sg_platf_cluster_cbarg_t cluster) link.state = SURF_RESOURCE_ON; link.policy = SURF_LINK_SHARED; sg_platf_new_link(&link); - info_lim.link_up = - xbt_lib_get_or_null(link_lib, tmp_link, SURF_LINK_LEVEL); - info_lim.link_down = info.link_up; + info_lim.link_up = Link::byName(tmp_link); + info_lim.link_down = info_lim.link_up; free(tmp_link); xbt_dynar_set(current_routing->p_linkUpDownList, - rankId*nb_links_per_node + ((AsClusterPtr)current_routing)->p_has_loopback , + rankId*((AsClusterPtr)current_routing)->p_nb_links_per_node + ((AsClusterPtr)current_routing)->p_has_loopback , &info_lim); } - - if(xbt_dynar_length(dimensions) == 0 ) { - /** - * If torus is not specified, generate one link by node - */ - - memset(&link, 0, sizeof(link)); - link.id = link_id; - link.bandwidth = cluster->bw; - link.latency = cluster->lat; - link.state = SURF_RESOURCE_ON; - link.policy = cluster->sharing_policy; - sg_platf_new_link(&link); - - if (link.policy == SURF_LINK_FULLDUPLEX) { - char *tmp_link = bprintf("%s_UP", link_id); - info.link_up = - xbt_lib_get_or_null(link_lib, tmp_link, SURF_LINK_LEVEL); - free(tmp_link); - tmp_link = bprintf("%s_DOWN", link_id); - info.link_down = - xbt_lib_get_or_null(link_lib, tmp_link, SURF_LINK_LEVEL); - free(tmp_link); - } else { - info.link_up = xbt_lib_get_or_null(link_lib, link_id, SURF_LINK_LEVEL); - info.link_down = info.link_up; - } - xbt_dynar_set(current_routing->p_linkUpDownList, rankId*nb_links_per_node - + ((AsClusterPtr)current_routing)->p_has_loopback - + ((AsClusterPtr)current_routing)->p_has_limiter, - &info); - }else{ - - unsigned int j = 0; - /** - * Create all links that exist in the torus. - * Each rank creates #dimensions-1 links - */ - int neighbour_rank_id = 0; // The other node the link connects - int current_dimension = 0, // which dimension are we currently in? - // we need to iterate over all dimensions - // and create all links there - dim_product = 1; // Needed to calculate the next neighbour_id - for (j = 0; j < xbt_dynar_length(dimensions); j++) { - - memset(&link, 0, sizeof(link)); - current_dimension = xbt_dynar_get_as(dimensions, j, int); - neighbour_rank_id = ( ((int) i / dim_product) % current_dimension == current_dimension-1) ? i - (current_dimension-1)*dim_product : i + dim_product; - link_id = bprintf("link_from_%i_to_%i", i, neighbour_rank_id); - link.id = link_id; - link.bandwidth = cluster->bw; - link.latency = cluster->lat; - link.state = SURF_RESOURCE_ON; - link.policy = cluster->sharing_policy; - sg_platf_new_link(&link); - s_surf_parsing_link_up_down_t info; - if (link.policy == SURF_LINK_FULLDUPLEX) { - char *tmp_link = bprintf("%s_UP", link_id); - info.link_up = - xbt_lib_get_or_null(link_lib, tmp_link, SURF_LINK_LEVEL); - free(tmp_link); - tmp_link = bprintf("%s_DOWN", link_id); - info.link_down = - xbt_lib_get_or_null(link_lib, tmp_link, SURF_LINK_LEVEL); - free(tmp_link); - } else { - info.link_up = xbt_lib_get_or_null(link_lib, link_id, SURF_LINK_LEVEL); - info.link_down = info.link_up; - } - /** - * Add the link to its appropriate position; - * note that position rankId*(xbt_dynar_length(dimensions)+has_loopack?+has_limiter?) - * holds the link "rankId->rankId" - */ - xbt_dynar_set(current_routing->p_linkUpDownList, rankId*nb_links_per_node - + ((AsClusterPtr)current_routing)->p_has_loopback - + ((AsClusterPtr)current_routing)->p_has_limiter - + j, - &info); - dim_product *= current_dimension; - xbt_free(link_id); - - } + //call the cluster function that adds the others links + if (cluster->topology == SURF_CLUSTER_FAT_TREE) { + ((AsClusterFatTree*) current_routing)->addProcessingNode(i); + } + else { + ((AsClusterPtr)current_routing)->create_links_for_node(cluster, i, rankId, rankId* + ((AsClusterPtr)current_routing)->p_nb_links_per_node + + ((AsClusterPtr)current_routing)->p_has_loopback + + ((AsClusterPtr)current_routing)->p_has_limiter ); } xbt_free(link_id); xbt_free(host_id); @@ -1073,6 +998,10 @@ static void routing_parse_cluster(sg_platf_cluster_cbarg_t cluster) } xbt_dynar_free(&radical_elements); + // For fat trees, the links must be created once all nodes have been added + if(cluster->topology == SURF_CLUSTER_FAT_TREE) { + ((AsClusterFatTree*)current_routing)->create_links(); + } // Add a router. It is magically used thanks to the way in which surf_routing_cluster is written, // and it's very useful to connect clusters together XBT_DEBUG(" "); @@ -1097,15 +1026,15 @@ static void routing_parse_cluster(sg_platf_cluster_cbarg_t cluster) cluster->bb_bw, cluster->bb_lat); memset(&link, 0, sizeof(link)); - link.id = link_backbone; + link.id = link_backbone; link.bandwidth = cluster->bb_bw; - link.latency = cluster->bb_lat; - link.state = SURF_RESOURCE_ON; - link.policy = cluster->bb_sharing_policy; + link.latency = cluster->bb_lat; + link.state = SURF_RESOURCE_ON; + link.policy = cluster->bb_sharing_policy; sg_platf_new_link(&link); - routing_cluster_add_backbone(xbt_lib_get_or_null(link_lib, link_backbone, SURF_LINK_LEVEL)); + routing_cluster_add_backbone(Link::byName(link_backbone)); free(link_backbone); } @@ -1133,8 +1062,8 @@ static void routing_parse_peer(sg_platf_peer_cbarg_t peer) XBT_DEBUG("", peer->id); s_sg_platf_AS_cbarg_t AS = SG_PLATF_AS_INITIALIZER; - AS.id = peer->id; - AS.routing = A_surfxml_AS_routing_Cluster; + AS.id = peer->id; + AS.routing = A_surfxml_AS_routing_Cluster; sg_platf_new_AS_begin(&AS); current_routing->p_linkUpDownList = xbt_dynar_new(sizeof(s_surf_parsing_link_up_down_t),NULL); @@ -1158,8 +1087,8 @@ static void routing_parse_peer(sg_platf_peer_cbarg_t peer) s_sg_platf_link_cbarg_t link; memset(&link, 0, sizeof(link)); - link.state = SURF_RESOURCE_ON; - link.policy = SURF_LINK_SHARED; + link.state = SURF_RESOURCE_ON; + link.policy = SURF_LINK_SHARED; link.latency = peer->lat; char* link_up = bprintf("%s_UP",link_id); @@ -1179,9 +1108,9 @@ static void routing_parse_peer(sg_platf_peer_cbarg_t peer) XBT_DEBUG("", host_id,link_up,link_down); s_sg_platf_host_link_cbarg_t host_link; memset(&host_link, 0, sizeof(host_link)); - host_link.id = host_id; - host_link.link_up = link_up; - host_link.link_down= link_down; + host_link.id = host_id; + host_link.link_up = link_up; + host_link.link_down = link_down; sg_platf_new_host_link(&host_link); XBT_DEBUG("", router_id); @@ -1324,6 +1253,22 @@ static void routing_parse_peer(sg_platf_peer_cbarg_t peer) // } // } +static void check_disk_attachment() +{ + xbt_lib_cursor_t cursor; + char *key; + void **data; + RoutingEdgePtr host_elm; + xbt_lib_foreach(storage_lib, cursor, key, data) { + if(xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL) != NULL) { + StoragePtr storage = static_cast(xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL)); + host_elm = sg_routing_edge_by_name_or_null(storage->p_attach); + if(!host_elm) + surf_parse_error("Unable to attach storage %s: host %s doesn't exist.", storage->getName(), storage->p_attach); + } + } +} + void routing_register_callbacks() { sg_platf_host_add_cb(parse_S_host); @@ -1339,6 +1284,7 @@ void routing_register_callbacks() sg_platf_peer_add_cb(routing_parse_peer); sg_platf_postparse_add_cb(routing_parse_postparse); + sg_platf_postparse_add_cb(check_disk_attachment); /* we care about the ASes while parsing the platf. Incredible, isnt it? */ sg_platf_AS_end_add_cb(routing_AS_end); @@ -1347,9 +1293,7 @@ void routing_register_callbacks() sg_platf_trace_add_cb(routing_parse_trace); sg_platf_trace_connect_add_cb(routing_parse_trace_connect); -#ifdef HAVE_TRACING instr_routing_define_callbacks(); -#endif } /** @@ -1391,6 +1335,32 @@ const char *surf_AS_get_name(AsPtr as) { return as->p_name; } +static AsPtr surf_AS_recursive_get_by_name(AsPtr current, const char * name) { + xbt_dict_cursor_t cursor = NULL; + char *key; + AS_t elem; + AsPtr tmp = NULL; + + if(!strcmp(current->p_name, name)) + return current; + + xbt_dict_foreach(current->p_routingSons, cursor, key, elem) { + tmp = surf_AS_recursive_get_by_name(elem, name); + if(tmp != NULL ) { + break; + } + } + return tmp; +} + + +AsPtr surf_AS_get_by_name(const char * name) { + AsPtr as = surf_AS_recursive_get_by_name(routing_platf->p_root, name); + if(as == NULL) + XBT_WARN("Impossible to find an AS with name %s, please check your input", name); + return as; +} + xbt_dict_t surf_AS_get_routing_sons(AsPtr as) { return as->p_routingSons; } @@ -1408,7 +1378,7 @@ xbt_dynar_t surf_AS_get_hosts(AsPtr as) { xbt_dynar_t res = xbt_dynar_new(sizeof(xbt_dictelm_t), NULL); for (index = 0; index < count; index++) { relm = xbt_dynar_get_as(elms, index, RoutingEdgePtr); - delm = xbt_lib_get_elm_or_null(host_lib, relm->p_name); + delm = xbt_lib_get_elm_or_null(host_lib, relm->getName()); if (delm!=NULL) { xbt_dynar_push(res, &delm); } @@ -1419,4 +1389,3 @@ xbt_dynar_t surf_AS_get_hosts(AsPtr as) { void surf_AS_get_graph(AS_t as, xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges) { as->getGraph(graph, nodes, edges); } -