X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d52700ac49b5cf1b2629461c9f2807f3d04c9f39..9ceefed14c83a0f6ea5f78e3acafd53181dc4fa1:/include/simgrid/s4u/NetZone.hpp diff --git a/include/simgrid/s4u/NetZone.hpp b/include/simgrid/s4u/NetZone.hpp index 21c0606be3..6c0f3e7306 100644 --- a/include/simgrid/s4u/NetZone.hpp +++ b/include/simgrid/s4u/NetZone.hpp @@ -27,11 +27,13 @@ namespace s4u { * s4u::Engine). */ class XBT_PUBLIC NetZone { +#ifndef DOXYGEN + friend kernel::routing::NetZoneImpl; +#endif + kernel::routing::NetZoneImpl* const pimpl_; protected: - friend kernel::routing::NetZoneImpl; - explicit NetZone(kernel::routing::NetZoneImpl* impl) : pimpl_(impl) {} public: @@ -40,9 +42,9 @@ public: /** @brief Retrieves the name of that netzone as a C string */ const char* get_cname() const; - XBT_ATTRIB_DEPRECATED_v331("Please use get_parent()") NetZone* get_father(); NetZone* get_parent() const; NetZone* set_parent(const NetZone* parent); + std::vector get_children() const; std::vector get_all_hosts() const; int get_host_count() const; @@ -57,15 +59,17 @@ public: /** @brief Get the netpoint associated to this netzone */ kernel::routing::NetPoint* get_netpoint(); - std::vector get_children() const; +#ifndef DOXYGEN + XBT_ATTRIB_DEPRECATED_v331("Please use get_parent()") NetZone* get_father() const; XBT_ATTRIB_DEPRECATED_v332("Please use set_parent() to manage NetZone's relationship") NetZone* add_child( NetZone* new_zone); +#endif void extract_xbt_graph(const s_xbt_graph_t* graph, std::map>* nodes, std::map>* edges); /* Add content to the netzone, at parsing time. It should be sealed afterward. */ - int add_component(kernel::routing::NetPoint* elm); /* A host, a router or a netzone, whatever */ + unsigned long add_component(kernel::routing::NetPoint* elm); /* A host, a router or a netzone, whatever */ /** * @brief Add a route between 2 netpoints @@ -76,26 +80,44 @@ public: * * @param src Source netzone's netpoint * @param dst Destination netzone' netpoint - * @param src_gw Netpoint of the gateway in the source netzone - * @param dst_gw Netpoint of the gateway in the destination netzone - * @param link_list List of links used in this communication + * @param gw_src Netpoint of the gateway in the source netzone + * @param gw_dst Netpoint of the gateway in the destination netzone + * @param link_list List of links and their direction used in this communication * @param symmetrical Bi-directional communication */ 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 = true); + kernel::routing::NetPoint* gw_dst, const std::vector& link_list, bool symmetrical = true); + +#ifndef DOXYGEN + XBT_ATTRIB_DEPRECATED_v332("Please use add_route() method which uses s4u::LinkInRoute instead of " + "LinkImpl") 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); + + XBT_ATTRIB_DEPRECATED_v332("Please use add_bypass_route() method which uses s4u::LinkInRoute instead of " + "LinkImpl") void add_bypass_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*/); +#endif - XBT_ATTRIB_DEPRECATED_v332("Please use add_route() method which uses s4u::Link instead of LinkImpl") 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); void add_bypass_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); + const std::vector& link_list); +#ifndef DOXYGEN /*** Called on each newly created regular route (not on bypass routes) */ static xbt::signal const& link_list)> - on_route_creation; + on_route_creation; // XBT_ATTRIB_DEPRECATED_v332 : should not be used by users, used by ns3.. if necessary, + // signal shouldn't use LinkImpl* +#endif + static xbt::signal on_creation; static xbt::signal on_seal; @@ -103,7 +125,7 @@ public: * @brief Create a host * * @param name Host name - * @param speed_per_state Vector of CPU's speeds + * @param speed_per_pstate Vector of CPU's speeds */ s4u::Host* create_host(const std::string& name, const std::vector& speed_per_pstate); s4u::Host* create_host(const std::string& name, double speed); @@ -129,6 +151,24 @@ public: s4u::Link* create_link(const std::string& name, const std::vector& bandwidths); s4u::Link* create_link(const std::string& name, const std::string& bandwidth); + /** + * @brief Create a split-duplex link + * + * In SimGrid, split-duplex links are a composition of 2 regular (shared) links (up/down). + * + * This function eases its utilization by creating the 2 links for you. We append a suffix + * "_UP" and "_DOWN" to your link name to identify each of them. + * + * Both up/down links have exactly the same bandwidth + * + * @param name Name of the link + * @param bandwidth Speed + */ + s4u::SplitDuplexLink* create_split_duplex_link(const std::string& name, const std::string& bandwidth); + s4u::SplitDuplexLink* create_split_duplex_link(const std::string& name, double bandwidth); + + kernel::resource::NetworkModelIntf* get_network_model() const; + /** * @brief Make a router within that NetZone * @@ -140,8 +180,10 @@ public: NetZone* seal(); private: - /** @brief Auxiliary function to get list of LinkImpl */ - static std::vector get_link_list_impl(const std::vector link_list); +#ifndef DOXYGEN + /** @brief XBT_ATTRIB_DEPRECATED_v332 Auxiliary function to convert types */ + static std::vector convert_to_linkInRoute(const std::vector& link_list); +#endif }; // External constructors so that the types (and the types of their content) remain hidden @@ -169,7 +211,7 @@ struct ClusterCallbacks { * @return pair: returns a pair of netpoint and gateway. */ using ClusterNetPointCb = std::pair( - NetZone* zone, const std::vector& coord, int id); + NetZone* zone, const std::vector& coord, unsigned long id); /** * @brief Callback used to set the links for some leaf of the cluster (Torus, FatTree, etc) * @@ -185,7 +227,7 @@ struct ClusterCallbacks { * @param id: Internal identifier of the element * @return Pointer to the Link */ - using ClusterLinkCb = Link*(NetZone* zone, const std::vector& coord, int id); + using ClusterLinkCb = Link*(NetZone* zone, const std::vector& coord, unsigned long id); std::function netpoint; std::function loopback = {}; @@ -222,12 +264,12 @@ struct ClusterCallbacks { * @return Pointer to new netzone */ XBT_PUBLIC NetZone* create_torus_zone(const std::string& name, const NetZone* parent, - const std::vector& dimensions, + const std::vector& dimensions, const ClusterCallbacks& set_callbacks, double bandwidth, double latency, Link::SharingPolicy sharing_policy); /** @brief Aggregates the parameters necessary to build a Fat-tree zone */ -struct FatTreeParams { +struct XBT_PUBLIC FatTreeParams { unsigned int levels; std::vector down; std::vector up; @@ -267,7 +309,7 @@ XBT_PUBLIC NetZone* create_fatTree_zone(const std::string& name, const NetZone* Link::SharingPolicy sharing_policy); /** @brief Aggregates the parameters necessary to build a Dragonfly zone */ -struct DragonflyParams { +struct XBT_PUBLIC DragonflyParams { std::pair groups; std::pair chassis; std::pair routers;