X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/149c63f36e15b8500b1e826bda5138318ff7ba2b..a39a90a68780cd9dd43fadcacf9bce1d3c3df26d:/include/simgrid/kernel/routing/NetZoneImpl.hpp

diff --git a/include/simgrid/kernel/routing/NetZoneImpl.hpp b/include/simgrid/kernel/routing/NetZoneImpl.hpp
index 66c979056e..a353e60ff3 100644
--- a/include/simgrid/kernel/routing/NetZoneImpl.hpp
+++ b/include/simgrid/kernel/routing/NetZoneImpl.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2016-2020. The SimGrid Team. All rights reserved.               */
+/* Copyright (c) 2016-2021. 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. */
@@ -7,6 +7,7 @@
 #define SIMGRID_ROUTING_NETZONEIMPL_HPP
 
 #include <simgrid/forward.h>
+#include <simgrid/s4u/Link.hpp>
 #include <simgrid/s4u/NetZone.hpp>
 #include <xbt/PropertyHolder.hpp>
 #include <xbt/graph.h>
@@ -81,7 +82,7 @@ protected:
    *
    * @param src where from
    * @param dst where to
-   * @param into Container into which the traversed links and gateway informations should be pushed
+   * @param into Container into which the traversed links and gateway information should be pushed
    * @param latency Accumulator in which the latencies should be added (caller must set it to 0)
    */
   virtual void get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* into, double* latency) = 0;
@@ -102,10 +103,11 @@ public:
 
   resource::NetworkModel* network_model_;
 
+  const s4u::NetZone* get_iface() const { return &piface_; }
   s4u::NetZone* get_iface() { return &piface_; }
-  unsigned int get_table_size() { return vertices_.size(); }
-  std::vector<kernel::routing::NetPoint*> get_vertices() { return vertices_; }
-  NetZoneImpl* get_father() { return father_; }
+  unsigned int get_table_size() const { return vertices_.size(); }
+  std::vector<kernel::routing::NetPoint*> get_vertices() const { return vertices_; }
+  NetZoneImpl* get_father() const { return father_; }
   /** @brief Returns the list of direct children (no grand-children). This returns the internal data, no copy.
    * Don't mess with it.*/
   std::vector<NetZoneImpl*>* get_children() { return &children_; }
@@ -114,12 +116,14 @@ public:
   /** @brief Retrieves the name of that netzone as a C string */
   const char* get_cname() const { return name_.c_str(); };
 
-  std::vector<s4u::Host*> get_all_hosts();
-  int get_host_count();
+  std::vector<s4u::Host*> get_all_hosts() const;
+  int get_host_count() const;
 
   /** @brief Make a host within that NetZone */
-  s4u::Host* create_host(const std::string& name, const std::vector<double>& speed_per_pstate, int core_count,
-                         const std::map<std::string, std::string>* props);
+  s4u::Host* create_host(const std::string& name, const std::vector<double>& speed_per_pstate, int core_count);
+  /** @brief Make a link within that NetZone */
+  virtual s4u::Link* create_link(const std::string& name, const std::vector<double>& bandwidths,
+                                 s4u::Link::SharingPolicy policy);
   /** @brief Creates a new route in this NetZone */
   virtual void add_bypass_route(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst,
                                 std::vector<resource::LinkImpl*>& link_list, bool symmetrical);
@@ -141,8 +145,8 @@ public:
   static void get_global_route(routing::NetPoint* src, routing::NetPoint* dst,
                                /* OUT */ std::vector<resource::LinkImpl*>& links, double* latency);
 
-  virtual void get_graph(const s_xbt_graph_t* graph, std::map<std::string, xbt_node_t>* nodes,
-                         std::map<std::string, xbt_edge_t>* edges) = 0;
+  virtual 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) = 0;
 };
 } // namespace routing
 } // namespace kernel