X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7981fe568ccfcc3c517bd73ac146d2b59fa85ea2..51c23076e2b42ff07dc167dea1cb0e3a4ab3cf68:/src/surf/network_interface.hpp diff --git a/src/surf/network_interface.hpp b/src/surf/network_interface.hpp index aedbde82f0..7842043c06 100644 --- a/src/surf/network_interface.hpp +++ b/src/surf/network_interface.hpp @@ -6,12 +6,13 @@ #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 "src/surf/trace_mgr.hpp" + #include #include @@ -20,7 +21,8 @@ ***********/ namespace simgrid { -namespace surf { +namespace kernel { +namespace resource { /********* * Model * *********/ @@ -31,10 +33,10 @@ namespace surf { */ class NetworkModel : public Model { public: - /** @brief Constructor */ - NetworkModel() : Model() {} + static simgrid::config::Flag cfg_tcp_gamma; + static simgrid::config::Flag cfg_crosstraffic; - /** @brief Destructor */ + explicit NetworkModel(Model::UpdateAlgo algo) : Model(algo) {} ~NetworkModel() override; /** @@ -46,7 +48,7 @@ public: * @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; + s4u::Link::SharingPolicy policy) = 0; /** * @brief Create a communication between two hosts. @@ -60,13 +62,7 @@ public: * 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. @@ -102,7 +98,7 @@ public: * @return The new bandwidth. */ virtual double bandwidthConstraint(double rate, double bound, double size); - double nextOccuringEventFull(double now) override; + double next_occuring_event_full(double now) override; LinkImpl* loopback_ = nullptr; }; @@ -114,9 +110,9 @@ public: * @brief SURF network link interface class * @details A Link represents the link between two [hosts](\ref simgrid::surf::HostImpl) */ -class LinkImpl : public simgrid::kernel::model::Resource, public simgrid::surf::PropertyHolder { +class LinkImpl : public Resource, public simgrid::surf::PropertyHolder { 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() override; public: @@ -140,15 +136,16 @@ public: /** @brief Update the latency in seconds of current Link */ virtual void setLatency(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 sharingPolicy(); /** @brief Check if the Link is used */ - bool isUsed() override; + bool is_used() override; - void turnOn() override; - void turnOff() override; + void turn_on() override; + void turn_off() 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. */ @@ -160,8 +157,8 @@ public: Trace must contain absolute values */ tmgr_trace_event_t stateEvent_ = nullptr; - s_surf_metric_t latency_ = {1.0, 0, nullptr}; - s_surf_metric_t bandwidth_ = {1.0, 0, nullptr}; + Metric latency_ = {1.0, 0, nullptr}; + Metric bandwidth_ = {1.0, 0, nullptr}; /* User data */ void* getData() { return userData; } @@ -185,9 +182,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 +192,33 @@ 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; + void set_state(Action::State state) override; virtual std::list links(); double latency_ = {}; - double latCurrent_ = {}; + double lat_current_ = {}; double weight_ = {}; double rate_ = {}; }; } } +} // namespace simgrid +/** \ingroup SURF_models + * \brief The network model + */ +XBT_PUBLIC_DATA simgrid::kernel::resource::NetworkModel* surf_network_model; #endif /* SURF_NETWORK_INTERFACE_HPP_ */