X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7d195832dafde68afd749dd614e9a14d697bdb92..23d57f61bb2af9b8300606e977cae854a15a12bb:/include/simgrid/kernel/routing/FatTreeZone.hpp diff --git a/include/simgrid/kernel/routing/FatTreeZone.hpp b/include/simgrid/kernel/routing/FatTreeZone.hpp index a493182be1..fabeea233a 100644 --- a/include/simgrid/kernel/routing/FatTreeZone.hpp +++ b/include/simgrid/kernel/routing/FatTreeZone.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. */ @@ -8,9 +8,7 @@ #include -namespace simgrid { -namespace kernel { -namespace routing { +namespace simgrid::kernel::routing { class XBT_PRIVATE FatTreeLink; @@ -46,12 +44,13 @@ public: /** Virtual link standing for the node global capacity. */ - resource::LinkImpl* limiter_link_; + resource::StandardLinkImpl* limiter_link_; /** If present, communications from this node to this node will pass through it * instead of passing by an upper level switch. */ - resource::LinkImpl* loopback_; - FatTreeNode(int id, int level, int position, resource::LinkImpl* limiter, resource::LinkImpl* loopback) + resource::StandardLinkImpl* loopback_; + FatTreeNode(int id, int level, int position, resource::StandardLinkImpl* limiter, + resource::StandardLinkImpl* loopback) : id(id), level(level), position(position), limiter_link_(limiter), loopback_(loopback) { } @@ -64,7 +63,8 @@ public: */ class FatTreeLink { public: - FatTreeLink(FatTreeNode* src, FatTreeNode* dst, resource::LinkImpl* linkup, resource::LinkImpl* linkdown) + FatTreeLink(FatTreeNode* src, FatTreeNode* dst, resource::StandardLinkImpl* linkup, + resource::StandardLinkImpl* linkdown) : up_node_(dst), down_node_(src), up_link_(linkup), down_link_(linkdown) { } @@ -73,9 +73,9 @@ public: /** Lower end of the link */ FatTreeNode* down_node_; /** Link going up in the tree */ - resource::LinkImpl* up_link_; + resource::StandardLinkImpl* up_link_; /** Link going down in the tree */ - resource::LinkImpl* down_link_; + resource::StandardLinkImpl* down_link_; }; /** @ingroup ROUTING_API @@ -148,7 +148,7 @@ public: /** @brief Set FatTree topology */ void set_topology(unsigned int n_levels, const std::vector& down_links, const std::vector& up_links, const std::vector& link_count); - void add_processing_node(int id, resource::LinkImpl* limiter, resource::LinkImpl* loopback); + void add_processing_node(int id, resource::StandardLinkImpl* limiter, resource::StandardLinkImpl* loopback); /** * @brief Build upper levels (switches) in Fat-Tree * @@ -157,8 +157,6 @@ public: void build_upper_levels(const s4u::ClusterCallbacks& set_callbacks); void generate_dot_file(const std::string& filename = "fat_tree.dot") const; }; -} // namespace routing -} // namespace kernel -} // namespace simgrid +} // namespace simgrid::kernel::routing #endif