/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-#include "src/surf/surf_routing_private.hpp"
#include "src/surf/surf_routing_cluster_torus.hpp"
+#include "src/surf/xml/platf.hpp" // FIXME: move that back to the parsing area
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_cluster_torus, surf_route_cluster, "Torus Routing part of surf");
}
-AS_t model_torus_cluster_create(void)
-{
- return new simgrid::surf::AsClusterTorus();
-}
-
namespace simgrid {
namespace surf {
- AsClusterTorus::AsClusterTorus():AsCluster() {
+ AsClusterTorus::AsClusterTorus(const char*name)
+ : AsCluster(name) {
}
AsClusterTorus::~AsClusterTorus() {
- xbt_dynar_free(&p_dimensions);
+ xbt_dynar_free(&dimensions_);
}
void AsClusterTorus::create_links_for_node(sg_platf_cluster_cbarg_t cluster, int id, int rank, int position) {
// 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(p_dimensions); j++) {
+ for (j = 0; j < xbt_dynar_length(dimensions_); j++) {
memset(&link, 0, sizeof(link));
- current_dimension = xbt_dynar_get_as(p_dimensions, j, int);
+ current_dimension = xbt_dynar_get_as(dimensions_, j, int);
neighbour_rank_id =
(((int) rank / dim_product) % current_dimension ==
current_dimension - 1) ? rank - (current_dimension - 1) * dim_product : rank + dim_product;
link.id = link_id;
link.bandwidth = cluster->bw;
link.latency = cluster->lat;
- link.initiallyOn = 1;
link.policy = cluster->sharing_policy;
sg_platf_new_link(&link);
s_surf_parsing_link_up_down_t info;
* note that position rankId*(xbt_dynar_length(dimensions)+has_loopack?+has_limiter?)
* holds the link "rankId->rankId"
*/
- xbt_dynar_set(p_linkUpDownList, position + j, &info);
+ xbt_dynar_set(upDownLinks, position + j, &info);
dim_product *= current_dimension;
xbt_free(link_id);
}
xbt_dynar_t dimensions = xbt_str_split(cluster->topo_parameters, ",");
if (!xbt_dynar_is_empty(dimensions)) {
- p_dimensions = xbt_dynar_new(sizeof(int), NULL);
+ dimensions_ = xbt_dynar_new(sizeof(int), NULL);
/**
* We are in a torus cluster
* Parse attribute dimensions="dim1,dim2,dim3,...,dimN"
*/
xbt_dynar_foreach(dimensions, iter, groups) {
int tmp = surf_parse_get_int(xbt_dynar_get_as(dimensions, iter, char *));
- xbt_dynar_set_as(p_dimensions, iter, int, tmp);
+ xbt_dynar_set_as(dimensions_, iter, int, tmp);
}
- p_nb_links_per_node = xbt_dynar_length(p_dimensions);
+ nb_links_per_node_ = xbt_dynar_length(dimensions_);
}
xbt_dynar_free(&dimensions);
void AsClusterTorus::getRouteAndLatency(NetCard * src, NetCard * dst, sg_platf_route_cbarg_t route, double *lat) {
XBT_VERB("torus_get_route_and_latency from '%s'[%d] to '%s'[%d]",
- src->getName(), src->getId(), dst->getName(), dst->getId());
+ src->name(), src->id(), dst->name(), dst->id());
if (dst->getRcType() == SURF_NETWORK_ELEMENT_ROUTER || src->getRcType() == SURF_NETWORK_ELEMENT_ROUTER)
return;
- if ((src->getId() == dst->getId()) && p_has_loopback) {
+ if ((src->id() == dst->id()) && has_loopback_) {
s_surf_parsing_link_up_down_t info =
- xbt_dynar_get_as(p_linkUpDownList, src->getId() * p_nb_links_per_node, s_surf_parsing_link_up_down_t);
+ xbt_dynar_get_as(upDownLinks, src->id() * nb_links_per_node_, s_surf_parsing_link_up_down_t);
xbt_dynar_push_as(route->link_list, void *, info.link_up);
if (lat)
* TODO Change to dynamic assignment
*/
unsigned int j, cur_dim, dim_product = 1;
- int current_node = src->getId();
+ int current_node = src->id();
int unsigned next_node = 0;
/**
* Arrays that hold the coordinates of the current node and
* into this dimension or not.
*/
unsigned int *myCoords, *targetCoords;
- myCoords = rankId_to_coords(src->getId(), p_dimensions);
- targetCoords = rankId_to_coords(dst->getId(), p_dimensions);
+ myCoords = rankId_to_coords(src->id(), dimensions_);
+ targetCoords = rankId_to_coords(dst->id(), dimensions_);
/**
* linkOffset describes the offset where the link
* we want to use is stored
* which can only be the case if src->m_id == dst->m_id -- see above
* for this special case)
*/
- int nodeOffset = (xbt_dynar_length(p_dimensions) + 1) * src->getId();
+ int nodeOffset = (xbt_dynar_length(dimensions_) + 1) * src->id();
int linkOffset = nodeOffset;
bool use_lnk_up = false; // Is this link of the form "cur -> next" or "next -> cur"?
// false means: next -> cur
- while (current_node != dst->getId()) {
+ while (current_node != dst->id()) {
dim_product = 1; // First, we will route in x-dimension
- for (j = 0; j < xbt_dynar_length(p_dimensions); j++) {
- cur_dim = xbt_dynar_get_as(p_dimensions, j, int);
+ for (j = 0; j < xbt_dynar_length(dimensions_); j++) {
+ cur_dim = xbt_dynar_get_as(dimensions_, j, int);
// current_node/dim_product = position in current dimension
- if ((current_node / dim_product) % cur_dim != (dst->getId() / dim_product) % cur_dim) {
+ if ((current_node / dim_product) % cur_dim != (dst->id() / dim_product) % cur_dim) {
if ((targetCoords[j] > myCoords[j] && targetCoords[j] <= myCoords[j] + cur_dim / 2) // Is the target node on the right, without the wrap-around?
|| (myCoords[j] > cur_dim / 2 && (myCoords[j] + cur_dim / 2) % cur_dim >= targetCoords[j])) { // Or do we need to use the wrap around to reach it?
next_node = (current_node + dim_product);
// HERE: We use *CURRENT* node for calculation (as opposed to next_node)
- nodeOffset = current_node * (p_nb_links_per_node);
- linkOffset = nodeOffset + p_has_loopback + p_has_limiter + j;
+ nodeOffset = current_node * (nb_links_per_node_);
+ linkOffset = nodeOffset + has_loopback_ + has_limiter_ + j;
use_lnk_up = true;
assert(linkOffset >= 0);
} else { // Route to the left
next_node = (current_node - dim_product);
// HERE: We use *next* node for calculation (as opposed to current_node!)
- nodeOffset = next_node * (p_nb_links_per_node);
- linkOffset = nodeOffset + j + p_has_loopback + p_has_limiter;
+ nodeOffset = next_node * (nb_links_per_node_);
+ linkOffset = nodeOffset + j + has_loopback_ + has_limiter_;
use_lnk_up = false;
assert(linkOffset >= 0);
s_surf_parsing_link_up_down_t info;
- if (p_has_limiter) { // limiter for sender
- info = xbt_dynar_get_as(p_linkUpDownList, nodeOffset + p_has_loopback, s_surf_parsing_link_up_down_t);
+ if (has_limiter_) { // limiter for sender
+ info = xbt_dynar_get_as(upDownLinks, nodeOffset + has_loopback_, s_surf_parsing_link_up_down_t);
xbt_dynar_push_as(route->link_list, void *, info.link_up);
}
- info = xbt_dynar_get_as(p_linkUpDownList, linkOffset, s_surf_parsing_link_up_down_t);
+ info = xbt_dynar_get_as(upDownLinks, linkOffset, s_surf_parsing_link_up_down_t);
if (use_lnk_up == false) {
xbt_dynar_push_as(route->link_list, void *, info.link_down);
