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()) && p_has_loopback) {
s_surf_parsing_link_up_down_t info =
- xbt_dynar_get_as(upDownLinks, src->getId() * p_nb_links_per_node, s_surf_parsing_link_up_down_t);
+ xbt_dynar_get_as(upDownLinks, src->id() * p_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(), p_dimensions);
+ targetCoords = rankId_to_coords(dst->id(), p_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(p_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);
// 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?