-/* 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
#include "surf_routing.hpp"
#include "surf_routing_private.hpp"
#include "surf_routing_cluster.hpp"
+#include "surf_routing_cluster_torus.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
int SIMIX_STORAGE_LEVEL; //Simix storage level
int MSG_HOST_LEVEL; //Msg host level
int MSG_STORAGE_LEVEL; //Msg storage level
+int MSG_FILE_LEVEL; //Msg file level
int SD_HOST_LEVEL; //Simdag host level
int SD_STORAGE_LEVEL; //Simdag storage level
int COORD_HOST_LEVEL=0; //Coordinates level
SURF_MODEL_DIJKSTRACACHE,
SURF_MODEL_NONE,
SURF_MODEL_VIVALDI,
- SURF_MODEL_CLUSTER
+ SURF_MODEL_CLUSTER,
+ SURF_MODEL_TORUS_CLUSTER,
+
} e_routing_types;
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},
{NULL, NULL, NULL, NULL}
};
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*))
+ if((int)xbt_dynar_length(current_routing->p_linkUpDownList) > info->getId() &&
+ xbt_dynar_get_as(current_routing->p_linkUpDownList, info->getId(), void*))
xbt_die("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);
}
/**
xbt_assert(!xbt_lib_get_or_null(host_lib, host->id, ROUTING_HOST_LEVEL),
"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);
+ RoutingEdgePtr info = new RoutingEdgeImpl(xbt_strdup(host->id),
+ -1,
+ SURF_NETWORK_ELEMENT_HOST,
+ current_routing);
+ info->setId(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);
+ 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);
"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;
/* 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_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;
}
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
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");
}
- 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;
/* (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,
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;
&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;
}
e_surf_network_element_type_t surf_routing_edge_get_rc_type(sg_routing_edge_t edge){
- return edge->p_rcType;
+ return edge->getRcType();
}
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;
_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(){
{
RoutingEdgePtr rc = sg_routing_edge_by_name_or_null(name);
if (rc)
- return rc->p_rcType;
+ return rc->getRcType();
return SURF_NETWORK_ELEMENT_NULL;
}
{
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;
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;
- }
-
- nb_links_per_node = xbt_dynar_length(dimensions);
- ((AsClusterPtr)current_routing)-> p_dimensions = dimensions;
+ /* 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;
+ if(cluster->topology == SURF_CLUSTER_TORUS){
+ XBT_DEBUG("<AS id=\"%s\"\trouting=\"Torus_Cluster\">", cluster->id);
+ AS.routing = A_surfxml_AS_routing_Cluster___torus;
+ sg_platf_new_AS_begin(&AS);
+ ((AsClusterTorusPtr)current_routing)->parse_specific_arguments(cluster);
+ }else{
+ XBT_DEBUG("<AS id=\"%s\"\trouting=\"Cluster\">", 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("<AS id=\"%s\"\trouting=\"Cluster\">", 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);
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){
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_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)
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_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);
}
+ //call the cluster function that adds the others links
- 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);
+ ((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 );
- 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);
-
- }
- }
xbt_free(link_id);
xbt_free(host_id);
rankId++;
// }
// }
+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<StoragePtr>(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("Enable 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);
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);
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);
}
