#include "simgrid/kernel/routing/NetPoint.hpp"
#include "simgrid/s4u/Host.hpp"
#include "src/surf/network_interface.hpp"
-#include "src/surf/xml/platf_private.hpp"
#include <boost/algorithm/string/classification.hpp>
#include <boost/algorithm/string/split.hpp>
namespace kernel {
namespace routing {
-void TorusZone::create_links_for_node(int id, int rank, unsigned int position)
+void TorusZone::create_links(int id, int rank, unsigned int position)
{
/* Create all links that exist in the torus. Each rank creates @a dimensions-1 links */
int dim_product = 1; // Needed to calculate the next neighbor_id
std::string link_id = get_name() + "_link_from_" + std::to_string(id) + "_to_" + std::to_string(neighbor_rank_id);
const s4u::Link* linkup;
const s4u::Link* linkdown;
- if (link_sharing_policy_ == s4u::Link::SharingPolicy::SPLITDUPLEX) {
- linkup = create_link(link_id + "_UP", std::vector<double>{link_bw_})->set_latency(link_lat_)->seal();
- linkdown = create_link(link_id + "_DOWN", std::vector<double>{link_bw_})->set_latency(link_lat_)->seal();
+ if (get_link_sharing_policy() == s4u::Link::SharingPolicy::SPLITDUPLEX) {
+ linkup = create_link(link_id + "_UP", std::vector<double>{get_link_bandwidth()})
+ ->set_latency(get_link_latency())
+ ->seal();
+ linkdown = create_link(link_id + "_DOWN", std::vector<double>{get_link_bandwidth()})
+ ->set_latency(get_link_latency())
+ ->seal();
} else {
- linkup = create_link(link_id, std::vector<double>{link_bw_})->set_latency(link_lat_)->seal();
+ linkup = create_link(link_id, std::vector<double>{get_link_bandwidth()})->set_latency(get_link_latency())->seal();
linkdown = linkup;
}
/*
* Parse attribute dimensions="dim1,dim2,dim3,...,dimN" and save them into a vector.
* Additionally, we need to know how many ranks we have in total
*/
- std::transform(begin(dimensions_str), end(dimensions_str), std::back_inserter(dimensions), surf_parse_get_int);
+ std::transform(begin(dimensions_str), end(dimensions_str), std::back_inserter(dimensions),
+ [](const std::string& s) { return std::stoi(s); });
}
return dimensions;
}
-void TorusZone::set_link_characteristics(double bw, double lat, s4u::Link::SharingPolicy sharing_policy)
-{
- link_sharing_policy_ = sharing_policy;
- link_bw_ = bw;
- link_lat_ = lat;
-}
-
void TorusZone::set_topology(const std::vector<unsigned int>& dimensions)
{
xbt_assert(not dimensions.empty(), "Torus dimensions cannot be empty");
set_num_links_per_node(dimensions_.size());
}
-void TorusZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* route, double* lat)
+void TorusZone::get_local_route(NetPoint* src, NetPoint* dst, Route* route, double* lat)
{
XBT_VERB("torus getLocalRoute from '%s'[%u] to '%s'[%u]", src->get_cname(), src->id(), dst->get_cname(), dst->id());
if (src->id() == dst->id() && has_loopback()) {
resource::LinkImpl* uplink = get_uplink_from(node_pos(src->id()));
- route->link_list.push_back(uplink);
+ route->link_list_.push_back(uplink);
if (lat)
*lat += uplink->get_latency();
return;
}
if (has_limiter()) { // limiter for sender
- route->link_list.push_back(get_uplink_from(node_pos_with_loopback(current_node)));
+ route->link_list_.push_back(get_uplink_from(node_pos_with_loopback(current_node)));
}
resource::LinkImpl* lnk;
else
lnk = get_downlink_to(linkOffset);
- route->link_list.push_back(lnk);
+ route->link_list_.push_back(lnk);
if (lat)
*lat += lnk->get_latency();
current_node = next_node;
}
+ if (has_limiter()) { // limiter for receiver/destination
+ route->link_list_.push_back(get_downlink_to(node_pos_with_loopback(dst->id())));
+ }
// set gateways (if any)
- route->gw_src = get_gateway(src->id());
- route->gw_dst = get_gateway(dst->id());
+ route->gw_src_ = get_gateway(src->id());
+ route->gw_dst_ = get_gateway(dst->id());
}
} // namespace routing
namespace s4u {
NetZone* create_torus_zone(const std::string& name, const NetZone* parent, const std::vector<unsigned int>& dimensions,
- double bandwidth, double latency, Link::SharingPolicy sharing_policy,
- const std::function<ClusterNetPointCb>& set_netpoint,
- const std::function<ClusterLinkCb>& set_loopback,
- const std::function<ClusterLinkCb>& set_limiter)
+ const ClusterCallbacks& set_callbacks, double bandwidth, double latency,
+ Link::SharingPolicy sharing_policy)
{
int tot_elements = std::accumulate(dimensions.begin(), dimensions.end(), 1, std::multiplies<>());
if (dimensions.empty() || tot_elements <= 0)
kernel::routing::NetPoint* netpoint;
Link* limiter;
Link* loopback;
- zone->fill_leaf_from_cb(i, dimensions, set_netpoint, set_loopback, set_limiter, &netpoint, &loopback, &limiter);
+ zone->fill_leaf_from_cb(i, dimensions, set_callbacks, &netpoint, &loopback, &limiter);
- zone->create_links_for_node(netpoint->id(), i, zone->node_pos_with_loopback_limiter(netpoint->id()));
+ zone->create_links(netpoint->id(), i, zone->node_pos_with_loopback_limiter(netpoint->id()));
}
return zone->get_iface();