X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/db90e1631e8edef2c777129b97bb4707990cc911..fe620eda269ea46829c7c46afefa3650c6a509cd:/include/simgrid/kernel/routing/NetZoneImpl.hpp diff --git a/include/simgrid/kernel/routing/NetZoneImpl.hpp b/include/simgrid/kernel/routing/NetZoneImpl.hpp index b641b4b3c8..257c8e7af6 100644 --- a/include/simgrid/kernel/routing/NetZoneImpl.hpp +++ b/include/simgrid/kernel/routing/NetZoneImpl.hpp @@ -13,12 +13,27 @@ #include #include +#include #include namespace simgrid { namespace kernel { namespace routing { +class Route { +public: + Route() = default; + explicit Route(NetPoint* src, NetPoint* dst, NetPoint* gwSrc, NetPoint* gwDst) + : src_(src), dst_(dst), gw_src_(gwSrc), gw_dst_(gwDst) + { + } + NetPoint* src_ = nullptr; + NetPoint* dst_ = nullptr; + NetPoint* gw_src_ = nullptr; + NetPoint* gw_dst_ = nullptr; + std::vector link_list_; +}; + class BypassRoute { public: explicit BypassRoute(NetPoint* gwSrc, NetPoint* gwDst) : gw_src(gwSrc), gw_dst(gwDst) {} @@ -63,23 +78,16 @@ class XBT_PUBLIC NetZoneImpl : public xbt::PropertyHolder { // our content, as known to our graph routing algorithm (maps vertex_id -> vertex) std::vector vertices_; - NetZoneImpl* father_ = nullptr; + NetZoneImpl* parent_ = nullptr; std::vector children_; // sub-netzones std::string name_; bool sealed_ = false; // We cannot add more content when sealed std::map, BypassRoute*> bypass_routes_; // src x dst -> route routing::NetPoint* netpoint_ = nullptr; // Our representative in the father NetZone - resource::NetworkModel* network_model_; - resource::CpuModel* cpu_model_vm_; - resource::CpuModel* cpu_model_pm_; - resource::DiskModel* disk_model_; - simgrid::surf::HostModel* host_model_; - /** @brief Perform sealing procedure for derived classes, if necessary */ - virtual void do_seal(){}; protected: - explicit NetZoneImpl(NetZoneImpl* father, const std::string& name, resource::NetworkModel* network_model); + explicit NetZoneImpl(const std::string& name); NetZoneImpl(const NetZoneImpl&) = delete; NetZoneImpl& operator=(const NetZoneImpl&) = delete; virtual ~NetZoneImpl(); @@ -92,68 +100,86 @@ 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, RouteCreationArgs* into, double* latency) = 0; + virtual void get_local_route(NetPoint* src, 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, - /* OUT */ std::vector& links, double* latency); + /* OUT */ std::vector& links, double* latency, + std::unordered_set& netzones); + + /** @brief Get the NetZone that is represented by the netpoint */ + const NetZoneImpl* get_netzone_recursive(const NetPoint* netpoint) const; public: enum class RoutingMode { - unset = 0, /**< Undefined type */ - base, /**< Base case: use simple link lists for routing */ - recursive /**< Recursive case: also return gateway information */ + base, /**< Base case: use simple link lists for routing */ + recursive /**< Recursive case: also return gateway information */ }; - /* FIXME: protect the following fields once the construction madness is sorted out */ - RoutingMode hierarchy_ = RoutingMode::unset; - /** @brief Retrieves the network model associated to this NetZone */ - resource::NetworkModel* get_network_model() const { return network_model_; } + const std::shared_ptr& get_network_model() const { return network_model_; } /** @brief Retrieves the CPU model for virtual machines associated to this NetZone */ - resource::CpuModel* get_cpu_vm_model() const { return cpu_model_vm_; } + const std::shared_ptr& get_cpu_vm_model() const { return cpu_model_vm_; } /** @brief Retrieves the CPU model for physical machines associated to this NetZone */ - resource::CpuModel* get_cpu_pm_model() const { return cpu_model_pm_; } + const std::shared_ptr& get_cpu_pm_model() const { return cpu_model_pm_; } /** @brief Retrieves the disk model associated to this NetZone */ - resource::DiskModel* get_disk_model() const { return disk_model_; } + const std::shared_ptr& get_disk_model() const { return disk_model_; } /** @brief Retrieves the host model associated to this NetZone */ - simgrid::surf::HostModel* get_host_model() const { return host_model_; } + const std::shared_ptr& get_host_model() const { return host_model_; } const s4u::NetZone* get_iface() const { return &piface_; } s4u::NetZone* get_iface() { return &piface_; } unsigned int get_table_size() const { return vertices_.size(); } std::vector get_vertices() const { return vertices_; } - NetZoneImpl* get_father() const { return father_; } + XBT_ATTRIB_DEPRECATED_v331("Please use get_parent()") NetZoneImpl* get_father() const { return parent_; } + NetZoneImpl* get_parent() const { return parent_; } /** @brief Returns the list of direct children (no grand-children). This returns the internal data, no copy. * Don't mess with it.*/ - std::vector* get_children() { return &children_; } + const std::vector& get_children() const { return children_; } + /** @brief Get current netzone hierarchy */ + RoutingMode get_hierarchy() const { return hierarchy_; } + /** @brief Retrieves the name of that netzone as a C++ string */ const std::string& get_name() const { return name_; } /** @brief Retrieves the name of that netzone as a C string */ const char* get_cname() const { return name_.c_str(); }; + /** @brief Gets the netpoint associated to this netzone */ + kernel::routing::NetPoint* get_netpoint() const { return netpoint_; } + std::vector 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& speed_per_pstate, int core_amount); + 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::SharingPolicy policy); + virtual s4u::Link* create_link(const std::string& name, const std::vector& bandwidths); + /** @brief Make a router within that NetZone */ + NetPoint* create_router(const std::string& name); /** @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& link_list, bool symmetrical); /** @brief Seal your netzone once you're done adding content, and before routing stuff through it */ void seal(); + /** @brief Check if netpoint is a member of this NetZone or some of the childrens */ + bool is_component_recursive(const NetPoint* netpoint) const; virtual int add_component(kernel::routing::NetPoint* elm); /* A host, a router or a netzone, whatever */ virtual void add_route(kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst, kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst, - std::vector& link_list, bool symmetrical); - - /* @brief get the route between two nodes in the full platform + const std::vector& link_list, bool symmetrical); + /** @brief Set parent of this Netzone */ + void set_parent(NetZoneImpl* parent); + /** @brief Set network model for this Netzone */ + void set_network_model(std::shared_ptr netmodel); + void set_cpu_vm_model(std::shared_ptr cpu_model); + void set_cpu_pm_model(std::shared_ptr cpu_model); + void set_disk_model(std::shared_ptr disk_model); + void set_host_model(std::shared_ptr host_model); + + /** @brief get the route between two nodes in the full platform * * @param src where from * @param dst where to @@ -163,8 +189,26 @@ public: static void get_global_route(routing::NetPoint* src, 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, + /* OUT */ std::vector& links, double* latency, + std::unordered_set& netzones); + virtual void get_graph(const s_xbt_graph_t* graph, std::map>* nodes, std::map>* edges) = 0; + +private: + RoutingMode hierarchy_ = RoutingMode::base; + std::shared_ptr network_model_; + std::shared_ptr cpu_model_vm_; + std::shared_ptr cpu_model_pm_; + std::shared_ptr disk_model_; + std::shared_ptr host_model_; + /** @brief Perform sealing procedure for derived classes, if necessary */ + virtual void do_seal() + { /* obviously nothing to do by default */ + } + void add_child(NetZoneImpl* new_zone); }; } // namespace routing } // namespace kernel