X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/67fe7b9d6c00b390a8598bc1e72d42d8343cb218..a6ceacf3b05651e2ae5a40d47c96bdd9fc4d1416:/include/simgrid/kernel/routing/NetZoneImpl.hpp diff --git a/include/simgrid/kernel/routing/NetZoneImpl.hpp b/include/simgrid/kernel/routing/NetZoneImpl.hpp index 260661c2d8..c1bf111d43 100644 --- a/include/simgrid/kernel/routing/NetZoneImpl.hpp +++ b/include/simgrid/kernel/routing/NetZoneImpl.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2016-2018. 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,7 +7,9 @@ #define SIMGRID_ROUTING_NETZONEIMPL_HPP #include +#include #include +#include #include #include @@ -16,7 +18,14 @@ namespace simgrid { namespace kernel { namespace routing { -class BypassRoute; + +class BypassRoute { +public: + explicit BypassRoute(NetPoint* gwSrc, NetPoint* gwDst) : gw_src(gwSrc), gw_dst(gwDst) {} + NetPoint* gw_src; + NetPoint* gw_dst; + std::vector links; +}; /** @ingroup ROUTING_API * @brief Private implementation of the Networking Zones @@ -47,37 +56,40 @@ class BypassRoute; * called Autonomous Systems in this article). * */ -class XBT_PUBLIC NetZoneImpl { - friend simgrid::kernel::EngineImpl; // it destroys netRoot_ - -protected: - explicit NetZoneImpl(NetZoneImpl* father, std::string name, resource::NetworkModel* network_model); - virtual ~NetZoneImpl(); +class XBT_PUBLIC NetZoneImpl : public xbt::PropertyHolder { + friend EngineImpl; // it destroys netRoot_ + s4u::NetZone piface_; -public: - s4u::NetZone* get_iface() { return &piface_; } + // our content, as known to our graph routing algorithm (maps vertex_id -> vertex) + std::vector vertices_; - /** @brief Make an host within that NetZone */ - simgrid::s4u::Host* create_host(const char* name, std::vector* speed_per_pstate, int core_count, - std::map* props); - /** @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); + NetZoneImpl* parent_ = nullptr; + std::vector children_; // sub-netzones + std::string name_; + bool sealed_ = false; // We cannot add more content when sealed - /** @brief Seal your netzone once you're done adding content, and before routing stuff through it */ - virtual void seal(); - 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); + std::map, BypassRoute*> bypass_routes_; // src x dst -> route + routing::NetPoint* netpoint_ = nullptr; // Our representative in the father NetZone + 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(){}; protected: + explicit NetZoneImpl(const std::string& name); + NetZoneImpl(const NetZoneImpl&) = delete; + NetZoneImpl& operator=(const NetZoneImpl&) = delete; + virtual ~NetZoneImpl(); + /** * @brief Probe the routing path between two points that are local to the called NetZone. * * @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; @@ -87,38 +99,70 @@ protected: /* OUT */ std::vector& links, double* latency); public: - resource::NetworkModel* network_model_; - -private: - s4u::NetZone piface_; - - // our content, as known to our graph routing algorithm (maps vertex_id -> vertex) - std::vector vertices_; - - NetZoneImpl* father_ = nullptr; - - std::vector children_; // sub-netzones - -public: - unsigned int get_table_size() { return vertices_.size(); } - std::vector get_vertices() { return vertices_; } - - NetZoneImpl* get_father(); + enum class RoutingMode { + unset = 0, /**< Undefined type */ + base, /**< Base case: use simple link lists for routing */ + recursive /**< Recursive case: also return gateway information */ + }; - std::vector* get_children(); // Sub netzones + /* FIXME: protect the following fields once the construction madness is sorted out */ + RoutingMode hierarchy_ = RoutingMode::unset; -private: - std::string name_; - bool sealed_ = false; // We cannot add more content when sealed + /** @brief Retrieves the network model associated to this NetZone */ + const std::shared_ptr& get_network_model() const { return network_model_; } + /** @brief Retrieves the CPU model for virtual machines associated to this NetZone */ + 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 */ + const std::shared_ptr& get_cpu_pm_model() const { return cpu_model_pm_; } + /** @brief Retrieves the disk model associated to this NetZone */ + const std::shared_ptr& get_disk_model() const { return disk_model_; } + /** @brief Retrieves the host model associated to this NetZone */ + 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_; } + 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_; } + void add_child(NetZoneImpl* new_zone); -public: /** @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; + const char* get_cname() const { return name_.c_str(); }; + + 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); + /** @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); + virtual s4u::Link* create_wifi_link(const std::string& name, const std::vector& bandwidths); + /** @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); - std::vector get_all_hosts(); - int get_host_count(); + /** @brief Seal your netzone once you're done adding content, and before routing stuff through it */ + void seal(); + 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, + 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 * @@ -130,22 +174,11 @@ public: static void get_global_route(routing::NetPoint* src, routing::NetPoint* dst, /* OUT */ std::vector& links, double* latency); - virtual void get_graph(xbt_graph_t graph, std::map* nodes, - std::map* edges) = 0; - enum class RoutingMode { - unset = 0, /**< Undefined type */ - 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; - -private: - std::map, BypassRoute*> bypass_routes_; // src x dst -> route - routing::NetPoint* netpoint_ = nullptr; // Our representative in the father NetZone + virtual void get_graph(const s_xbt_graph_t* graph, std::map>* nodes, + std::map>* edges) = 0; }; } // namespace routing } // namespace kernel -}; // namespace simgrid +} // namespace simgrid #endif /* SIMGRID_ROUTING_NETZONEIMPL_HPP */