X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ead116337e0f3636ea2bcb200cd5156e576689eb..22e6546d2c6f14864cc93c4ed1470d8e8c1e2d95:/include/simgrid/s4u/Link.hpp diff --git a/include/simgrid/s4u/Link.hpp b/include/simgrid/s4u/Link.hpp index 8c2a9f4def..86379248ee 100644 --- a/include/simgrid/s4u/Link.hpp +++ b/include/simgrid/s4u/Link.hpp @@ -6,14 +6,13 @@ #ifndef S4U_LINK_HPP_ #define S4U_LINK_HPP_ +#include #include +#include +#include #include -#include "xbt/signal.hpp" - -#include "simgrid/link.h" - /*********** * Classes * ***********/ @@ -21,14 +20,13 @@ namespace simgrid { namespace surf { class NetworkAction; -class Action; }; namespace s4u { /** @brief A Link represents the network facilities between [hosts](\ref simgrid::s4u::Host) */ -class Link { +XBT_PUBLIC_CLASS Link +{ friend simgrid::surf::LinkImpl; -private: // Links are created from the NetZone, and destroyed by their private implementation when the simulation ends explicit Link(surf::LinkImpl* pimpl) : pimpl_(pimpl) {} virtual ~Link() = default; @@ -39,8 +37,10 @@ public: /** @brief Retrieve a link from its name */ static Link* byName(const char* name); - /** @brief Get da name */ - const char* name(); + /** @brief Retrieves the name of that link as a C++ string */ + const std::string& getName() const; + /** @brief Retrieves the name of that link as a C string */ + const char* getCname() const; /** @brief Get the bandwidth in bytes per second of current Link */ double bandwidth(); @@ -83,6 +83,8 @@ public: /** @brief Callback signal fired when a communication changes it state (ready/done/cancel) */ static simgrid::xbt::signal onCommunicationStateChange; + + const char* XBT_ATTRIB_DEPRECATED_v321("Use getCname(): v3.21 will turn this warning into an error.") name(); }; } }