#include "simgrid/kernel/routing/NetPoint.hpp"
#include "simgrid/kernel/routing/RoutedZone.hpp"
#include "src/surf/network_interface.hpp"
-#include "src/surf/xml/platf_private.hpp" // FIXME: RouteCreationArgs and friends
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_cluster, surf, "Routing part of surf");
}
}
+void ClusterZone::set_link_characteristics(double bw, double lat, s4u::Link::SharingPolicy sharing_policy)
+{
+ link_sharing_policy_ = sharing_policy;
+ link_bw_ = bw;
+ link_lat_ = lat;
+}
+
void ClusterZone::add_private_link_at(unsigned int position, std::pair<resource::LinkImpl*, resource::LinkImpl*> link)
{
private_links_.insert({position, link});
}
-void ClusterZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* route, double* lat)
+void ClusterZone::get_local_route(NetPoint* src, NetPoint* dst, Route* route, double* lat)
{
XBT_VERB("cluster getLocalRoute from '%s'[%u] to '%s'[%u]", src->get_cname(), src->id(), dst->get_cname(), dst->id());
xbt_assert(not private_links_.empty(),
XBT_WARN("Routing from a cluster private router to itself is meaningless");
} else {
std::pair<resource::LinkImpl*, resource::LinkImpl*> info = private_links_.at(node_pos(src->id()));
- route->link_list.push_back(info.first);
+ route->link_list_.push_back(info.first);
if (lat)
*lat += info.first->get_latency();
}
if (not src->is_router()) { // No private link for the private router
if (has_limiter_) { // limiter for sender
std::pair<resource::LinkImpl*, resource::LinkImpl*> info = private_links_.at(node_pos_with_loopback(src->id()));
- route->link_list.push_back(info.first);
+ route->link_list_.push_back(info.first);
}
std::pair<resource::LinkImpl*, resource::LinkImpl*> info =
private_links_.at(node_pos_with_loopback_limiter(src->id()));
if (info.first) { // link up
- route->link_list.push_back(info.first);
+ route->link_list_.push_back(info.first);
if (lat)
*lat += info.first->get_latency();
}
}
if (backbone_) {
- route->link_list.push_back(backbone_);
+ route->link_list_.push_back(backbone_);
if (lat)
*lat += backbone_->get_latency();
}
private_links_.at(node_pos_with_loopback_limiter(dst->id()));
if (info.second) { // link down
- route->link_list.push_back(info.second);
+ route->link_list_.push_back(info.second);
if (lat)
*lat += info.second->get_latency();
}
if (has_limiter_) { // limiter for receiver
info = private_links_.at(node_pos_with_loopback(dst->id()));
- route->link_list.push_back(info.first);
+ route->link_list_.push_back(info.first);
}
}
}
}
}
-void ClusterZone::create_links_for_node(ClusterCreationArgs* cluster, int id, int /*rank*/, unsigned int position)
+void ClusterZone::create_links(int id, int rank)
{
- std::string link_id = cluster->id + "_link_" + std::to_string(id);
+ std::string link_id = get_name() + "_link_" + std::to_string(id);
const s4u::Link* linkUp;
const s4u::Link* linkDown;
- if (cluster->sharing_policy == simgrid::s4u::Link::SharingPolicy::SPLITDUPLEX) {
- linkUp = create_link(link_id + "_UP", std::vector<double>{cluster->bw})->set_latency(cluster->lat)->seal();
- linkDown = create_link(link_id + "_DOWN", std::vector<double>{cluster->bw})->set_latency(cluster->lat)->seal();
+ if (link_sharing_policy_ == simgrid::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();
} else {
- linkUp = create_link(link_id, std::vector<double>{cluster->bw})->set_latency(cluster->lat)->seal();
+ linkUp = create_link(link_id, std::vector<double>{link_bw_})->set_latency(link_lat_)->seal();
linkDown = linkUp;
}
- private_links_.insert({position, {linkUp->get_impl(), linkDown->get_impl()}});
+ private_links_.insert({node_pos_with_loopback_limiter(rank), {linkUp->get_impl(), linkDown->get_impl()}});
}
void ClusterZone::set_gateway(unsigned int position, NetPoint* gateway)
}
void ClusterZone::fill_leaf_from_cb(unsigned int position, const std::vector<unsigned int>& dimensions,
- const std::function<s4u::ClusterNetPointCb>& set_netpoint_cb,
- const std::function<s4u::ClusterLinkCb>& set_loopback_cb,
- const std::function<s4u::ClusterLinkCb>& set_limiter_cb, NetPoint** node_netpoint,
+ const s4u::ClusterCallbacks& set_callbacks, NetPoint** node_netpoint,
s4u::Link** lb_link, s4u::Link** limiter_link)
{
xbt_assert(node_netpoint, "Invalid node_netpoint parameter");
kernel::routing::NetPoint* netpoint = nullptr;
kernel::routing::NetPoint* gw = nullptr;
auto dims = index_to_dims(position);
- std::tie(netpoint, gw) = set_netpoint_cb(get_iface(), dims, position);
+ std::tie(netpoint, gw) = set_callbacks.netpoint(get_iface(), dims, position);
xbt_assert(netpoint, "set_netpoint(elem=%u): Invalid netpoint (nullptr)", position);
if (netpoint->is_netzone()) {
xbt_assert(gw && not gw->is_netzone(),
// setting gateway
set_gateway(position, gw);
- if (set_loopback_cb) {
- s4u::Link* loopback = set_loopback_cb(get_iface(), dims, position);
+ if (set_callbacks.loopback) {
+ s4u::Link* loopback = set_callbacks.loopback(get_iface(), dims, position);
xbt_assert(loopback, "set_loopback: Invalid loopback link (nullptr) for element %u", position);
set_loopback();
add_private_link_at(node_pos(netpoint->id()), {loopback->get_impl(), loopback->get_impl()});
*lb_link = loopback;
}
- if (set_limiter_cb) {
- s4u::Link* limiter = set_limiter_cb(get_iface(), dims, position);
+ if (set_callbacks.limiter) {
+ s4u::Link* limiter = set_callbacks.limiter(get_iface(), dims, position);
xbt_assert(limiter, "set_limiter: Invalid limiter link (nullptr) for element %u", position);
set_limiter();
add_private_link_at(node_pos_with_loopback(netpoint->id()), {limiter->get_impl(), limiter->get_impl()});
} // namespace routing
} // namespace kernel
-
-namespace s4u {
-NetZone* create_cluster_zone(const std::string& name)
-{
- return (new kernel::routing::ClusterZone(name))->get_iface();
-}
-} // namespace s4u
-
} // namespace simgrid