-/* Copyright (c) 2009-2021. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-2023. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "simgrid/kernel/routing/ClusterZone.hpp"
#include "simgrid/kernel/routing/NetPoint.hpp"
-#include "simgrid/kernel/routing/RoutedZone.hpp"
-#include "src/surf/network_interface.hpp"
+#include "src/kernel/resource/StandardLinkImpl.hpp"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_cluster, surf, "Routing part of surf");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_routing_cluster, ker_platform, "Kernel Cluster Routing");
/* This routing is specifically setup to represent clusters, aka homogeneous sets of machines
* Note that a router is created, easing the interconnection with the rest of the world. */
-namespace simgrid {
-namespace kernel {
-namespace routing {
+namespace simgrid::kernel::routing {
void ClusterBase::set_loopback()
{
link_lat_ = lat;
}
-void ClusterBase::add_private_link_at(unsigned int position, std::pair<resource::LinkImpl*, resource::LinkImpl*> link)
+void ClusterBase::add_private_link_at(unsigned long position,
+ std::pair<resource::StandardLinkImpl*, resource::StandardLinkImpl*> link)
{
- private_links_.insert({position, link});
+ private_links_.try_emplace(position, link);
}
-void ClusterBase::set_gateway(unsigned int position, NetPoint* gateway)
+void ClusterBase::set_gateway(unsigned long position, NetPoint* gateway)
{
xbt_assert(not gateway || not gateway->is_netzone(), "ClusterBase: gateway cannot be another netzone %s",
gateway->get_cname());
gateways_[position] = gateway;
}
-NetPoint* ClusterBase::get_gateway(unsigned int position)
+NetPoint* ClusterBase::get_gateway(unsigned long position)
{
- NetPoint* res = nullptr;
- auto it = gateways_.find(position);
- if (it != gateways_.end()) {
- res = it->second;
- }
- return res;
+ auto it = gateways_.find(position);
+ return it == gateways_.end() ? nullptr : it->second;
}
void ClusterBase::fill_leaf_from_cb(unsigned long position, const std::vector<unsigned long>& dimensions,
*limiter_link = nullptr;
// auxiliary function to get dims from index
- auto index_to_dims = [&dimensions](int index) {
- std::vector<unsigned int> dims_array(dimensions.size());
+ auto index_to_dims = [&dimensions](unsigned long index) {
+ std::vector<unsigned long> dims_array(dimensions.size());
for (auto i = static_cast<int>(dimensions.size() - 1); i >= 0; --i) {
- if (index <= 0) {
+ if (index == 0)
break;
- }
- unsigned int value = index % dimensions[i];
+ unsigned long value = index % dimensions[i];
dims_array[i] = value;
index = (index / dimensions[i]);
}
*node_netpoint = netpoint;
}
-} // namespace routing
-} // namespace kernel
-} // namespace simgrid
+} // namespace simgrid::kernel::routing