#include "simgrid/kernel/routing/DragonflyZone.hpp"
#include "simgrid/kernel/routing/NetPoint.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 {
-DragonflyZone::DragonflyZone(const std::string& name) : ClusterZone(name) {}
+DragonflyZone::DragonflyZone(const std::string& name) : ClusterBase(name) {}
DragonflyZone::Coords DragonflyZone::rankId_to_coords(int rankId) const
{
void DragonflyZone::set_link_characteristics(double bw, double lat, s4u::Link::SharingPolicy sharing_policy)
{
- sharing_policy_ = sharing_policy;
+ ClusterBase::set_link_characteristics(bw, lat, sharing_policy);
if (sharing_policy == s4u::Link::SharingPolicy::SPLITDUPLEX)
num_links_per_link_ = 2;
- bw_ = bw;
- lat_ = lat;
}
void DragonflyZone::set_topology(unsigned int n_groups, unsigned int groups_links, unsigned int n_chassis,
boost::split(parameters, topo_parameters, boost::is_any_of(";"));
if (parameters.size() != 4)
- surf_parse_error(
- "Dragonfly are defined by the number of groups, chassis per groups, blades per chassis, nodes per blade");
+ xbt_die("Dragonfly are defined by the number of groups, chassis per groups, blades per chassis, nodes per blade");
// Blue network : number of groups, number of links between each group
boost::split(tmp, parameters[0], boost::is_any_of(","));
if (tmp.size() != 2)
- surf_parse_error("Dragonfly topologies are defined by 3 levels with 2 elements each, and one with one element");
+ xbt_die("Dragonfly topologies are defined by 3 levels with 2 elements each, and one with one element");
unsigned int n_groups;
try {
// Black network : number of chassis/group, number of links between each router on the black network
boost::split(tmp, parameters[1], boost::is_any_of(","));
if (tmp.size() != 2)
- surf_parse_error("Dragonfly topologies are defined by 3 levels with 2 elements each, and one with one element");
+ xbt_die("Dragonfly topologies are defined by 3 levels with 2 elements each, and one with one element");
unsigned int n_chassis;
try {
// Green network : number of blades/chassis, number of links between each router on the green network
boost::split(tmp, parameters[2], boost::is_any_of(","));
if (tmp.size() != 2)
- surf_parse_error("Dragonfly topologies are defined by 3 levels with 2 elements each, and one with one element");
+ xbt_die("Dragonfly topologies are defined by 3 levels with 2 elements each, and one with one element");
unsigned int n_routers;
try {
}
/* Generate the cluster once every node is created */
-void DragonflyZone::do_seal()
+void DragonflyZone::build_upper_levels(const s4u::ClusterCallbacks& set_callbacks)
{
- if (num_nodes_per_blade_ == 0)
- return;
-
- generate_routers();
+ generate_routers(set_callbacks);
generate_links();
}
-void DragonflyZone::generate_routers()
+void DragonflyZone::generate_routers(const s4u::ClusterCallbacks& set_callbacks)
{
+ int id = 0;
+ /* get limiter for this router */
+ auto get_limiter = [this, &id, &set_callbacks](unsigned int i, unsigned int j,
+ unsigned int k) -> resource::LinkImpl* {
+ kernel::resource::LinkImpl* limiter = nullptr;
+ if (set_callbacks.limiter) {
+ id--;
+ const auto* s4u_link =
+ set_callbacks.limiter(get_iface(), {i, j, k, std::numeric_limits<unsigned int>::max()}, id);
+ if (s4u_link) {
+ limiter = s4u_link->get_impl();
+ }
+ }
+ return limiter;
+ };
+
routers_.reserve(num_groups_ * num_chassis_per_group_ * num_blades_per_chassis_);
- for (unsigned int i = 0; i < num_groups_; i++)
- for (unsigned int j = 0; j < num_chassis_per_group_; j++)
- for (unsigned int k = 0; k < num_blades_per_chassis_; k++)
- routers_.emplace_back(i, j, k);
+ for (unsigned int i = 0; i < num_groups_; i++) {
+ for (unsigned int j = 0; j < num_chassis_per_group_; j++) {
+ for (unsigned int k = 0; k < num_blades_per_chassis_; k++) {
+ routers_.emplace_back(i, j, k, get_limiter(i, j, k));
+ }
+ }
+ }
}
void DragonflyZone::generate_link(const std::string& id, int numlinks, resource::LinkImpl** linkup,
XBT_DEBUG("Generating link %s", id.c_str());
*linkup = nullptr;
*linkdown = nullptr;
- if (sharing_policy_ == s4u::Link::SharingPolicy::SPLITDUPLEX) {
- *linkup = create_link(id + "_UP", std::vector<double>{bw_ * numlinks})->set_latency(lat_)->seal()->get_impl();
- *linkdown = create_link(id + "_DOWN", std::vector<double>{bw_ * numlinks})->set_latency(lat_)->seal()->get_impl();
+ if (get_link_sharing_policy() == s4u::Link::SharingPolicy::SPLITDUPLEX) {
+ *linkup = create_link(id + "_UP", std::vector<double>{get_link_bandwidth() * numlinks})
+ ->set_latency(get_link_latency())
+ ->seal()
+ ->get_impl();
+ *linkdown = create_link(id + "_DOWN", std::vector<double>{get_link_bandwidth() * numlinks})
+ ->set_latency(get_link_latency())
+ ->seal()
+ ->get_impl();
} else {
- *linkup = create_link(id, std::vector<double>{bw_ * numlinks})->set_latency(lat_)->seal()->get_impl();
+ *linkup = create_link(id, std::vector<double>{get_link_bandwidth() * numlinks})
+ ->set_latency(get_link_latency())
+ ->seal()
+ ->get_impl();
*linkdown = *linkup;
}
}
generate_link(id, 1, &linkup, &linkdown);
routers_[i].my_nodes_[j] = linkup;
- if (sharing_policy_ == s4u::Link::SharingPolicy::SPLITDUPLEX)
+ if (get_link_sharing_policy() == s4u::Link::SharingPolicy::SPLITDUPLEX)
routers_[i].my_nodes_[j + 1] = linkdown;
uniqueId++;
}
}
-void DragonflyZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* route, double* latency)
+void DragonflyZone::get_local_route(const NetPoint* src, const NetPoint* dst, Route* route, double* latency)
{
// Minimal routing version.
// TODO : non-minimal random one, and adaptive ?
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 (latency)
*latency += uplink->get_latency();
return;
targetCoords.chassis * num_blades_per_chassis_ + targetCoords.blade];
DragonflyRouter* currentRouter = myRouter;
+ if (has_limiter()) { // limiter for sender
+ route->link_list_.push_back(get_uplink_from(node_pos_with_loopback(src->id())));
+ }
+
// node->router local link
- route->link_list.push_back(myRouter->my_nodes_[myCoords.node * num_links_per_link_]);
+ route->link_list_.push_back(myRouter->my_nodes_[myCoords.node * num_links_per_link_]);
if (latency)
*latency += myRouter->my_nodes_[myCoords.node * num_links_per_link_]->get_latency();
- if (has_limiter()) { // limiter for sender
- route->link_list.push_back(get_uplink_from(node_pos_with_loopback(src->id())));
- }
-
if (targetRouter != myRouter) {
// are we on a different group ?
if (targetRouter->group_ != currentRouter->group_) {
// go to the router of our group connected to this one.
if (currentRouter->blade_ != targetCoords.group) {
+ if (currentRouter->limiter_)
+ route->link_list_.push_back(currentRouter->limiter_);
// go to the nth router in our chassis
- route->link_list.push_back(currentRouter->green_links_[targetCoords.group]);
+ route->link_list_.push_back(currentRouter->green_links_[targetCoords.group]);
if (latency)
*latency += currentRouter->green_links_[targetCoords.group]->get_latency();
currentRouter = &routers_[myCoords.group * (num_chassis_per_group_ * num_blades_per_chassis_) +
if (currentRouter->chassis_ != 0) {
// go to the first chassis of our group
- route->link_list.push_back(currentRouter->black_links_[0]);
+ if (currentRouter->limiter_)
+ route->link_list_.push_back(currentRouter->limiter_);
+ route->link_list_.push_back(currentRouter->black_links_[0]);
if (latency)
*latency += currentRouter->black_links_[0]->get_latency();
currentRouter =
}
// go to destination group - the only optical hop
- route->link_list.push_back(currentRouter->blue_link_);
+ route->link_list_.push_back(currentRouter->blue_link_);
+ if (currentRouter->limiter_)
+ route->link_list_.push_back(currentRouter->limiter_);
if (latency)
*latency += currentRouter->blue_link_->get_latency();
currentRouter =
// same group, but same blade ?
if (targetRouter->blade_ != currentRouter->blade_) {
- route->link_list.push_back(currentRouter->green_links_[targetCoords.blade]);
+ if (currentRouter->limiter_)
+ route->link_list_.push_back(currentRouter->limiter_);
+ route->link_list_.push_back(currentRouter->green_links_[targetCoords.blade]);
if (latency)
*latency += currentRouter->green_links_[targetCoords.blade]->get_latency();
currentRouter =
// same blade, but same chassis ?
if (targetRouter->chassis_ != currentRouter->chassis_) {
- route->link_list.push_back(currentRouter->black_links_[targetCoords.chassis]);
+ if (currentRouter->limiter_)
+ route->link_list_.push_back(currentRouter->limiter_);
+ route->link_list_.push_back(currentRouter->black_links_[targetCoords.chassis]);
if (latency)
*latency += currentRouter->black_links_[targetCoords.chassis]->get_latency();
}
}
- if (has_limiter()) { // limiter for receiver
- route->link_list.push_back(get_downlink_to(node_pos_with_loopback(dst->id())));
- }
-
// router->node local link
- route->link_list.push_back(
+ if (targetRouter->limiter_)
+ route->link_list_.push_back(targetRouter->limiter_);
+ route->link_list_.push_back(
targetRouter->my_nodes_[targetCoords.node * num_links_per_link_ + num_links_per_link_ - 1]);
+
if (latency)
*latency +=
targetRouter->my_nodes_[targetCoords.node * num_links_per_link_ + num_links_per_link_ - 1]->get_latency();
+ if (has_limiter()) { // limiter for receiver
+ 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 kernel
}
NetZone* create_dragonfly_zone(const std::string& name, const NetZone* parent, const DragonflyParams& params,
- 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)
{
/* initial checks */
if (bandwidth <= 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->build_upper_levels(set_callbacks);
return zone->get_iface();
}
