X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cae79d7b011ae810a14db52a94fa7d341f02ec51..a44d99b7ed60456d5f016fc2ac2e2aa41410a008:/src/surf/network_interface.hpp?ds=sidebyside diff --git a/src/surf/network_interface.hpp b/src/surf/network_interface.hpp index f092a17651..3b0c8933ef 100644 --- a/src/surf/network_interface.hpp +++ b/src/surf/network_interface.hpp @@ -7,6 +7,7 @@ #define SURF_NETWORK_INTERFACE_HPP_ #include "simgrid/kernel/resource/Model.hpp" +#include "simgrid/kernel/resource/NetworkModelIntf.hpp" #include "simgrid/kernel/resource/Resource.hpp" #include "simgrid/s4u/Link.hpp" #include "src/kernel/lmm/maxmin.hpp" @@ -30,7 +31,7 @@ namespace resource { * @brief SURF network model interface class * @details A model is an object which handles the interactions between its Resources and its Actions */ -class NetworkModel : public Model { +class NetworkModel : public Model, public NetworkModelIntf { public: static config::Flag cfg_tcp_gamma; static config::Flag cfg_crosstraffic; @@ -41,15 +42,14 @@ public: ~NetworkModel() override; /** - * @brief Create a Link + * @brief Create a [WiFi]Link * * @param name The name of the Link - * @param bandwidth The initial bandwidth of the Link in bytes per second - * @param latency The initial latency of the Link in seconds - * @param policy The sharing policy of the Link + * @param bandwidths The vector of bandwidths of the Link in bytes per second */ - virtual LinkImpl* create_link(const std::string& name, const std::vector& bandwidths, double latency, - s4u::Link::SharingPolicy policy) = 0; + virtual LinkImpl* create_link(const std::string& name, const std::vector& bandwidths) = 0; + + virtual LinkImpl* create_wifi_link(const std::string& name, const std::vector& bandwidths) = 0; /** * @brief Create a communication between two hosts. @@ -72,7 +72,7 @@ public: * @param size The size of the message. * @return The latency factor. */ - virtual double get_latency_factor(double size); + virtual double get_latency_factor(double /* size */) { return sg_latency_factor; } /** * @brief Get the right multiplicative factor for the bandwidth. @@ -83,7 +83,7 @@ public: * @param size The size of the message. * @return The bandwidth factor. */ - virtual double get_bandwidth_factor(double size); + virtual double get_bandwidth_factor(double /* size*/) { return sg_bandwidth_factor; } /** * @brief Get definitive bandwidth. @@ -94,9 +94,13 @@ public: * @param size The size of the message. * @return The new bandwidth. */ - virtual double get_bandwidth_constraint(double rate, double bound, double size); + virtual double get_bandwidth_constraint(double rate, double /*bound*/, double /*size*/) { return rate; } + double next_occurring_event_full(double now) override; + virtual void set_lat_factor_cb(const std::function& cb) override { THROW_UNIMPLEMENTED; } + virtual void set_bw_factor_cb(const std::function& cb) override { THROW_UNIMPLEMENTED; } + LinkImpl* loopback_ = nullptr; }; @@ -107,11 +111,11 @@ 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 xbt::PropertyHolder { +class LinkImpl : public Resource_T, public xbt::PropertyHolder { s4u::Link piface_; protected: - LinkImpl(NetworkModel* model, const std::string& name, lmm::Constraint* constraint); + explicit LinkImpl(const std::string& name); LinkImpl(const LinkImpl&) = delete; LinkImpl& operator=(const LinkImpl&) = delete; ~LinkImpl() override = default; // Use destroy() instead of this destructor. @@ -119,23 +123,24 @@ protected: public: void destroy(); // Must be called instead of the destructor + void latency_check(double latency) const; + /** @brief Public interface */ const s4u::Link* get_iface() const { return &piface_; } s4u::Link* get_iface() { return &piface_; } /** @brief Get the bandwidth in bytes per second of current Link */ - double get_bandwidth() const; - + double get_bandwidth() const { return bandwidth_.peak * bandwidth_.scale; } /** @brief Update the bandwidth in bytes per second of current Link */ virtual void set_bandwidth(double value) = 0; /** @brief Get the latency in seconds of current Link */ - double get_latency() const; - + double get_latency() const { return latency_.peak * latency_.scale; } /** @brief Update the latency in seconds of current Link */ - virtual void set_latency(double value) = 0; + virtual LinkImpl* set_latency(double value) = 0; /** @brief The sharing policy */ + virtual LinkImpl* set_sharing_policy(s4u::Link::SharingPolicy policy); virtual s4u::Link::SharingPolicy get_sharing_policy() const; /** @brief Check if the Link is used */ @@ -144,19 +149,19 @@ public: void turn_on() override; void turn_off() override; + void seal() override; + void on_bandwidth_change() const; - virtual void - set_bandwidth_profile(kernel::profile::Profile* profile); /*< setup the profile file with bandwidth events - (peak speed changes due to external load). Trace must - contain percentages (value between 0 and 1). */ - virtual void - set_latency_profile(kernel::profile::Profile* profile); /*< setup the trace file with latency events (peak - latency changes due to external load). Trace must contain - absolute values */ - - Metric latency_ = {0.0, 0, nullptr}; - Metric bandwidth_ = {1.0, 0, nullptr}; + /* setup the profile file with bandwidth events (peak speed changes due to external load). + * Profile must contain percentages (value between 0 and 1). */ + virtual LinkImpl* set_bandwidth_profile(kernel::profile::Profile* profile); + /* setup the profile file with latency events (peak latency changes due to external load). + * Profile must contain absolute values */ + virtual LinkImpl* set_latency_profile(kernel::profile::Profile* profile); + + Metric latency_ = {0.0, 0, nullptr}; + Metric bandwidth_ = {1.0, 0, nullptr}; }; /********** @@ -199,7 +204,7 @@ public: double latency_ = 0.; // Delay before the action starts double lat_current_ = 0.; // Used to compute the communication RTT, and accordingly limit the communication rate double sharing_penalty_ = {}; - double rate_ = {}; + s4u::Host& get_src() const { return src_; } s4u::Host& get_dst() const { return dst_; } }; @@ -207,11 +212,4 @@ public: } // namespace kernel } // namespace simgrid -/** @ingroup SURF_models - * @brief The network model - */ -XBT_PUBLIC_DATA simgrid::kernel::resource::NetworkModel* surf_network_model; - #endif /* SURF_NETWORK_INTERFACE_HPP_ */ - -