Torus/Fat-Tree/Dragonfly: Aggregate callbacks

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

diff --git a/include/simgrid/kernel/routing/ClusterZone.hpp b/include/simgrid/kernel/routing/ClusterZone.hpp
index 3ead7da..1280241 100644 (file)
--- a/include/simgrid/kernel/routing/ClusterZone.hpp
+++ b/include/simgrid/kernel/routing/ClusterZone.hpp
@@ -105,11 +105,7 @@ public:
   void get_graph(const s_xbt_graph_t* graph, std::map<std::string, xbt_node_t, std::less<>>* nodes,
                  std::map<std::string, xbt_edge_t, std::less<>>* edges) override;
 
-  virtual void create_links_for_node(ClusterCreationArgs* cluster, int id, int rank, unsigned int position);
-  virtual void parse_specific_arguments(ClusterCreationArgs*)
-  {
-    /* this routing method does not require any specific argument */
-  }
+  void create_links_for_node(const ClusterCreationArgs* cluster, int id, int rank, unsigned int position);
 
   unsigned int node_pos(int id) const { return id * num_links_per_node_; }
   unsigned int node_pos_with_loopback(int id) const { return node_pos(id) + (has_loopback_ ? 1 : 0); }
@@ -119,10 +115,8 @@ public:
   }
   /** Fill the leaf retriving netpoint from a user's callback */
   void fill_leaf_from_cb(unsigned int position, const std::vector<unsigned int>& dimensions,
-                         const std::function<s4u::ClusterNetPointCb>& set_netpoint_cb,
-                         const std::function<s4u::ClusterLinkCb>& set_loopback_cb,
-                         const std::function<s4u::ClusterLinkCb>& set_limiter_cb, NetPoint** node_netpoint,
-                         s4u::Link** lb_link, s4u::Link** limiter_link);
+                         const s4u::ClusterCallbacks& set_callbacks, NetPoint** node_netpoint, s4u::Link** lb_link,
+                         s4u::Link** limiter_link);
 };
 } // namespace routing
 } // namespace kernel