X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d7344bf4cd4b75fe33e19f2ac1994b200962aa7e..6bc18b576fa4a890d8b9916d292ca67dfbf60dd3:/include/simgrid/s4u/NetZone.hpp diff --git a/include/simgrid/s4u/NetZone.hpp b/include/simgrid/s4u/NetZone.hpp index fa5ca046e4..ab145b9de4 100644 --- a/include/simgrid/s4u/NetZone.hpp +++ b/include/simgrid/s4u/NetZone.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2016. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2016-2018. 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. */ @@ -6,25 +6,15 @@ #ifndef SIMGRID_S4U_NETZONE_HPP #define SIMGRID_S4U_NETZONE_HPP +#include +#include + #include #include #include #include -#include -#include - -#include - -#include "src/surf/xml/platf_private.hpp" // FIXME: kill sg_platf_route_cbarg_t to remove that UGLY include - namespace simgrid { -namespace kernel { -namespace routing { -class NetZoneImpl; -} -} - namespace s4u { /** @brief Networking Zones @@ -33,58 +23,115 @@ namespace s4u { * netzones. In SimGrid, there is a hierarchy of netzones, with a unique root zone (that you can retrieve from the * s4u::Engine). */ -XBT_PUBLIC_CLASS NetZone -{ +class XBT_PUBLIC NetZone { protected: +#ifndef DOXYGEN friend simgrid::kernel::routing::NetZoneImpl; +#endif - explicit NetZone(NetZone * father, const char* name); - virtual ~NetZone(); + explicit NetZone(kernel::routing::NetZoneImpl* impl); + ~NetZone(); public: - /** @brief Seal your netzone once you're done adding content, and before routing stuff through it */ - virtual void seal(); - char* getCname(); - NetZone* getFather(); + /** @brief Retrieves the name of that netzone as a C++ string */ + 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(); + + std::vector get_all_hosts(); + int get_host_count(); + + kernel::routing::NetZoneImpl* get_impl() { return pimpl_; } + +private: + kernel::routing::NetZoneImpl* pimpl_; + std::unordered_map properties_; - std::vector* getChildren(); // Sub netzones - void getHosts(std::vector * whereto); // retrieve my content as a vector of hosts +public: + /** Get the properties assigned to a netzone */ + std::unordered_map* get_properties(); - /** Get the properties assigned to a host */ - std::unordered_map* getProperties(); + std::vector get_children(); /** Retrieve the property value (or nullptr if not set) */ - const char* getProperty(const char* key); - void setProperty(const char* key, const char* value); + const char* get_property(std::string key); + void set_property(std::string key, std::string value); /* 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 addRoute(sg_platf_route_cbarg_t route); - virtual void addBypassRoute(sg_platf_route_cbarg_t e_route) = 0; + 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& 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& link_list, bool symmetrical); /*** Called on each newly created regular route (not on bypass routes) */ static simgrid::xbt::signal* link_list)> - onRouteCreation; - static simgrid::xbt::signal onCreation; - static simgrid::xbt::signal onSeal; - -protected: - unsigned int getTableSize() { return vertices_.size(); } - std::vector getVertices() { return vertices_; } - -private: - // our content, as known to our graph routing algorithm (maps vertexId -> vertex) - std::vector vertices_; - - std::unordered_map properties_; - NetZone* father_ = nullptr; - char* name_ = nullptr; - - bool sealed_ = false; // We cannot add more content when sealed - - std::vector* children_ = nullptr; // sub-netzones + std::vector& link_list)> + on_route_creation; + static simgrid::xbt::signal on_creation; + static simgrid::xbt::signal on_seal; + + // 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& 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& 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* 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 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* whereto); // retrieve my content as a vector of hosts + /** @deprecated NetZone::get_children() */ + XBT_ATTRIB_DEPRECATED_v323("Please use NetZone::get_children()") std::vector* getChildren() + { + std::vector* res = new std::vector(); + for (auto child : get_children()) + res->push_back(child); + return res; + } }; } }; // Namespace simgrid::s4u