X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9856e530871afa8c75fda68ab7cbc718e9ba7e95..0e6e9a9dade4d5272159ab2a5cfd7496a62eaa18:/include/simgrid/kernel/routing/NetZoneImpl.hpp diff --git a/include/simgrid/kernel/routing/NetZoneImpl.hpp b/include/simgrid/kernel/routing/NetZoneImpl.hpp index fb18e9da24..ffb432216a 100644 --- a/include/simgrid/kernel/routing/NetZoneImpl.hpp +++ b/include/simgrid/kernel/routing/NetZoneImpl.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2016-2022. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2016-2023. 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. */ @@ -16,9 +16,7 @@ #include #include -namespace simgrid { -namespace kernel { -namespace routing { +namespace simgrid::kernel::routing { class Route { public: @@ -77,6 +75,11 @@ class XBT_PUBLIC NetZoneImpl : public xbt::PropertyHolder { // our content, as known to our graph routing algorithm (maps vertex_id -> vertex) std::vector vertices_; + std::map> links_; + /* save split-duplex links separately, keep links_ with only LinkImpl* seen by the user + * members of a split-duplex are saved in the links_ */ + std::map, std::less<>> split_duplex_links_; + std::map> hosts_; NetZoneImpl* parent_ = nullptr; std::vector children_; // sub-netzones @@ -114,6 +117,11 @@ protected: std::vector get_link_list_impl(const std::vector& link_list, bool backroute) const; + static xbt_node_t new_xbt_graph_node(const s_xbt_graph_t* graph, const char* name, + std::map>* nodes); + static xbt_edge_t new_xbt_graph_edge(const s_xbt_graph_t* graph, xbt_node_t src, xbt_node_t dst, + std::map>* edges); + public: enum class RoutingMode { base, /**< Base case: use simple link lists for routing */ @@ -151,14 +159,70 @@ public: kernel::routing::NetPoint* get_netpoint() const { return netpoint_; } std::vector get_all_hosts() const; - int get_host_count() const; + size_t get_host_count() const; + + /** + * @brief Recursively gets all links declared in this netzone + * + * Include children netzones. + * @return List of links + */ + std::vector get_all_links() const; + /** + * @brief Recursively gets all links declared in this netzone. + * + * Using a filter function + * Include children netzones. + * @param filter Select links based on this filter + * @return List of links + */ + std::vector get_filtered_links(const std::function& filter) const; + /** @brief Get total number of links declared in this netzone (and its children) */ + size_t get_link_count() const; + + /** + * @brief Searches by the link by its name inside this netzone. + * Recursively searches in children netzones + * + * @param name Link name + * @return Link object or nullptr if not found + */ + resource::StandardLinkImpl* get_link_by_name_or_null(const std::string& name) const; + + /** + * @brief Searches for split-duplex links by its name inside this netzone. + * Recursively searches in child netzones + * + * @param name Split-duplex Link name + * @return Link object or nullptr if not found + */ + resource::SplitDuplexLinkImpl* get_split_duplex_link_by_name_or_null(const std::string& name) const; + + /** + * @brief Searches for a host by its name (recursively) + * Including children netzones and VMs on physival hosts + * + * @param name Host (or VM) name + * @return HostImpl pointer + */ + resource::HostImpl* get_host_by_name_or_null(const std::string& name) const; + + /** + * @brief Gets list of hosts on this netzone recursively. + * + * Note: This includes hosts on children netzones and VMs on physical hosts. + * + * @param filter Filter function to select specific nodes + * @return List of hosts + */ + std::vector get_filtered_hosts(const std::function& filter) const; /** @brief Make a host within that NetZone */ s4u::Host* create_host(const std::string& name, const std::vector& speed_per_pstate); /** @brief Create a disk with the disk model from this NetZone */ s4u::Disk* create_disk(const std::string& name, double read_bandwidth, double write_bandwidth); /** @brief Make a link within that NetZone */ - virtual s4u::Link* create_link(const std::string& name, const std::vector& bandwidths); + s4u::Link* create_link(const std::string& name, const std::vector& bandwidths); s4u::SplitDuplexLink* create_split_duplex_link(const std::string& name, const std::vector& bandwidths); /** @brief Make a router within that NetZone */ NetPoint* create_router(const std::string& name); @@ -198,12 +262,12 @@ public: std::unordered_set& netzones); virtual void get_graph(const s_xbt_graph_t* graph, std::map>* nodes, - std::map>* edges) = 0; + std::map>* edges); /*** Called on each newly created regular route (not on bypass routes) */ static xbt::signal const& link_list)> - on_route_creation; // XBT_ATTRIB_DEPRECATED_v332 : should be an internal signal used by NS3.. if necessary, + on_route_creation; // FIXME: XBT_ATTRIB_DEPRECATED_v332: should be an internal signal used by NS3.. if necessary, // callback shouldn't use LinkImpl* private: @@ -217,10 +281,10 @@ private: virtual void do_seal() { /* obviously nothing to do by default */ } + /** @brief Allows subclasses (wi-fi) to have their own create link method, but keep links_ updated */ + virtual resource::StandardLinkImpl* do_create_link(const std::string& name, const std::vector& bandwidths); void add_child(NetZoneImpl* new_zone); }; -} // namespace routing -} // namespace kernel -} // namespace simgrid +} // namespace simgrid::kernel::routing #endif /* SIMGRID_ROUTING_NETZONEIMPL_HPP */