From e53e94eb6cb9f8edda78234ec8a0ba7880431d2a Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Mon, 31 May 2021 10:22:02 +0200 Subject: [PATCH] Add some 'const' qualifiers. This started with NetPoint::get_englobing_zone() and propagated quickly... --- .../platform-properties/s4u-platform-properties.cpp | 2 +- include/simgrid/kernel/routing/DijkstraZone.hpp | 2 +- include/simgrid/kernel/routing/DragonflyZone.hpp | 2 +- include/simgrid/kernel/routing/EmptyZone.hpp | 2 +- include/simgrid/kernel/routing/FatTreeZone.hpp | 2 +- include/simgrid/kernel/routing/FloydZone.hpp | 2 +- include/simgrid/kernel/routing/FullZone.hpp | 2 +- include/simgrid/kernel/routing/NetPoint.hpp | 2 +- include/simgrid/kernel/routing/NetZoneImpl.hpp | 10 +++++----- include/simgrid/kernel/routing/RoutedZone.hpp | 2 +- include/simgrid/kernel/routing/StarZone.hpp | 2 +- include/simgrid/kernel/routing/TorusZone.hpp | 2 +- include/simgrid/kernel/routing/VivaldiZone.hpp | 2 +- include/simgrid/kernel/routing/WifiZone.hpp | 2 +- include/simgrid/s4u/Host.hpp | 2 +- src/instr/instr_interface.cpp | 4 ++-- src/kernel/routing/DijkstraZone.cpp | 2 +- src/kernel/routing/DragonflyZone.cpp | 2 +- src/kernel/routing/FatTreeZone.cpp | 2 +- src/kernel/routing/FloydZone.cpp | 2 +- src/kernel/routing/FullZone.cpp | 2 +- src/kernel/routing/NetZoneImpl.cpp | 8 ++++---- src/kernel/routing/RoutedZone.cpp | 2 +- src/kernel/routing/StarZone.cpp | 2 +- src/kernel/routing/TorusZone.cpp | 2 +- src/kernel/routing/VivaldiZone.cpp | 4 ++-- src/kernel/routing/WifiZone.cpp | 2 +- src/s4u/s4u_Host.cpp | 2 +- teshsuite/simdag/flatifier/flatifier.cpp | 4 ++-- 29 files changed, 39 insertions(+), 39 deletions(-) diff --git a/examples/cpp/platform-properties/s4u-platform-properties.cpp b/examples/cpp/platform-properties/s4u-platform-properties.cpp index 6f3f8e3d56..63c655e6f0 100644 --- a/examples/cpp/platform-properties/s4u-platform-properties.cpp +++ b/examples/cpp/platform-properties/s4u-platform-properties.cpp @@ -51,7 +51,7 @@ static void test_host(const std::string& hostname) /* Restore the value for the next test */ thehost->set_property(exist, "180"); - auto thezone = thehost->get_englobing_zone(); + const auto* thezone = thehost->get_englobing_zone(); XBT_INFO("== Print the properties of the zone '%s' that contains '%s'", thezone->get_cname(), hostname.c_str()); const std::unordered_map* zoneprops = thezone->get_properties(); keys.clear(); diff --git a/include/simgrid/kernel/routing/DijkstraZone.hpp b/include/simgrid/kernel/routing/DijkstraZone.hpp index ec3992fc74..6799e29d3b 100644 --- a/include/simgrid/kernel/routing/DijkstraZone.hpp +++ b/include/simgrid/kernel/routing/DijkstraZone.hpp @@ -49,7 +49,7 @@ public: * After this function returns, any node in the graph * will have a loopback attached to it. */ - void get_local_route(NetPoint* src, NetPoint* dst, Route* route, double* lat) override; + void get_local_route(const NetPoint* src, const NetPoint* dst, Route* route, double* lat) override; void add_route(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst, const std::vector& link_list, bool symmetrical) override; }; diff --git a/include/simgrid/kernel/routing/DragonflyZone.hpp b/include/simgrid/kernel/routing/DragonflyZone.hpp index 5e3b0a1491..e54343556d 100644 --- a/include/simgrid/kernel/routing/DragonflyZone.hpp +++ b/include/simgrid/kernel/routing/DragonflyZone.hpp @@ -72,7 +72,7 @@ public: }; explicit DragonflyZone(const std::string& name); - void get_local_route(NetPoint* src, NetPoint* dst, Route* into, double* latency) override; + void get_local_route(const NetPoint* src, const NetPoint* dst, Route* into, double* latency) override; /** * @brief Parse topology parameters from string format * diff --git a/include/simgrid/kernel/routing/EmptyZone.hpp b/include/simgrid/kernel/routing/EmptyZone.hpp index 4b9114c3f9..c1eb7f7de3 100644 --- a/include/simgrid/kernel/routing/EmptyZone.hpp +++ b/include/simgrid/kernel/routing/EmptyZone.hpp @@ -23,7 +23,7 @@ class XBT_PRIVATE EmptyZone : public NetZoneImpl { public: explicit EmptyZone(const std::string& name) : NetZoneImpl(name) {} - void get_local_route(NetPoint* src, NetPoint* dst, Route* into, double* latency) override + void get_local_route(const NetPoint* src, const NetPoint* dst, Route* into, double* latency) override { /* There can't be route in an Empty zone */ } diff --git a/include/simgrid/kernel/routing/FatTreeZone.hpp b/include/simgrid/kernel/routing/FatTreeZone.hpp index 75f83730f6..33cb0788fc 100644 --- a/include/simgrid/kernel/routing/FatTreeZone.hpp +++ b/include/simgrid/kernel/routing/FatTreeZone.hpp @@ -134,7 +134,7 @@ public: explicit FatTreeZone(const std::string& name) : ClusterBase(name){}; FatTreeZone(const FatTreeZone&) = delete; FatTreeZone& operator=(const FatTreeZone&) = delete; - void get_local_route(NetPoint* src, NetPoint* dst, Route* into, double* latency) override; + void get_local_route(const NetPoint* src, const NetPoint* dst, Route* into, double* latency) override; /** * @brief Parse the topology parameters from string format diff --git a/include/simgrid/kernel/routing/FloydZone.hpp b/include/simgrid/kernel/routing/FloydZone.hpp index 1afe57468e..0277648957 100644 --- a/include/simgrid/kernel/routing/FloydZone.hpp +++ b/include/simgrid/kernel/routing/FloydZone.hpp @@ -35,7 +35,7 @@ public: FloydZone(const FloydZone&) = delete; FloydZone& operator=(const FloydZone&) = delete; - void get_local_route(NetPoint* src, NetPoint* dst, Route* into, double* latency) override; + void get_local_route(const NetPoint* src, const NetPoint* dst, Route* into, double* latency) override; void add_route(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst, const std::vector& link_list, bool symmetrical) override; }; diff --git a/include/simgrid/kernel/routing/FullZone.hpp b/include/simgrid/kernel/routing/FullZone.hpp index f602e8193d..df8a1896f0 100644 --- a/include/simgrid/kernel/routing/FullZone.hpp +++ b/include/simgrid/kernel/routing/FullZone.hpp @@ -29,7 +29,7 @@ public: FullZone(const FullZone&) = delete; FullZone& operator=(const FullZone) = delete; - void get_local_route(NetPoint* src, NetPoint* dst, Route* into, double* latency) override; + void get_local_route(const NetPoint* src, const NetPoint* dst, Route* into, double* latency) override; void add_route(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst, const std::vector& link_list, bool symmetrical) override; }; diff --git a/include/simgrid/kernel/routing/NetPoint.hpp b/include/simgrid/kernel/routing/NetPoint.hpp index 7b4126c146..5afa2eb364 100644 --- a/include/simgrid/kernel/routing/NetPoint.hpp +++ b/include/simgrid/kernel/routing/NetPoint.hpp @@ -35,7 +35,7 @@ public: const std::string& get_name() const { return name_; } const char* get_cname() const { return name_.c_str(); } /** @brief the NetZone in which this NetPoint is included */ - NetZoneImpl* get_englobing_zone() { return englobing_zone_; } + NetZoneImpl* get_englobing_zone() const { return englobing_zone_; } /** @brief Set the NetZone in which this NetPoint is included */ NetPoint* set_englobing_zone(NetZoneImpl* netzone_p); NetPoint* set_coordinates(const std::string& coords); diff --git a/include/simgrid/kernel/routing/NetZoneImpl.hpp b/include/simgrid/kernel/routing/NetZoneImpl.hpp index 257c8e7af6..430a1671ed 100644 --- a/include/simgrid/kernel/routing/NetZoneImpl.hpp +++ b/include/simgrid/kernel/routing/NetZoneImpl.hpp @@ -83,7 +83,7 @@ class XBT_PUBLIC NetZoneImpl : public xbt::PropertyHolder { std::string name_; bool sealed_ = false; // We cannot add more content when sealed - std::map, BypassRoute*> bypass_routes_; // src x dst -> route + std::map, BypassRoute*> bypass_routes_; // src x dst -> route routing::NetPoint* netpoint_ = nullptr; // Our representative in the father NetZone protected: @@ -100,10 +100,10 @@ protected: * @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, Route* into, double* latency) = 0; + virtual void get_local_route(const NetPoint* src, const NetPoint* dst, Route* 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 get_bypass_route(routing::NetPoint* src, routing::NetPoint* dst, + bool get_bypass_route(const routing::NetPoint* src, const routing::NetPoint* dst, /* OUT */ std::vector& links, double* latency, std::unordered_set& netzones); @@ -186,11 +186,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 get_global_route(routing::NetPoint* src, routing::NetPoint* dst, + static void get_global_route(const routing::NetPoint* src, const routing::NetPoint* dst, /* OUT */ std::vector& links, double* latency); /** @brief Similar to get_global_route but get the NetZones traversed by route */ - static void get_global_route_with_netzones(routing::NetPoint* src, routing::NetPoint* dst, + static void get_global_route_with_netzones(const routing::NetPoint* src, const routing::NetPoint* dst, /* OUT */ std::vector& links, double* latency, std::unordered_set& netzones); diff --git a/include/simgrid/kernel/routing/RoutedZone.hpp b/include/simgrid/kernel/routing/RoutedZone.hpp index 3fcbd94c6e..7fcd038088 100644 --- a/include/simgrid/kernel/routing/RoutedZone.hpp +++ b/include/simgrid/kernel/routing/RoutedZone.hpp @@ -64,7 +64,7 @@ protected: { return new_extended_route(hierarchy, gw_src, gw_dst, link_list, preserve_order); } - void get_route_check_params(NetPoint* src, NetPoint* dst) const; + void get_route_check_params(const NetPoint* src, const NetPoint* dst) const; void add_route_check_params(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst, const std::vector& link_list, bool symmetrical) const; }; diff --git a/include/simgrid/kernel/routing/StarZone.hpp b/include/simgrid/kernel/routing/StarZone.hpp index c8ad0be35f..575b60ff45 100644 --- a/include/simgrid/kernel/routing/StarZone.hpp +++ b/include/simgrid/kernel/routing/StarZone.hpp @@ -64,7 +64,7 @@ class StarZone : public ClusterZone { // implements the old ClusterZone public: explicit StarZone(const std::string& name); - void get_local_route(NetPoint* src, NetPoint* dst, Route* route, double* latency) override; + void get_local_route(const NetPoint* src, const NetPoint* dst, Route* route, double* latency) override; void get_graph(const s_xbt_graph_t* graph, std::map>* nodes, std::map>* edges) override; diff --git a/include/simgrid/kernel/routing/TorusZone.hpp b/include/simgrid/kernel/routing/TorusZone.hpp index 329a031e9c..25b429004e 100644 --- a/include/simgrid/kernel/routing/TorusZone.hpp +++ b/include/simgrid/kernel/routing/TorusZone.hpp @@ -25,7 +25,7 @@ class XBT_PRIVATE TorusZone : public ClusterBase { public: explicit TorusZone(const std::string& name) : ClusterBase(name){}; void create_torus_links(int id, int rank, unsigned int position); - void get_local_route(NetPoint* src, NetPoint* dst, Route* into, double* latency) override; + void get_local_route(const NetPoint* src, const NetPoint* dst, Route* into, double* latency) override; void set_topology(const std::vector& dimensions); /** @brief Convert topology parameters from string to vector of uint */ diff --git a/include/simgrid/kernel/routing/VivaldiZone.hpp b/include/simgrid/kernel/routing/VivaldiZone.hpp index ffc6f2ed66..c8ec4cb9d4 100644 --- a/include/simgrid/kernel/routing/VivaldiZone.hpp +++ b/include/simgrid/kernel/routing/VivaldiZone.hpp @@ -48,7 +48,7 @@ class XBT_PRIVATE VivaldiZone : public StarZone { public: using StarZone::StarZone; void set_peer_link(NetPoint* netpoint, double bw_in, double bw_out); - void get_local_route(NetPoint* src, NetPoint* dst, Route* into, double* latency) override; + void get_local_route(const NetPoint* src, const NetPoint* dst, Route* into, double* latency) override; }; namespace vivaldi { diff --git a/include/simgrid/kernel/routing/WifiZone.hpp b/include/simgrid/kernel/routing/WifiZone.hpp index 2eb9f76611..830779a793 100644 --- a/include/simgrid/kernel/routing/WifiZone.hpp +++ b/include/simgrid/kernel/routing/WifiZone.hpp @@ -29,7 +29,7 @@ public: WifiZone(const WifiZone&) = delete; WifiZone& operator=(const WifiZone) = delete; - void get_local_route(NetPoint* src, NetPoint* dst, Route* into, double* latency) override; + void get_local_route(const NetPoint* src, const NetPoint* dst, Route* into, double* latency) override; s4u::Link* create_link(const std::string& name, const std::vector& bandwidths) override; NetPoint* get_access_point() const { return access_point_; } }; diff --git a/include/simgrid/s4u/Host.hpp b/include/simgrid/s4u/Host.hpp index c6f580cd6d..2f6502c08d 100644 --- a/include/simgrid/s4u/Host.hpp +++ b/include/simgrid/s4u/Host.hpp @@ -200,7 +200,7 @@ public: XBT_ATTRIB_DEPRECATED_v330("Please use Host::sendto()") void send_to(Host* dest, double byte_amount); #endif - NetZone* get_englobing_zone(); + NetZone* get_englobing_zone() const; /** Block the calling actor on an execution located on the called host * * It is not a problem if the actor is not located on the called host. diff --git a/src/instr/instr_interface.cpp b/src/instr/instr_interface.cpp index 245e6092a7..bb63291955 100644 --- a/src/instr/instr_interface.cpp +++ b/src/instr/instr_interface.cpp @@ -296,10 +296,10 @@ static void instr_user_variable(double time, const char* resource, const char* v static void instr_user_srcdst_variable(double time, const char *src, const char *dst, const char *variable, const char *father_type, double value, InstrUserVariable what) { - simgrid::kernel::routing::NetPoint* src_elm = sg_netpoint_by_name_or_null(src); + const simgrid::kernel::routing::NetPoint* src_elm = sg_netpoint_by_name_or_null(src); xbt_assert(src_elm, "Element '%s' not found!", src); - simgrid::kernel::routing::NetPoint* dst_elm = sg_netpoint_by_name_or_null(dst); + const simgrid::kernel::routing::NetPoint* dst_elm = sg_netpoint_by_name_or_null(dst); xbt_assert(dst_elm, "Element '%s' not found!", dst); std::vector route; diff --git a/src/kernel/routing/DijkstraZone.cpp b/src/kernel/routing/DijkstraZone.cpp index 374536ca26..1859eaf807 100644 --- a/src/kernel/routing/DijkstraZone.cpp +++ b/src/kernel/routing/DijkstraZone.cpp @@ -84,7 +84,7 @@ xbt_node_t DijkstraZone::node_map_search(int id) /* Parsing */ -void DijkstraZone::get_local_route(NetPoint* src, NetPoint* dst, Route* route, double* lat) +void DijkstraZone::get_local_route(const NetPoint* src, const NetPoint* dst, Route* route, double* lat) { get_route_check_params(src, dst); int src_id = src->id(); diff --git a/src/kernel/routing/DragonflyZone.cpp b/src/kernel/routing/DragonflyZone.cpp index f9781e4e37..9248f79822 100644 --- a/src/kernel/routing/DragonflyZone.cpp +++ b/src/kernel/routing/DragonflyZone.cpp @@ -281,7 +281,7 @@ void DragonflyZone::generate_links() } } -void DragonflyZone::get_local_route(NetPoint* src, NetPoint* dst, Route* route, double* latency) +void DragonflyZone::get_local_route(const NetPoint* src, const NetPoint* dst, Route* route, double* latency) { // Minimal routing version. // TODO : non-minimal random one, and adaptive ? diff --git a/src/kernel/routing/FatTreeZone.cpp b/src/kernel/routing/FatTreeZone.cpp index 046349e9a5..774696c913 100644 --- a/src/kernel/routing/FatTreeZone.cpp +++ b/src/kernel/routing/FatTreeZone.cpp @@ -43,7 +43,7 @@ bool FatTreeZone::is_in_sub_tree(const FatTreeNode* root, const FatTreeNode* nod return true; } -void FatTreeZone::get_local_route(NetPoint* src, NetPoint* dst, Route* into, double* latency) +void FatTreeZone::get_local_route(const NetPoint* src, const NetPoint* dst, Route* into, double* latency) { if (dst->is_router() || src->is_router()) return; diff --git a/src/kernel/routing/FloydZone.cpp b/src/kernel/routing/FloydZone.cpp index 5cc4e807f3..76411b2600 100644 --- a/src/kernel/routing/FloydZone.cpp +++ b/src/kernel/routing/FloydZone.cpp @@ -33,7 +33,7 @@ void FloydZone::init_tables(unsigned int table_size) } } -void FloydZone::get_local_route(NetPoint* src, NetPoint* dst, Route* route, double* lat) +void FloydZone::get_local_route(const NetPoint* src, const NetPoint* dst, Route* route, double* lat) { get_route_check_params(src, dst); diff --git a/src/kernel/routing/FullZone.cpp b/src/kernel/routing/FullZone.cpp index 4c47c460cd..da6841f13d 100644 --- a/src/kernel/routing/FullZone.cpp +++ b/src/kernel/routing/FullZone.cpp @@ -41,7 +41,7 @@ void FullZone::do_seal() } } -void FullZone::get_local_route(NetPoint* src, NetPoint* dst, Route* res, double* lat) +void FullZone::get_local_route(const NetPoint* src, const NetPoint* dst, Route* res, double* lat) { XBT_DEBUG("full getLocalRoute from %s[%u] to %s[%u]", src->get_cname(), src->id(), dst->get_cname(), dst->id()); diff --git a/src/kernel/routing/NetZoneImpl.cpp b/src/kernel/routing/NetZoneImpl.cpp index 5706ce1338..20ada8a44f 100644 --- a/src/kernel/routing/NetZoneImpl.cpp +++ b/src/kernel/routing/NetZoneImpl.cpp @@ -269,7 +269,7 @@ void NetZoneImpl::add_bypass_route(NetPoint* src, NetPoint* dst, NetPoint* gw_sr * dst * @endverbatim */ -static void find_common_ancestors(NetPoint* src, NetPoint* dst, +static void find_common_ancestors(const NetPoint* src, const NetPoint* dst, /* OUT */ NetZoneImpl** common_ancestor, NetZoneImpl** src_ancestor, NetZoneImpl** dst_ancestor) { @@ -329,7 +329,7 @@ static void find_common_ancestors(NetPoint* src, NetPoint* dst, } /* PRECONDITION: this is the common ancestor of src and dst */ -bool NetZoneImpl::get_bypass_route(NetPoint* src, NetPoint* dst, +bool NetZoneImpl::get_bypass_route(const NetPoint* src, const NetPoint* dst, /* OUT */ std::vector& links, double* latency, std::unordered_set& netzones) { @@ -421,14 +421,14 @@ bool NetZoneImpl::get_bypass_route(NetPoint* src, NetPoint* dst, return false; } -void NetZoneImpl::get_global_route(NetPoint* src, NetPoint* dst, +void NetZoneImpl::get_global_route(const NetPoint* src, const NetPoint* dst, /* OUT */ std::vector& links, double* latency) { std::unordered_set netzones; get_global_route_with_netzones(src, dst, links, latency, netzones); } -void NetZoneImpl::get_global_route_with_netzones(NetPoint* src, NetPoint* dst, +void NetZoneImpl::get_global_route_with_netzones(const NetPoint* src, const NetPoint* dst, /* OUT */ std::vector& links, double* latency, std::unordered_set& netzones) { diff --git a/src/kernel/routing/RoutedZone.cpp b/src/kernel/routing/RoutedZone.cpp index cc10d43792..3c28dcee41 100644 --- a/src/kernel/routing/RoutedZone.cpp +++ b/src/kernel/routing/RoutedZone.cpp @@ -131,7 +131,7 @@ Route* RoutedZone::new_extended_route(RoutingMode hierarchy, NetPoint* gw_src, N return result; } -void RoutedZone::get_route_check_params(NetPoint* src, NetPoint* dst) const +void RoutedZone::get_route_check_params(const NetPoint* src, const NetPoint* dst) const { xbt_assert(src, "Cannot find a route from nullptr to %s", dst->get_cname()); xbt_assert(dst, "Cannot find a route from %s to nullptr", src->get_cname()); diff --git a/src/kernel/routing/StarZone.cpp b/src/kernel/routing/StarZone.cpp index 3afd979d3f..7072a0178c 100644 --- a/src/kernel/routing/StarZone.cpp +++ b/src/kernel/routing/StarZone.cpp @@ -29,7 +29,7 @@ void StarZone::add_links_to_route(const std::vector& links, } } -void StarZone::get_local_route(NetPoint* src, NetPoint* dst, Route* route, double* latency) +void StarZone::get_local_route(const NetPoint* src, const NetPoint* dst, Route* route, double* latency) { XBT_VERB("StarZone getLocalRoute from '%s'[%u] to '%s'[%u]", src->get_cname(), src->id(), dst->get_cname(), dst->id()); diff --git a/src/kernel/routing/TorusZone.cpp b/src/kernel/routing/TorusZone.cpp index b7c7001a38..21b83cfab9 100644 --- a/src/kernel/routing/TorusZone.cpp +++ b/src/kernel/routing/TorusZone.cpp @@ -82,7 +82,7 @@ void TorusZone::set_topology(const std::vector& dimensions) set_num_links_per_node(dimensions_.size()); } -void TorusZone::get_local_route(NetPoint* src, NetPoint* dst, Route* route, double* lat) +void TorusZone::get_local_route(const NetPoint* src, const NetPoint* dst, Route* route, double* lat) { XBT_VERB("torus getLocalRoute from '%s'[%u] to '%s'[%u]", src->get_cname(), src->id(), dst->get_cname(), dst->id()); diff --git a/src/kernel/routing/VivaldiZone.cpp b/src/kernel/routing/VivaldiZone.cpp index eceb3f7ae5..aa2a15d05a 100644 --- a/src/kernel/routing/VivaldiZone.cpp +++ b/src/kernel/routing/VivaldiZone.cpp @@ -49,7 +49,7 @@ static inline double euclidean_dist_comp(double src_coord, double dst_coord) return (src_coord - dst_coord) * (src_coord - dst_coord); } -static const std::vector& netpoint_get_coords(NetPoint* np) +static const std::vector& netpoint_get_coords(const NetPoint* np) { const auto* coords = np->extension(); xbt_assert(coords, "Please specify the Vivaldi coordinates of %s %s (%p)", @@ -70,7 +70,7 @@ void VivaldiZone::set_peer_link(NetPoint* netpoint, double bw_in, double bw_out) add_route(nullptr, netpoint, nullptr, nullptr, {linkDown->get_impl()}, false); } -void VivaldiZone::get_local_route(NetPoint* src, NetPoint* dst, Route* route, double* lat) +void VivaldiZone::get_local_route(const NetPoint* src, const NetPoint* dst, Route* route, double* lat) { XBT_DEBUG("vivaldi getLocalRoute from '%s'[%u] '%s'[%u]", src->get_cname(), src->id(), dst->get_cname(), dst->id()); diff --git a/src/kernel/routing/WifiZone.cpp b/src/kernel/routing/WifiZone.cpp index 95f3c16b48..df2b0c123a 100644 --- a/src/kernel/routing/WifiZone.cpp +++ b/src/kernel/routing/WifiZone.cpp @@ -28,7 +28,7 @@ void WifiZone::do_seal() } } -void WifiZone::get_local_route(NetPoint* src, NetPoint* dst, Route* res, double* lat) +void WifiZone::get_local_route(const NetPoint* src, const NetPoint* dst, Route* res, double* lat) { XBT_DEBUG("full getLocalRoute from %s[%u] to %s[%u]", src->get_cname(), src->id(), dst->get_cname(), dst->id()); diff --git a/src/s4u/s4u_Host.cpp b/src/s4u/s4u_Host.cpp index b56ad8fe02..02684f98bd 100644 --- a/src/s4u/s4u_Host.cpp +++ b/src/s4u/s4u_Host.cpp @@ -172,7 +172,7 @@ void Host::route_to(const Host* dest, std::vector& } /** @brief Returns the networking zone englobing that host */ -NetZone* Host::get_englobing_zone() +NetZone* Host::get_englobing_zone() const { return pimpl_netpoint_->get_englobing_zone()->get_iface(); } diff --git a/teshsuite/simdag/flatifier/flatifier.cpp b/teshsuite/simdag/flatifier/flatifier.cpp index 44583a157c..b604699fa6 100644 --- a/teshsuite/simdag/flatifier/flatifier.cpp +++ b/teshsuite/simdag/flatifier/flatifier.cpp @@ -118,10 +118,10 @@ static void dump_routes() }); for (auto src_host : hosts) { // Routes from host - simgrid::kernel::routing::NetPoint* src = src_host->get_netpoint(); + const simgrid::kernel::routing::NetPoint* src = src_host->get_netpoint(); for (auto dst_host : hosts) { // Routes to host std::vector route; - simgrid::kernel::routing::NetPoint* dst = dst_host->get_netpoint(); + const simgrid::kernel::routing::NetPoint* dst = dst_host->get_netpoint(); simgrid::kernel::routing::NetZoneImpl::get_global_route(src, dst, route, nullptr); if (route.empty()) continue; -- 2.20.1