X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/27032003460976597e8a3fc709c0aae9fbc653a5..39f579ce40d3bd04d9f64a7914b07d1ec3334e4b:/src/surf/network_interface.hpp diff --git a/src/surf/network_interface.hpp b/src/surf/network_interface.hpp index c92e3d6211..8d38ef6c6e 100644 --- a/src/surf/network_interface.hpp +++ b/src/surf/network_interface.hpp @@ -48,7 +48,7 @@ public: * @param latency The initial latency of the Link in seconds * @param policy The sharing policy of the Link */ - virtual LinkImpl* create_link(const std::string& name, double bandwidth, double latency, + virtual LinkImpl* create_link(const std::string& name, const std::vector& bandwidths, double latency, s4u::Link::SharingPolicy policy) = 0; /** @@ -95,7 +95,7 @@ public: * @return The new bandwidth. */ virtual double get_bandwidth_constraint(double rate, double bound, double size); - double next_occuring_event_full(double now) override; + double next_occurring_event_full(double now) override; LinkImpl* loopback_ = nullptr; }; @@ -109,7 +109,6 @@ public: */ class LinkImpl : public Resource, public surf::PropertyHolder { bool currently_destroying_ = false; - void* userdata_ = nullptr; protected: LinkImpl(NetworkModel* model, const std::string& name, lmm::Constraint* constraint); @@ -119,8 +118,6 @@ protected: public: void destroy(); // Must be called instead of the destructor - void* get_data() { return userdata_; } - void set_data(void* d) { userdata_ = d; } /** @brief Public interface */ s4u::Link piface_; @@ -194,7 +191,7 @@ public: double latency_ = {}; double lat_current_ = {}; - double weight_ = {}; + double sharing_penalty_ = {}; double rate_ = {}; }; } // namespace resource