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

diff --git a/include/simgrid/kernel/routing/NetZoneImpl.hpp b/include/simgrid/kernel/routing/NetZoneImpl.hpp
index f1b55e6217..fd6aff2596 100644
--- a/include/simgrid/kernel/routing/NetZoneImpl.hpp
+++ b/include/simgrid/kernel/routing/NetZoneImpl.hpp
@@ -55,11 +55,11 @@ protected:
 
 public:
   /** @brief Make an host within that NetZone */
-  simgrid::s4u::Host* createHost(const char* name, std::vector<double>* speedPerPstate, int coreAmount,
-                                 std::map<std::string, std::string>* props);
+  simgrid::s4u::Host* create_host(const char* name, std::vector<double>* speed_per_pstate, int core_count,
+                                  std::map<std::string, std::string>* props);
   /** @brief Creates a new route in this NetZone */
-  void addBypassRoute(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst,
-                      std::vector<simgrid::surf::LinkImpl*>& link_list, bool symmetrical) override;
+  void add_bypass_route(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst,
+                        std::vector<resource::LinkImpl*>& link_list, bool symmetrical) override;
 
 protected:
   /**
@@ -70,11 +70,11 @@ protected:
    * @param into Container into which the traversed links and gateway informations should be pushed
    * @param latency Accumulator in which the latencies should be added (caller must set it to 0)
    */
-  virtual void getLocalRoute(NetPoint* src, NetPoint* dst, RouteCreationArgs* into, double* latency) = 0;
+  virtual void get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* into, double* latency) = 0;
   /** @brief retrieves the list of all routes of size 1 (of type src x dst x Link) */
   /* returns whether we found a bypass path */
-  bool getBypassRoute(routing::NetPoint* src, routing::NetPoint* dst,
-                      /* OUT */ std::vector<surf::LinkImpl*>& links, double* latency);
+  bool get_bypass_route(routing::NetPoint* src, routing::NetPoint* dst,
+                        /* OUT */ std::vector<resource::LinkImpl*>& links, double* latency);
 
 public:
   /* @brief get the route between two nodes in the full platform
@@ -84,11 +84,11 @@ public:
    * @param links Accumulator in which all traversed links should be pushed (caller must empty it)
    * @param latency Accumulator in which the latencies should be added (caller must set it to 0)
    */
-  static void getGlobalRoute(routing::NetPoint* src, routing::NetPoint* dst,
-                             /* OUT */ std::vector<surf::LinkImpl*>& links, double* latency);
+  static void get_global_route(routing::NetPoint* src, routing::NetPoint* dst,
+                               /* OUT */ std::vector<resource::LinkImpl*>& links, double* latency);
 
-  virtual void getGraph(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(xbt_graph_t graph, std::map<std::string, xbt_node_t>* nodes,
+                         std::map<std::string, xbt_edge_t>* edges) = 0;
   enum class RoutingMode {
     unset = 0, /**< Undefined type                                   */
     base,      /**< Base case: use simple link lists for routing     */
@@ -98,7 +98,7 @@ public:
   RoutingMode hierarchy_ = RoutingMode::unset;
 
 private:
-  std::map<std::pair<NetPoint*, NetPoint*>, BypassRoute*> bypassRoutes_; // src x dst -> route
+  std::map<std::pair<NetPoint*, NetPoint*>, BypassRoute*> bypass_routes_; // src x dst -> route
   routing::NetPoint* netpoint_ = nullptr;                                // Our representative in the father NetZone
 };
 } // namespace routing