X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a9c676f1de2ffc2dd8dbb788a582ac6023142048..78cf63c4e0797bb270e0e809f7cb41d9d598c214:/src/kernel/routing/TorusZone.cpp diff --git a/src/kernel/routing/TorusZone.cpp b/src/kernel/routing/TorusZone.cpp index 945ecf9867..65d846e516 100644 --- a/src/kernel/routing/TorusZone.cpp +++ b/src/kernel/routing/TorusZone.cpp @@ -7,7 +7,6 @@ #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 #include @@ -21,7 +20,7 @@ namespace simgrid { namespace kernel { namespace routing { -void TorusZone::create_links_for_node(ClusterCreationArgs* cluster, int id, int rank, unsigned int position) +void TorusZone::create_torus_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 @@ -34,16 +33,19 @@ void TorusZone::create_links_for_node(ClusterCreationArgs* cluster, int id, int ? rank - (current_dimension - 1) * dim_product : rank + dim_product; // name of neighbor is not right for non contiguous cluster radicals (as id != rank in this case) - std::string link_id = - std::string(cluster->id) + "_link_from_" + std::to_string(id) + "_to_" + std::to_string(neighbor_rank_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 (cluster->sharing_policy == s4u::Link::SharingPolicy::SPLITDUPLEX) { - linkup = create_link(link_id + "_UP", std::vector{cluster->bw})->set_latency(cluster->lat)->seal(); - linkdown = create_link(link_id + "_DOWN", std::vector{cluster->bw})->set_latency(cluster->lat)->seal(); + if (get_link_sharing_policy() == s4u::Link::SharingPolicy::SPLITDUPLEX) { + linkup = create_link(link_id + "_UP", std::vector{get_link_bandwidth()}) + ->set_latency(get_link_latency()) + ->seal(); + linkdown = create_link(link_id + "_DOWN", std::vector{get_link_bandwidth()}) + ->set_latency(get_link_latency()) + ->seal(); } else { - linkup = create_link(link_id, std::vector{cluster->bw})->set_latency(cluster->lat)->seal(); + linkup = create_link(link_id, std::vector{get_link_bandwidth()})->set_latency(get_link_latency())->seal(); linkdown = linkup; } /* @@ -62,19 +64,14 @@ std::vector TorusZone::parse_topo_parameters(const std::string& to boost::split(dimensions_str, topo_parameters, boost::is_any_of(",")); std::vector dimensions; - if (not dimensions_str.empty()) { - /* We are in a torus cluster - * 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); - } - return dimensions; -} + /* We are in a torus cluster + * 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), + [](const std::string& s) { return std::stoi(s); }); -void TorusZone::parse_specific_arguments(ClusterCreationArgs* cluster) -{ - set_topology(TorusZone::parse_topo_parameters(cluster->topo_parameters)); + return dimensions; } void TorusZone::set_topology(const std::vector& dimensions) @@ -84,7 +81,7 @@ void TorusZone::set_topology(const std::vector& dimensions) 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(const NetPoint* src, const 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()); @@ -94,9 +91,7 @@ void TorusZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* if (src->id() == dst->id() && has_loopback()) { resource::LinkImpl* uplink = get_uplink_from(node_pos(src->id())); - route->link_list.push_back(uplink); - if (lat) - *lat += uplink->get_latency(); + add_link_latency(route->link_list_, uplink, lat); return; } @@ -109,11 +104,11 @@ void TorusZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* * Arrays that hold the coordinates of the current node and the 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. */ - const unsigned int dsize = dimensions_.size(); + const unsigned long dsize = dimensions_.size(); std::vector myCoords(dsize); std::vector targetCoords(dsize); unsigned int dim_size_product = 1; - for (unsigned i = 0; i < dsize; i++) { + for (unsigned long i = 0; i < dsize; i++) { unsigned cur_dim_size = dimensions_[i]; myCoords[i] = (src->id() / dim_size_product) % cur_dim_size; targetCoords[i] = (dst->id() / dim_size_product) % cur_dim_size; @@ -170,7 +165,7 @@ void TorusZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* } 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; @@ -179,72 +174,16 @@ void TorusZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* else lnk = get_downlink_to(linkOffset); - route->link_list.push_back(lnk); - if (lat) - *lat += lnk->get_latency(); + add_link_latency(route->link_list_, lnk, lat); current_node = next_node; } -} - -/** @brief Auxiliary function to create hosts */ -static std::pair -create_torus_host(const kernel::routing::ClusterCreationArgs* cluster, s4u::NetZone* zone, - const std::vector& coord, int id) -{ - std::string host_id = std::string(cluster->prefix) + std::to_string(id) + cluster->suffix; - XBT_DEBUG("TorusCluster: creating host=%s speed=%f", host_id.c_str(), cluster->speeds.front()); - s4u::Host* host = zone->create_host(host_id, cluster->speeds) - ->set_core_count(cluster->core_amount) - ->set_properties(cluster->properties) - ->seal(); - return std::make_pair(host->get_netpoint(), nullptr); -} - -/** @brief Auxiliary function to create loopback links */ -static s4u::Link* create_torus_loopback(const kernel::routing::ClusterCreationArgs* cluster, s4u::NetZone* zone, - const std::vector& coord, int id) -{ - std::string link_id = std::string(cluster->id) + "_link_" + std::to_string(id) + "_loopback"; - XBT_DEBUG("TorusCluster: creating loopback link=%s bw=%f", link_id.c_str(), cluster->loopback_bw); - - s4u::Link* loopback = zone->create_link(link_id, cluster->loopback_bw) - ->set_sharing_policy(simgrid::s4u::Link::SharingPolicy::FATPIPE) - ->set_latency(cluster->loopback_lat) - ->seal(); - return loopback; -} - -/** @brief Auxiliary function to create limiter links */ -static s4u::Link* create_torus_limiter(const kernel::routing::ClusterCreationArgs* cluster, s4u::NetZone* zone, - const std::vector& coord, int id) -{ - std::string link_id = std::string(cluster->id) + "_link_" + std::to_string(id) + "_limiter"; - XBT_DEBUG("TorusCluster: creating limiter link=%s bw=%f", link_id.c_str(), cluster->limiter_link); - - s4u::Link* limiter = zone->create_link(link_id, cluster->limiter_link)->seal(); - return limiter; -} - -s4u::NetZone* create_torus_zone_with_hosts(const kernel::routing::ClusterCreationArgs* cluster, - const s4u::NetZone* parent) -{ - using namespace std::placeholders; - auto set_host = std::bind(create_torus_host, cluster, _1, _2, _3); - std::function set_loopback{}; - std::function set_limiter{}; - - if (cluster->loopback_bw > 0 || cluster->loopback_lat > 0) { - set_loopback = std::bind(create_torus_loopback, cluster, _1, _2, _3); - } - - if (cluster->limiter_link > 0) { - set_loopback = std::bind(create_torus_limiter, cluster, _1, _2, _3); + if (has_limiter()) { // limiter for receiver/destination + route->link_list_.push_back(get_downlink_to(node_pos_with_loopback(dst->id()))); } - - return s4u::create_torus_zone(cluster->id, parent, TorusZone::parse_topo_parameters(cluster->topo_parameters), - cluster->bw, cluster->lat, cluster->sharing_policy, set_host, set_loopback, - set_limiter); + // set gateways (if any) + route->gw_src_ = get_gateway(src->id()); + route->gw_dst_ = get_gateway(dst->id()); } } // namespace routing @@ -253,52 +192,33 @@ s4u::NetZone* create_torus_zone_with_hosts(const kernel::routing::ClusterCreatio namespace s4u { NetZone* create_torus_zone(const std::string& name, const NetZone* parent, const std::vector& dimensions, - double bandwidth, double latency, Link::SharingPolicy sharing_policy, - const std::function& set_netpoint, - const std::function& set_loopback, - const std::function& 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) + throw std::invalid_argument("TorusZone: incorrect dimensions parameter, each value must be > 0"); + if (bandwidth <= 0) + throw std::invalid_argument("TorusZone: incorrect bandwidth for internode communication, bw=" + + std::to_string(bandwidth)); + if (latency < 0) + throw std::invalid_argument("TorusZone: incorrect latency for internode communication, lat=" + + std::to_string(latency)); + auto* zone = new kernel::routing::TorusZone(name); zone->set_topology(dimensions); if (parent) zone->set_parent(parent->get_impl()); - int tot_elements = std::accumulate(dimensions.begin(), dimensions.end(), 1, std::multiplies<>()); - xbt_assert(tot_elements > 0, "TorusZone: incorrect dimensions, unable to create %d elements", tot_elements); - auto index_to_dims = [&dimensions](int index) { - std::vector dims_array(dimensions.size()); - for (int i = dimensions.size() - 1; i >= 0 && index > 0; --i) { - unsigned int value = index % dimensions[i]; - dims_array[i] = value; - index = ((index / dimensions[i])); - } - return dims_array; - }; + zone->set_link_characteristics(bandwidth, latency, sharing_policy); for (int i = 0; i < tot_elements; i++) { - kernel::routing::NetPoint *netpoint = nullptr, *gw = nullptr; - auto dims = index_to_dims(i); - std::tie(netpoint, gw) = set_netpoint(zone->get_iface(), dims, i); - // FIXME: add gateway if set - if (set_loopback) { - Link* loopback = set_loopback(zone->get_iface(), dims, i); - xbt_assert(loopback, "Invalid loopback link (nullptr) for element %d", i); - zone->set_loopback(); - zone->add_private_link_at(zone->node_pos(netpoint->id()), {loopback->get_impl(), loopback->get_impl()}); - } - if (set_limiter) { - Link* limiter = set_limiter(zone->get_iface(), dims, i); - xbt_assert(limiter, "Invalid limiter link (nullptr) for element %d", i); - zone->set_limiter(); - zone->add_private_link_at(zone->node_pos_with_loopback(netpoint->id()), - {limiter->get_impl(), limiter->get_impl()}); - } - kernel::routing::ClusterCreationArgs params; - params.id = name; - params.bw = bandwidth; - params.lat = latency; - params.sharing_policy = sharing_policy; - zone->create_links_for_node(¶ms, netpoint->id(), i, zone->node_pos_with_loopback_limiter(netpoint->id())); + kernel::routing::NetPoint* netpoint; + Link* limiter; + Link* loopback; + zone->fill_leaf_from_cb(i, dimensions, set_callbacks, &netpoint, &loopback, &limiter); + + zone->create_torus_links(netpoint->id(), i, zone->node_pos_with_loopback_limiter(netpoint->id())); } return zone->get_iface();