- std::vector<surf::LinkImpl*>* link_list)>
- onRouteCreation;
- static simgrid::xbt::signal<void(NetZone&)> onCreation;
- static simgrid::xbt::signal<void(NetZone&)> onSeal;
-
-protected:
- unsigned int getTableSize() { return vertices_.size(); }
- std::vector<kernel::routing::NetPoint*> getVertices() { return vertices_; }
-
-private:
- // our content, as known to our graph routing algorithm (maps vertexId -> vertex)
- std::vector<kernel::routing::NetPoint*> vertices_;
-
- std::unordered_map<std::string, std::string> properties_;
- NetZone* father_ = nullptr;
- char* name_ = nullptr;
-
- bool sealed_ = false; // We cannot add more content when sealed
-
- std::vector<NetZone*>* children_ = nullptr; // sub-netzones
+ std::vector<kernel::resource::LinkImpl*>& link_list)>
+ on_route_creation;
+ static simgrid::xbt::signal<void(NetZone&)> on_creation;
+ static simgrid::xbt::signal<void(NetZone&)> on_seal;
+
+#ifndef DOXYGEN
+ // Deprecation wrappers
+ /** @deprecated NetZone::get_father() */
+ XBT_ATTRIB_DEPRECATED_v323("Please use NetZone::get_father()") NetZone* getFather() { return get_father(); }
+ /** @deprecated NetZone::get_name() */
+ XBT_ATTRIB_DEPRECATED_v323("Please use NetZone::get_name()") const std::string& getName() const { return get_name(); }
+ /** @deprecated NetZone::get_cname() */
+ XBT_ATTRIB_DEPRECATED_v323("Please use NetZone::get_cname()") const char* getCname() const { return get_cname(); }
+ /** @deprecated NetZone::add_route() */
+ XBT_ATTRIB_DEPRECATED_v323("Please use NetZone::add_route()") void addRoute(
+ kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst, kernel::routing::NetPoint* gw_src,
+ kernel::routing::NetPoint* gw_dst, std::vector<simgrid::kernel::resource::LinkImpl*>& link_list, bool symmetrical)
+ {
+ add_route(src, dst, gw_src, gw_dst, link_list, symmetrical);
+ }
+ /** @deprecated NetZone::add_bypass_route() */
+ XBT_ATTRIB_DEPRECATED_v323("Please use NetZone::add_bypass_route()") void addBypassRoute(
+ kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst, kernel::routing::NetPoint* gw_src,
+ kernel::routing::NetPoint* gw_dst, std::vector<simgrid::kernel::resource::LinkImpl*>& link_list, bool symmetrical)
+ {
+ add_bypass_route(src, dst, gw_src, gw_dst, link_list, symmetrical);
+ }
+ /** @deprecated NetZone::get_properties() */
+ XBT_ATTRIB_DEPRECATED_v323("Please use NetZone::get_properties()") std::unordered_map<std::string, std::string>* getProperties()
+ {
+ return get_properties();
+ }
+ /** @deprecated NetZone::get_property() */
+ XBT_ATTRIB_DEPRECATED_v323("Please use NetZone::get_property()") const char* getProperty(const char* key)
+ {
+ return get_property(key);
+ }
+ /** @deprecated NetZone::set_property() */
+ XBT_ATTRIB_DEPRECATED_v323("Please use NetZone::set_property()") void setProperty(const char* key, const char* value)
+ {
+ set_property(key, value);
+ }
+ /** @deprecated NetZone::add_component() */
+ XBT_ATTRIB_DEPRECATED_v323("Please use NetZone::add_component()") int addComponent(kernel::routing::NetPoint* elm)
+ {
+ return add_component(elm);
+ }
+ /** @deprecated NetZone::get_vertices() */
+ XBT_ATTRIB_DEPRECATED_v323("Please use NetZone::get_vertices()") std::vector<kernel::routing::NetPoint*> getVertices();
+ /** @deprecated NetZone::get_host_count() */
+ XBT_ATTRIB_DEPRECATED_v323("Please use NetZone::get_host_count()") int getHostCount() { return get_host_count(); }
+ /** @deprecated NetZone::get_all_hosts() */
+ XBT_ATTRIB_DEPRECATED_v323("Please use NetZone::get_all_hosts()") void getHosts(
+ std::vector<s4u::Host*>* whereto); // retrieve my content as a vector of hosts
+ /** @deprecated NetZone::get_children() */
+ XBT_ATTRIB_DEPRECATED_v323("Please use NetZone::get_children()") std::vector<NetZone*>* getChildren()
+ {
+ std::vector<NetZone*>* res = new std::vector<NetZone*>();
+ for (auto child : get_children())
+ res->push_back(child);
+ return res;
+ }
+#endif