-/* Copyright (c) 2016-2022. 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. */
#include <unordered_set>
#include <vector>
-namespace simgrid {
-namespace kernel {
-namespace routing {
+namespace simgrid::kernel::routing {
class Route {
public:
s4u::NetZone piface_;
// our content, as known to our graph routing algorithm (maps vertex_id -> vertex)
- std::vector<kernel::routing::NetPoint*> vertices_;
+ std::vector<NetPoint*> vertices_;
std::map<std::string, resource::StandardLinkImpl*, std::less<>> links_;
/* save split-duplex links separately, keep links_ with only LinkImpl* seen by the user
* members of a split-duplex are saved in the links_ */
std::map<std::string, std::unique_ptr<resource::SplitDuplexLinkImpl>, std::less<>> split_duplex_links_;
std::map<std::string, resource::HostImpl*, std::less<>> hosts_;
+ std::map<std::string, NetPoint*, std::less<>> gateways_;
NetZoneImpl* parent_ = nullptr;
std::vector<NetZoneImpl*> children_; // sub-netzones
bool sealed_ = false; // We cannot add more content when sealed
std::map<std::pair<const NetPoint*, const NetPoint*>, BypassRoute*> bypass_routes_; // src x dst -> route
- routing::NetPoint* netpoint_ = nullptr; // Our representative in the parent NetZone
+ NetPoint* netpoint_ = nullptr; // Our representative in the parent NetZone
protected:
explicit NetZoneImpl(const std::string& name);
std::vector<resource::StandardLinkImpl*> get_link_list_impl(const std::vector<s4u::LinkInRoute>& link_list,
bool backroute) const;
+ static xbt_node_t new_xbt_graph_node(const s_xbt_graph_t* graph, const char* name,
+ std::map<std::string, xbt_node_t, std::less<>>* nodes);
+ static xbt_edge_t new_xbt_graph_edge(const s_xbt_graph_t* graph, xbt_node_t src, xbt_node_t dst,
+ std::map<std::string, xbt_edge_t, std::less<>>* edges);
+
public:
enum class RoutingMode {
base, /**< Base case: use simple link lists for routing */
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<kernel::routing::NetPoint*> get_vertices() const { return vertices_; }
+ std::vector<NetPoint*> get_vertices() const { return vertices_; }
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.*/
const char* get_cname() const { return name_.c_str(); };
/** @brief Gets the netpoint associated to this netzone */
- kernel::routing::NetPoint* get_netpoint() const { return netpoint_; }
+ NetPoint* get_netpoint() const { return netpoint_; }
+
+ void set_gateway(const std::string& name, NetPoint* router);
+ /** @brief Gets the gateway associated to this netzone */
+ NetPoint* get_gateway() const;
+ NetPoint* get_gateway(const std::string& name) const { return gateways_.at(name); }
std::vector<s4u::Host*> get_all_hosts() const;
size_t get_host_count() const;
std::unordered_set<NetZoneImpl*>& netzones);
virtual 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) = 0;
+ std::map<std::string, xbt_edge_t, std::less<>>* edges);
/*** Called on each newly created regular route (not on bypass routes) */
static xbt::signal<void(bool symmetrical, NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst,
std::vector<resource::StandardLinkImpl*> const& link_list)>
- on_route_creation; // XBT_ATTRIB_DEPRECATED_v332 : should be an internal signal used by NS3.. if necessary,
+ on_route_creation; // FIXME: XBT_ATTRIB_DEPRECATED_v332: should be an internal signal used by NS3.. if necessary,
// callback shouldn't use LinkImpl*
private:
virtual resource::StandardLinkImpl* do_create_link(const std::string& name, const std::vector<double>& bandwidths);
void add_child(NetZoneImpl* new_zone);
};
-} // namespace routing
-} // namespace kernel
-} // namespace simgrid
+} // namespace simgrid::kernel::routing
#endif /* SIMGRID_ROUTING_NETZONEIMPL_HPP */