rename As::getRouteAndLatency into As::getLocalRoute

[simgrid.git] / src / kernel / routing / AsCluster.hpp

diff --git a/src/kernel/routing/AsCluster.hpp b/src/kernel/routing/AsCluster.hpp
index 013ca08..9dd3d09 100644 (file)
--- a/src/kernel/routing/AsCluster.hpp
+++ b/src/kernel/routing/AsCluster.hpp
@@ -6,6 +6,8 @@
 #ifndef SIMGRID_ROUTING_CLUSTER_HPP_
 #define SIMGRID_ROUTING_CLUSTER_HPP_
 
+#include <unordered_map>
+
 #include "src/kernel/routing/AsImpl.hpp"
 
 namespace simgrid {
@@ -14,23 +16,23 @@ namespace routing {
 
 class XBT_PRIVATE AsCluster: public AsImpl {
 public:
-  explicit AsCluster(const char*name);
-  ~AsCluster() override;
+  explicit AsCluster(As* father, const char* name);
 
-  void getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t into, double *latency) override;
+  void getLocalRoute(NetCard* src, NetCard* dst, sg_platf_route_cbarg_t into, double* latency) override;
   void getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges) override;
 
   virtual void create_links_for_node(sg_platf_cluster_cbarg_t cluster, int id, int rank, int position);
   virtual void parse_specific_arguments(sg_platf_cluster_cbarg_t cluster) {}
 
-  std::vector<s_surf_parsing_link_up_down_t> privateLinks_;
+  /* We use a map instead of a std::vector here because that's a sparse vector. Some values may not exist */
+  std::unordered_map<unsigned int, s_surf_parsing_link_up_down_t> privateLinks_;
 
   Link* backbone_ = nullptr;
   void *loopback_ = nullptr;
   NetCard *router_ = nullptr;
   bool hasLimiter_  = false;
   bool hasLoopback_ = false;
-  int linkCountPerNode_ = 1; /* may be 1 (if only a private link), 2 or 3 (if limiter and loopback) */
+  unsigned int linkCountPerNode_ = 1; /* may be 1 (if only a private link), 2 or 3 (if limiter and loopback) */
 
 };