-/* Copyright (c) 2016-2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2016-2019. 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. */
*/
class XBT_PUBLIC NetZone {
protected:
- friend simgrid::kernel::routing::NetZoneImpl;
+ friend kernel::routing::NetZoneImpl;
- explicit NetZone(NetZone * father, std::string name);
- virtual ~NetZone();
+ explicit NetZone(kernel::routing::NetZoneImpl* impl) : pimpl_(impl) {}
public:
- /** @brief Seal your netzone once you're done adding content, and before routing stuff through it */
- virtual void seal();
/** @brief Retrieves the name of that netzone as a C++ string */
- const std::string& get_name() const { return name_; }
+ const std::string& get_name() const;
/** @brief Retrieves the name of that netzone as a C string */
const char* get_cname() const;
+
NetZone* get_father();
- XBT_ATTRIB_DEPRECATED_v323("Please use NetZone::get_father()") NetZone* getFather() { return get_father(); }
- XBT_ATTRIB_DEPRECATED_v323("Please use NetZone::get_name()") const std::string& getName() const { return get_name(); }
- XBT_ATTRIB_DEPRECATED_v323("Please use NetZone::get_cname()") const char* getCname() const { return get_cname(); }
- 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);
- }
- 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);
- }
-
- std::vector<NetZone*>* getChildren(); // Sub netzones
- void getHosts(std::vector<s4u::Host*> * whereto); // retrieve my content as a vector of hosts
- int getHostCount();
-
- /** Get the properties assigned to a host */
- std::unordered_map<std::string, std::string>* getProperties();
+ std::vector<Host*> get_all_hosts();
+ int get_host_count();
- /** Retrieve the property value (or nullptr if not set) */
- const char* getProperty(const char* key);
- void setProperty(const char* key, const char* value);
+ kernel::routing::NetZoneImpl* get_impl() const { return pimpl_; }
- /* Add content to the netzone, at parsing time. It should be sealed afterward. */
- virtual int addComponent(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,
- std::vector<kernel::resource::LinkImpl*>& link_list, bool symmetrical);
- virtual void add_bypass_route(kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst,
- kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst,
- std::vector<kernel::resource::LinkImpl*>& link_list, bool symmetrical) = 0;
-
- /*** Called on each newly created regular route (not on bypass routes) */
- static simgrid::xbt::signal<void(bool symmetrical, kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst,
- kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst,
- 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;
+private:
+ kernel::routing::NetZoneImpl* const pimpl_;
+ std::unordered_map<std::string, std::string> properties_;
-protected:
- unsigned int getTableSize() { return vertices_.size(); }
- std::vector<kernel::routing::NetPoint*> getVertices() { return vertices_; }
+public:
+ /** Get the properties assigned to a netzone */
+ const std::unordered_map<std::string, std::string>* get_properties() const;
-private:
- // our content, as known to our graph routing algorithm (maps vertexId -> vertex)
- std::vector<kernel::routing::NetPoint*> vertices_;
+ std::vector<NetZone*> get_children();
- std::unordered_map<std::string, std::string> properties_;
- NetZone* father_ = nullptr;
- std::string name_;
+ /** Retrieve the property value (or nullptr if not set) */
+ const char* get_property(const std::string& key) const;
+ void set_property(const std::string& key, const std::string& value);
- bool sealed_ = false; // We cannot add more content when sealed
+ /* 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 */
+ void add_route(kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst, kernel::routing::NetPoint* gw_src,
+ kernel::routing::NetPoint* gw_dst, std::vector<kernel::resource::LinkImpl*>& link_list,
+ bool symmetrical);
+ void add_bypass_route(kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst,
+ kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst,
+ std::vector<kernel::resource::LinkImpl*>& link_list, bool symmetrical);
- std::vector<NetZone*>* children_ = nullptr; // sub-netzones
+ /*** Called on each newly created regular route (not on bypass routes) */
+ static xbt::signal<void(bool symmetrical, kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst,
+ kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst,
+ std::vector<kernel::resource::LinkImpl*> const& link_list)>
+ on_route_creation;
+ static xbt::signal<void(NetZone const&)> on_creation;
+ static xbt::signal<void(NetZone const&)> on_seal;
};
-}
-}; // Namespace simgrid::s4u
+
+} // namespace s4u
+} // namespace simgrid
#endif /* SIMGRID_S4U_NETZONE_HPP */
