#ifndef SIMGRID_KERNEL_ROUTING_STARZONE_HPP_
#define SIMGRID_KERNEL_ROUTING_STARZONE_HPP_
-#include <simgrid/kernel/routing/NetZoneImpl.hpp>
+#include <simgrid/kernel/routing/ClusterZone.hpp>
#include <unordered_map>
#include <unordered_set>
* In this case, a communication from A to B goes through the links: <tt> l0, backbone, l1. </tt>
* Note that the backbone only appears once in the link list.
*/
-
-class StarZone : public NetZoneImpl {
-
+class StarZone : public ClusterZone { // implements the old ClusterZone
public:
explicit StarZone(const std::string& name);
- void get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* route, double* latency) override;
+ void get_local_route(NetPoint* src, NetPoint* dst, Route* route, double* latency) override;
void get_graph(const s_xbt_graph_t* graph, std::map<std::string, xbt_node_t, std::less<>>* nodes,
std::map<std::string, xbt_edge_t, std::less<>>* edges) override;
void do_seal() override;
private:
+ class StarRoute {
+ public:
+ std::vector<resource::LinkImpl*> links_up; //!< list of links UP for route (can be empty)
+ std::vector<resource::LinkImpl*> links_down; //!< list of links DOWN for route (can be empty)
+ std::vector<resource::LinkImpl*> loopback; //!< loopback links, cannot be empty if configured
+ bool links_up_set = false; //!< bool to indicate that links_up was configured (empty or not)
+ bool links_down_set = false; //!< same for links_down
+ NetPoint* gateway = nullptr;
+ bool has_loopback() const { return not loopback.empty(); }
+ bool has_links_up() const { return links_up_set; }
+ bool has_links_down() const { return links_down_set; }
+ };
/** @brief Auxiliary method to add links to a route */
- void add_links_to_route(const std::vector<resource::LinkImpl*>& links, RouteCreationArgs* route, double* latency,
- std::unordered_set<resource::LinkImpl*>& added_links);
- std::unordered_map<unsigned int, std::vector<resource::LinkImpl*>> links_up_;
- std::unordered_map<unsigned int, std::vector<resource::LinkImpl*>> loopback_;
- std::unordered_map<unsigned int, std::vector<resource::LinkImpl*>> links_down_;
+ void add_links_to_route(const std::vector<resource::LinkImpl*>& links, Route* route, double* latency,
+ std::unordered_set<resource::LinkImpl*>& added_links) const;
+ /** @brief Auxiliary methods to check params received in add_route method */
+ void check_add_route_param(const NetPoint* src, const NetPoint* dst, const NetPoint* gw_src, const NetPoint* gw_dst,
+ bool symmetrical) const;
+ std::unordered_map<unsigned int, StarRoute> routes_;
};
} // namespace routing
} // namespace kernel
} // namespace simgrid
-#endif /* SIMGRID_KERNEL_ROUTING_STARZONE_HPP_ */
\ No newline at end of file
+#endif /* SIMGRID_KERNEL_ROUTING_STARZONE_HPP_ */