X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/63dae9fee48b67ed8302130aa84c8a54cd42241b..1da71cea80ede085ba178e6da930cca784c868c0:/include/simgrid/s4u/NetZone.hpp diff --git a/include/simgrid/s4u/NetZone.hpp b/include/simgrid/s4u/NetZone.hpp index bd4cc7b2ff..63a1c23b00 100644 --- a/include/simgrid/s4u/NetZone.hpp +++ b/include/simgrid/s4u/NetZone.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2016-2021. 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. */ @@ -14,6 +14,7 @@ #include #include #include +#include #include #include @@ -42,12 +43,12 @@ 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; + size_t get_host_count() const; kernel::routing::NetZoneImpl* get_impl() const { return pimpl_; } @@ -59,15 +60,11 @@ public: /** @brief Get the netpoint associated to this netzone */ kernel::routing::NetPoint* get_netpoint(); - std::vector get_children() const; - XBT_ATTRIB_DEPRECATED_v332("Please use set_parent() to manage NetZone's relationship") NetZone* add_child( - NetZone* new_zone); - 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 @@ -86,38 +83,19 @@ public: 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); - 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*/); - -#ifndef DOXYGEN -#endif void add_bypass_route(kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst, kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst, const std::vector& link_list); +private: #ifndef DOXYGEN - /*** 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 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; +#endif + +public: + static void on_creation_cb(const std::function& cb) { on_creation.connect(cb); } + static void on_seal_cb(const std::function& cb) { on_seal.connect(cb); } /** * @brief Create a host @@ -165,7 +143,7 @@ public: 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; + kernel::resource::NetworkModel* get_network_model() const; /** * @brief Make a router within that NetZone @@ -177,9 +155,14 @@ public: /** @brief Seal this netzone configuration */ NetZone* seal(); -private: - /** @brief Auxiliary function to convert types */ - static std::vector convert_to_linkInRoute(const std::vector& link_list); + void + set_latency_factor_cb(std::function& /*links*/, + const std::unordered_set& /*netzones*/)> const& cb) const; + void + set_bandwidth_factor_cb(std::function& /*links*/, + const std::unordered_set& /*netzones*/)> const& cb) const; }; // External constructors so that the types (and the types of their content) remain hidden @@ -207,7 +190,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) * @@ -223,7 +206,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 = {}; @@ -260,12 +243,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; @@ -305,7 +288,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;