X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dac676c1180a5ea95897072e55f698433a857d90..1ebb8e111d904fea559e48ec193c1f7c5dee2245:/src/surf/network_interface.hpp diff --git a/src/surf/network_interface.hpp b/src/surf/network_interface.hpp index b17ddad992..e0cb0807ed 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-2019. 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. */ @@ -6,12 +6,12 @@ #ifndef SURF_NETWORK_INTERFACE_HPP_ #define SURF_NETWORK_INTERFACE_HPP_ +#include "simgrid/kernel/resource/Model.hpp" +#include "simgrid/kernel/resource/Resource.hpp" #include "simgrid/s4u/Link.hpp" #include "src/kernel/lmm/maxmin.hpp" -#include "src/kernel/model/Resource.hpp" #include "src/surf/PropertyHolder.hpp" -#include "src/surf/surf_interface.hpp" -#include "xbt/base.h" + #include #include @@ -20,7 +20,8 @@ ***********/ namespace simgrid { -namespace surf { +namespace kernel { +namespace resource { /********* * Model * *********/ @@ -31,10 +32,12 @@ namespace surf { */ class NetworkModel : public Model { public: - /** @brief Constructor */ - NetworkModel() : Model() {} + static config::Flag cfg_tcp_gamma; + static config::Flag cfg_crosstraffic; - /** @brief Destructor */ + explicit NetworkModel(Model::UpdateAlgo algo) : Model(algo) {} + NetworkModel(const NetworkModel&) = delete; + NetworkModel& operator=(const NetworkModel&) = delete; ~NetworkModel() override; /** @@ -45,64 +48,54 @@ public: * @param latency The initial latency of the Link in seconds * @param policy The sharing policy of the Link */ - 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, double bandwidth, double latency, + s4u::Link::SharingPolicy policy) = 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 Action* communicate(simgrid::s4u::Host* src, simgrid::s4u::Host* dst, double size, double rate) = 0; - - /** @brief Function pointer to the function to use to solve the lmm_system_t - * - * @param system The lmm_system_t to solve - */ - void (*f_networkSolve)(lmm_system_t) = simgrid::kernel::lmm::lmm_solve; + 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); /** * @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); /** * @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 nextOccuringEventFull(double now) override; + virtual double get_bandwidth_constraint(double rate, double bound, double size); + double next_occuring_event_full(double now) override; LinkImpl* loopback_ = nullptr; }; @@ -112,72 +105,63 @@ 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, public surf::PropertyHolder { + bool currently_destroying_ = false; + void* userdata_ = nullptr; + protected: - LinkImpl(simgrid::surf::NetworkModel* model, const std::string& name, kernel::lmm::Constraint* constraint); + LinkImpl(NetworkModel* model, const std::string& name, lmm::Constraint* constraint); + LinkImpl(const LinkImpl&) = delete; + LinkImpl& operator=(const LinkImpl&) = delete; ~LinkImpl() override; public: void destroy(); // Must be called instead of the destructor -private: - bool currentlyDestroying_ = false; + void* get_data() { return userdata_; } + void set_data(void* d) { userdata_ = d; } -public: /** @brief Public interface */ s4u::Link piface_; /** @brief Get the bandwidth in bytes per second of current Link */ - virtual double bandwidth(); + virtual double get_bandwidth(); /** @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(); + virtual double get_latency(); /** @brief Update the latency in seconds of current Link */ - virtual void setLatency(double value) = 0; + virtual void 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 s4u::Link::SharingPolicy get_sharing_policy(); /** @brief Check if the Link is used */ - bool isUsed() override; + bool is_used() override; + + void turn_on() override; + void turn_off() override; - void turnOn() override; - void turnOff() override; + void on_bandwidth_change(); - 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 */ + 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 */ - tmgr_trace_event_t stateEvent_ = nullptr; Metric latency_ = {1.0, 0, nullptr}; Metric bandwidth_ = {1.0, 0, nullptr}; - /* User data */ - void* getData() { return userData; } - void setData(void* d) { userData = d; } -private: - void* userData = nullptr; - - /* List of all links. FIXME: should move to the Engine */ - static std::unordered_map* links; - -public: - static LinkImpl* byName(std::string name); - static int linksCount(); - static LinkImpl** linksList(); - static void linksList(std::vector* linkList); - static void linksExit(); + /** @brief A link can have several bandwith attach to it (mostly use by wifi model) */ + std::vector bandwidths_; }; /********** @@ -185,9 +169,9 @@ 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::surf::Action { +class NetworkAction : public Action { public: /** @brief Constructor * @@ -195,29 +179,34 @@ public: * @param cost The cost of this NetworkAction in [TODO] * @param failed [description] */ - NetworkAction(simgrid::surf::Model* model, double cost, bool failed) : simgrid::surf::Action(model, cost, failed) {} + NetworkAction(Model* model, double cost, bool failed) : Action(model, cost, failed) {} /** * @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::surf::Model* model, double cost, bool failed, kernel::lmm::Variable* var) - : simgrid::surf::Action(model, cost, failed, var){}; + NetworkAction(Model* model, double cost, bool failed, lmm::Variable* var) : Action(model, cost, failed, var){}; - void setState(simgrid::surf::Action::State state) override; - virtual std::list links(); + void set_state(Action::State state) override; + virtual std::list links() const; double latency_ = {}; - double latCurrent_ = {}; - double weight_ = {}; + double lat_current_ = {}; + double sharing_penalty_ = {}; double rate_ = {}; }; -} -} +} // namespace resource +} // 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_ */