Add new entry in Release_Notes.

[simgrid.git] / include / simgrid / kernel / routing / DragonflyZone.hpp

diff --git a/include/simgrid/kernel/routing/DragonflyZone.hpp b/include/simgrid/kernel/routing/DragonflyZone.hpp
index 7c3411b..acb1122 100644 (file)
--- a/include/simgrid/kernel/routing/DragonflyZone.hpp
+++ b/include/simgrid/kernel/routing/DragonflyZone.hpp
@@ -1,29 +1,27 @@
-/* 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. */
 
-#ifndef SURF_ROUTING_CLUSTER_DRAGONFLY_HPP_
-#define SURF_ROUTING_CLUSTER_DRAGONFLY_HPP_
+#ifndef SIMGRID_ROUTING_CLUSTER_DRAGONFLY_HPP_
+#define SIMGRID_ROUTING_CLUSTER_DRAGONFLY_HPP_
 
 #include <simgrid/kernel/routing/ClusterZone.hpp>
 #include <simgrid/s4u/Link.hpp>
 
-namespace simgrid {
-namespace kernel {
-namespace routing {
+namespace simgrid::kernel::routing {
 
 class DragonflyRouter {
 public:
   unsigned int group_;
   unsigned int chassis_;
   unsigned int blade_;
-  resource::LinkImpl* blue_link_ = nullptr;
-  resource::LinkImpl* limiter_   = nullptr;
-  std::vector<resource::LinkImpl*> black_links_;
-  std::vector<resource::LinkImpl*> green_links_;
-  std::vector<resource::LinkImpl*> my_nodes_;
-  DragonflyRouter(unsigned group, unsigned chassis, unsigned blade, resource::LinkImpl* limiter)
+  resource::StandardLinkImpl* blue_link_ = nullptr;
+  resource::StandardLinkImpl* limiter_   = nullptr;
+  std::vector<resource::StandardLinkImpl*> black_links_;
+  std::vector<resource::StandardLinkImpl*> green_links_;
+  std::vector<resource::StandardLinkImpl*> my_nodes_;
+  DragonflyRouter(unsigned group, unsigned chassis, unsigned blade, resource::StandardLinkImpl* limiter)
       : group_(group), chassis_(chassis), blade_(blade), limiter_(limiter)
   {
   }
@@ -92,13 +90,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 int 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;
@@ -110,7 +107,5 @@ private:
   unsigned int num_links_per_link_     = 1; // splitduplex -> 2, only for local link
   std::vector<DragonflyRouter> routers_;
 };
-} // namespace routing
-} // namespace kernel
-} // namespace simgrid
+} // namespace simgrid::kernel::routing
 #endif