X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/88fad0aaff9eb463f048bfdfe4ad6218aba44ddb..f5b4648bcb7aa3c1174e25c9f3cd28867b3b2871:/include/simgrid/kernel/routing/NetZoneImpl.hpp diff --git a/include/simgrid/kernel/routing/NetZoneImpl.hpp b/include/simgrid/kernel/routing/NetZoneImpl.hpp index dbcde250a3..c9b6ea92fb 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,15 +7,25 @@ #define SIMGRID_ROUTING_NETZONEIMPL_HPP #include +#include #include +#include #include #include +#include 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 @@ -46,63 +56,108 @@ class BypassRoute; * called Autonomous Systems in this article). * */ -class XBT_PUBLIC NetZoneImpl : public s4u::NetZone { - friend simgrid::kernel::EngineImpl; // it destroys netRoot_ +class XBT_PUBLIC NetZoneImpl : public xbt::PropertyHolder { + friend EngineImpl; // it destroys netRoot_ + s4u::NetZone piface_; -protected: - explicit NetZoneImpl(NetZone* father, std::string name); - virtual ~NetZoneImpl(); + // our content, as known to our graph routing algorithm (maps vertex_id -> vertex) + std::vector vertices_; -public: - /** @brief Make an host within that NetZone */ - simgrid::s4u::Host* createHost(const char* name, std::vector* speedPerPstate, int coreAmount, - std::map* props); - /** @brief Creates a new route in this NetZone */ - void addBypassRoute(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst, - std::vector& link_list, bool symmetrical) override; + NetZoneImpl* father_ = 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_; protected: + explicit NetZoneImpl(NetZoneImpl* father, const std::string& name, resource::NetworkModel* network_model); + 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 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& links, double* latency); + bool get_bypass_route(routing::NetPoint* src, routing::NetPoint* dst, + /* OUT */ std::vector& links, double* latency); public: - /* @brief get the route between two nodes in the full platform - * - * @param src where from - * @param dst where to - * @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& links, double* latency); - - virtual void getGraph(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 + /** @brief Retrieves the network model associated to this NetZone */ + resource::NetworkModel* 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_; } + /** @brief Retrieves the CPU model for physical machines associated to this NetZone */ + resource::CpuModel* get_cpu_pm_model() const { return cpu_model_pm_; } + + 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_; } + /** @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_; } + /** @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(); }; + + 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); + /** @brief Make a link within that NetZone */ + virtual s4u::Link* create_link(const std::string& name, const std::vector& bandwidths, + s4u::Link::SharingPolicy policy); + /** @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 */ + virtual void seal() { sealed_ = true; }; + 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 + * + * @param src where from + * @param dst where to + * @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, + /* OUT */ std::vector& links, double* latency); + + 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 */