X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1afd7a413d626bbaa56a551882c53dfa6b649cb0..3fafdab4bb94b48cb16c80690408a18f472e202b:/include/simgrid/kernel/routing/DragonflyZone.hpp diff --git a/include/simgrid/kernel/routing/DragonflyZone.hpp b/include/simgrid/kernel/routing/DragonflyZone.hpp index e798e77764..1dbb3d2e9d 100644 --- a/include/simgrid/kernel/routing/DragonflyZone.hpp +++ b/include/simgrid/kernel/routing/DragonflyZone.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2014-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2014-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. */ @@ -18,12 +18,12 @@ public: unsigned int group_; unsigned int chassis_; unsigned int blade_; - resource::LinkImpl* blue_link_ = nullptr; - resource::LinkImpl* limiter_ = nullptr; - std::vector black_links_; - std::vector green_links_; - std::vector my_nodes_; - DragonflyRouter(unsigned group, unsigned chassis, unsigned blade, resource::LinkImpl* limiter) + resource::StandardLinkImpl* blue_link_ = nullptr; + resource::StandardLinkImpl* limiter_ = nullptr; + std::vector black_links_; + std::vector green_links_; + std::vector my_nodes_; + DragonflyRouter(unsigned group, unsigned chassis, unsigned blade, resource::StandardLinkImpl* limiter) : group_(group), chassis_(chassis), blade_(blade), limiter_(limiter) { } @@ -92,13 +92,12 @@ public: /** @brief Set the characteristics of links inside the Dragonfly zone */ void set_link_characteristics(double bw, double lat, s4u::Link::SharingPolicy sharing_policy) override; Coords rankId_to_coords(unsigned long rank_id) const; - XBT_ATTRIB_DEPRECATED_v330("Please use rankId_to_coords(int)") void rankId_to_coords(int rank_id, - unsigned long coords[4]) const; private: void generate_routers(const s4u::ClusterCallbacks& set_callbacks); void generate_links(); - void generate_link(const std::string& id, int numlinks, resource::LinkImpl** linkup, resource::LinkImpl** linkdown); + void generate_link(const std::string& id, int numlinks, resource::StandardLinkImpl** linkup, + resource::StandardLinkImpl** linkdown); unsigned int num_nodes_per_blade_ = 0; unsigned int num_blades_per_chassis_ = 0;