X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8de466d0f03f18b22c6c36170b509d48a39fcd52..3577c5ad9b3db70921211e8ec8fe16dfb076b6cf:/src/surf/network_interface.hpp diff --git a/src/surf/network_interface.hpp b/src/surf/network_interface.hpp index 822602ad8a..3861316ed3 100644 --- a/src/surf/network_interface.hpp +++ b/src/surf/network_interface.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2004-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2004-2021. 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. */ @@ -7,12 +7,11 @@ #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" -#include "src/surf/PropertyHolder.hpp" -#include "src/surf/surf_interface.hpp" -#include "xbt/base.h" +#include #include #include @@ -22,7 +21,8 @@ ***********/ namespace simgrid { -namespace surf { +namespace kernel { +namespace resource { /********* * Model * *********/ @@ -31,73 +31,75 @@ namespace surf { * @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 kernel::resource::Model { +class NetworkModel : public Model, public NetworkModelIntf { public: - static simgrid::config::Flag cfg_tcp_gamma; + static config::Flag cfg_tcp_gamma; + static config::Flag cfg_crosstraffic; - explicit NetworkModel(kernel::resource::Model::UpdateAlgo algo) : Model(algo) {} + using Model::Model; + NetworkModel(const NetworkModel&) = delete; + NetworkModel& operator=(const NetworkModel&) = delete; ~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* createLink(const std::string& name, double bandwidth, double latency, - e_surf_link_sharing_policy_t 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. - * @details It makes calls to the routing part, and execute the communication - * between the two end points. + * @details It makes calls to the routing part, and execute the communication between the two end points. * * @param src The source of the communication * @param dst The destination of the communication * @param size The size of the communication in bytes - * @param rate Allows to limit the transfer rate. Negative value means - * unlimited. + * @param rate Allows to limit the transfer rate. Negative value means unlimited. * @return The action representing the communication */ - virtual kernel::resource::Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) = 0; + virtual Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) = 0; /** * @brief Get the right multiplicative factor for the latency. - * @details Depending on the model, the effective latency when sending - * a message might be different from the theoretical latency of the link, - * in function of the message size. In order to account for this, this - * function gets this factor. + * @details Depending on the model, the effective latency when sending a message might be different from the + * theoretical latency of the link, in function of the message size. In order to account for this, this function gets + * this factor. * * @param size The size of the message. * @return The latency factor. */ - virtual double latencyFactor(double size); + virtual double get_latency_factor(double /* size */) { return sg_latency_factor; } /** * @brief Get the right multiplicative factor for the bandwidth. - * @details Depending on the model, the effective bandwidth when sending - * a message might be different from the theoretical bandwidth of the link, - * in function of the message size. In order to account for this, this - * function gets this factor. + * @details Depending on the model, the effective bandwidth when sending a message might be different from the + * theoretical bandwidth of the link, in function of the message size. In order to account for this, this function + * gets this factor. * * @param size The size of the message. * @return The bandwidth factor. */ - virtual double bandwidthFactor(double size); + virtual double get_bandwidth_factor(double /* size*/) { return sg_bandwidth_factor; } /** * @brief Get definitive bandwidth. - * @details It gives the minimum bandwidth between the one that would - * occur if no limitation was enforced, and the one arbitrary limited. + * @details It gives the minimum bandwidth between the one that would occur if no limitation was enforced, and the + * one arbitrary limited. * @param rate The desired maximum bandwidth. * @param bound The bandwidth with only the network taken into account. * @param size The size of the message. * @return The new bandwidth. */ - virtual double bandwidthConstraint(double rate, double bound, double size); - double next_occuring_event_full(double now) override; + 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,72 +109,59 @@ public: ************/ /** @ingroup SURF_network_interface * @brief SURF network link interface class - * @details A Link represents the link between two [hosts](\ref simgrid::surf::HostImpl) + * @details A Link represents the link between two [hosts](@ref simgrid::surf::HostImpl) */ -class LinkImpl : public simgrid::kernel::resource::Resource, public simgrid::surf::PropertyHolder { +class LinkImpl : public Resource_T, public xbt::PropertyHolder { + s4u::Link piface_; + protected: - LinkImpl(simgrid::surf::NetworkModel* model, const std::string& name, kernel::lmm::Constraint* constraint); - ~LinkImpl() override; + explicit LinkImpl(const std::string& name); + LinkImpl(const LinkImpl&) = delete; + LinkImpl& operator=(const LinkImpl&) = delete; + ~LinkImpl() override = default; // Use destroy() instead of this destructor. public: void destroy(); // Must be called instead of the destructor -private: - bool currentlyDestroying_ = false; -public: + void latency_check(double latency) const; + /** @brief Public interface */ - s4u::Link piface_; + 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 */ - virtual double bandwidth(); - + double get_bandwidth() const { return bandwidth_.peak * bandwidth_.scale; } /** @brief Update the bandwidth in bytes per second of current Link */ - virtual void setBandwidth(double value) = 0; + virtual void set_bandwidth(double value) = 0; /** @brief Get the latency in seconds of current Link */ - virtual double latency(); - + double get_latency() const { return latency_.peak * latency_.scale; } /** @brief Update the latency in seconds of current Link */ - virtual void setLatency(double value) = 0; + virtual LinkImpl* set_latency(double value) = 0; - /** @brief The sharing policy is a @{link e_surf_link_sharing_policy_t::EType} (0: FATPIPE, 1: SHARED, 2: - * SPLITDUPLEX) */ - virtual int sharingPolicy(); + /** @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 */ - bool is_used() override; + bool is_used() const override; void turn_on() override; void turn_off() override; - virtual void setStateTrace(tmgr_trace_t trace); /*< setup the trace file with states events (ON or OFF). - Trace must contain boolean values. */ - virtual void setBandwidthTrace( - tmgr_trace_t trace); /*< setup the trace file with bandwidth events (peak speed changes due to external load). - Trace must contain percentages (value between 0 and 1). */ - virtual void setLatencyTrace( - tmgr_trace_t trace); /*< setup the trace file with latency events (peak latency changes due to external load). - Trace must contain absolute values */ - - tmgr_trace_event_t stateEvent_ = nullptr; - Metric latency_ = {1.0, 0, nullptr}; - Metric bandwidth_ = {1.0, 0, nullptr}; + void seal() override; - /* User data */ - void* getData() { return userData; } - void setData(void* d) { userData = d; } -private: - void* userData = nullptr; + void on_bandwidth_change() const; - /* List of all links. FIXME: should move to the Engine */ - static std::unordered_map* links; + /* 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); -public: - static LinkImpl* byName(std::string name); - static int linksCount(); - static LinkImpl** linksList(); - static void linksList(std::vector* linkList); - static void linksExit(); + Metric latency_ = {0.0, 1, nullptr}; + Metric bandwidth_ = {1.0, 1, nullptr}; }; /********** @@ -180,9 +169,12 @@ public: **********/ /** @ingroup SURF_network_interface * @brief SURF network action interface class - * @details A NetworkAction represents a communication between two [hosts](\ref HostImpl) + * @details A NetworkAction represents a communication between two [hosts](@ref simgrid::surf::HostImpl) */ -class NetworkAction : public simgrid::kernel::resource::Action { +class NetworkAction : public Action { + s4u::Host& src_; + s4u::Host& dst_; + public: /** @brief Constructor * @@ -190,8 +182,8 @@ public: * @param cost The cost of this NetworkAction in [TODO] * @param failed [description] */ - NetworkAction(simgrid::kernel::resource::Model* model, double cost, bool failed) - : simgrid::kernel::resource::Action(model, cost, failed) + NetworkAction(Model* model, s4u::Host& src, s4u::Host& dst, double cost, bool failed) + : Action(model, cost, failed), src_(src), dst_(dst) { } @@ -199,24 +191,25 @@ public: * @brief NetworkAction constructor * * @param model The NetworkModel associated to this NetworkAction - * @param cost The cost of this NetworkAction in [TODO] - * @param failed [description] + * @param cost The cost of this NetworkAction in bytes + * @param failed Actions can be created in a failed state * @param var The lmm variable associated to this Action if it is part of a LMM component */ - NetworkAction(simgrid::kernel::resource::Model* model, double cost, bool failed, kernel::lmm::Variable* var) - : simgrid::kernel::resource::Action(model, cost, failed, var){}; + NetworkAction(Model* model, s4u::Host& src, s4u::Host& dst, double cost, bool failed, lmm::Variable* var) + : Action(model, cost, failed, var), src_(src), dst_(dst){}; + + void set_state(Action::State state) override; + virtual std::list get_links() const; - void set_state(simgrid::kernel::resource::Action::State state) override; - virtual std::list links(); + 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 latency_ = {}; - double lat_current_ = {}; - double weight_ = {}; - double rate_ = {}; + s4u::Host& get_src() const { return src_; } + s4u::Host& get_dst() const { return dst_; } }; -} -} +} // namespace resource +} // namespace kernel +} // namespace simgrid #endif /* SURF_NETWORK_INTERFACE_HPP_ */ - -