X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e1c4dcf63a54d957507006ee3edbfbb6368a27df..5d00e5f256a27ccad82ab92aeea7943d2678e85b:/src/surf/network_interface.hpp diff --git a/src/surf/network_interface.hpp b/src/surf/network_interface.hpp index ea9039e66d..0d92c8dbf3 100644 --- a/src/surf/network_interface.hpp +++ b/src/surf/network_interface.hpp @@ -10,7 +10,7 @@ #include "simgrid/kernel/resource/Resource.hpp" #include "simgrid/s4u/Link.hpp" #include "src/kernel/lmm/maxmin.hpp" -#include "src/surf/PropertyHolder.hpp" +#include #include #include @@ -107,8 +107,9 @@ public: * @brief SURF network link interface class * @details A Link represents the link between two [hosts](@ref simgrid::surf::HostImpl) */ -class LinkImpl : public Resource, public surf::PropertyHolder { +class LinkImpl : public Resource, public xbt::PropertyHolder { bool currently_destroying_ = false; + s4u::Link piface_; protected: LinkImpl(NetworkModel* model, const std::string& name, lmm::Constraint* constraint); @@ -120,7 +121,7 @@ public: void destroy(); // Must be called instead of the destructor /** @brief Public interface */ - s4u::Link piface_; + s4u::Link* get_iface() { return &piface_; } /** @brief Get the bandwidth in bytes per second of current Link */ virtual double get_bandwidth(); @@ -156,7 +157,6 @@ public: Metric latency_ = {0.0, 0, nullptr}; Metric bandwidth_ = {1.0, 0, nullptr}; - }; /**********