XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_cluster_torus, surf_route_cluster, "Torus Routing part of surf");
-inline void rankId_to_coords(int rankId, std::vector<unsigned int> dimensions, unsigned int (*coords)[4])
+inline void rankId_to_coords(int rankId, std::vector<unsigned int> dimensions, unsigned int coords[4])
{
unsigned int dim_size_product = 1;
unsigned int i = 0;
for (auto const& cur_dim_size : dimensions) {
- (*coords)[i] = (rankId / dim_size_product) % cur_dim_size;
+ coords[i] = (rankId / dim_size_product) % cur_dim_size;
dim_size_product *= cur_dim_size;
i++;
}
link.latency = cluster->lat;
link.policy = cluster->sharing_policy;
sg_platf_new_link(&link);
- surf::LinkImpl* linkUp;
- surf::LinkImpl* linkDown;
- if (link.policy == SURF_LINK_SPLITDUPLEX) {
+ resource::LinkImpl* linkUp;
+ resource::LinkImpl* linkDown;
+ if (link.policy == s4u::Link::SharingPolicy::SPLITDUPLEX) {
std::string tmp_link = link_id + "_UP";
- linkUp = surf::LinkImpl::byName(tmp_link);
+ linkUp = resource::LinkImpl::byName(tmp_link);
tmp_link = link_id + "_DOWN";
- linkDown = surf::LinkImpl::byName(tmp_link);
+ linkDown = resource::LinkImpl::byName(tmp_link);
} else {
- linkUp = surf::LinkImpl::byName(link_id);
+ linkUp = resource::LinkImpl::byName(link_id);
linkDown = linkUp;
}
/*
}
}
-void TorusZone::getLocalRoute(NetPoint* src, NetPoint* dst, RouteCreationArgs* route, double* lat)
+void TorusZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* route, double* lat)
{
XBT_VERB("torus getLocalRoute from '%s'[%u] to '%s'[%u]", src->get_cname(), src->id(), dst->get_cname(), dst->id());
return;
if (src->id() == dst->id() && has_loopback_) {
- std::pair<surf::LinkImpl*, surf::LinkImpl*> info = private_links_.at(src->id() * num_links_per_node_);
+ std::pair<resource::LinkImpl*, resource::LinkImpl*> info = private_links_.at(src->id() * num_links_per_node_);
route->link_list.push_back(info.first);
if (lat)
* Arrays that hold the coordinates of the current node andthe target; comparing the values at the i-th position of
* both arrays, we can easily assess whether we need to route into this dimension or not.
*/
- unsigned int myCoords[4];
- rankId_to_coords(src->id(), dimensions_, &myCoords);
- unsigned int targetCoords[4];
- rankId_to_coords(dst->id(), dimensions_, &targetCoords);
+ unsigned int myCoords[dimensions_.size()];
+ rankId_to_coords(src->id(), dimensions_, myCoords);
+ unsigned int targetCoords[dimensions_.size()];
+ rankId_to_coords(dst->id(), dimensions_, targetCoords);
/*
* linkOffset describes the offset where the link we want to use is stored(+1 is added because each node has a link
* from itself to itself, which can only be the case if src->m_id == dst->m_id -- see above for this special case)
dim_product *= cur_dim;
}
- std::pair<surf::LinkImpl*, surf::LinkImpl*> info;
+ std::pair<resource::LinkImpl*, resource::LinkImpl*> info;
if (has_limiter_) { // limiter for sender
info = private_links_.at(nodeOffset + (has_loopback_ ? 1 : 0));