X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fe620eda269ea46829c7c46afefa3650c6a509cd..376c276e460465f8c897215240fa7094a635fe7b:/include/simgrid/kernel/routing/NetZoneImpl.hpp diff --git a/include/simgrid/kernel/routing/NetZoneImpl.hpp b/include/simgrid/kernel/routing/NetZoneImpl.hpp index 257c8e7af6..fb18e9da24 100644 --- a/include/simgrid/kernel/routing/NetZoneImpl.hpp +++ b/include/simgrid/kernel/routing/NetZoneImpl.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2016-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2016-2022. 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. */ @@ -31,7 +31,7 @@ public: NetPoint* dst_ = nullptr; NetPoint* gw_src_ = nullptr; NetPoint* gw_dst_ = nullptr; - std::vector link_list_; + std::vector link_list_; }; class BypassRoute { @@ -39,7 +39,7 @@ public: explicit BypassRoute(NetPoint* gwSrc, NetPoint* gwDst) : gw_src(gwSrc), gw_dst(gwDst) {} NetPoint* gw_src; NetPoint* gw_dst; - std::vector links; + std::vector links; }; /** @ingroup ROUTING_API @@ -83,8 +83,8 @@ class XBT_PUBLIC NetZoneImpl : public xbt::PropertyHolder { 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 + std::map, BypassRoute*> bypass_routes_; // src x dst -> route + routing::NetPoint* netpoint_ = nullptr; // Our representative in the parent NetZone protected: explicit NetZoneImpl(const std::string& name); @@ -100,16 +100,20 @@ 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, Route* into, double* latency) = 0; + virtual void get_local_route(const NetPoint* src, const 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, + bool get_bypass_route(const routing::NetPoint* src, const routing::NetPoint* dst, + /* 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; + /** @brief Get the list of LinkImpl* to add in a route, considering split-duplex links and the direction */ + std::vector get_link_list_impl(const std::vector& link_list, + bool backroute) const; + public: enum class RoutingMode { base, /**< Base case: use simple link lists for routing */ @@ -125,13 +129,12 @@ public: /** @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 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.*/ @@ -156,20 +159,20 @@ public: 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::SplitDuplexLink* create_split_duplex_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); + const std::vector& link_list); /** @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, - const std::vector& link_list, bool symmetrical); + virtual unsigned long add_component(NetPoint* elm); /* A host, a router or a netzone, whatever */ + virtual void add_route(NetPoint* src, NetPoint* dst, NetPoint* gw_src, 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 */ @@ -177,7 +180,7 @@ public: 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); + void set_host_model(std::shared_ptr host_model); /** @brief get the route between two nodes in the full platform * @@ -186,24 +189,30 @@ public: * @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); + static void get_global_route(const NetPoint* src, const 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, + static void get_global_route_with_netzones(const NetPoint* src, const 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; + /*** 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 be an internal signal used by NS3.. if necessary, + // callback shouldn't use LinkImpl* + 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_; + std::shared_ptr host_model_; /** @brief Perform sealing procedure for derived classes, if necessary */ virtual void do_seal() { /* obviously nothing to do by default */