X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4b597ac2a550a08c142293e59e4c4d2bdad8ff5d..6a6bf1eb1c1bee3ae5f014efa55daaba5a4eba0c:/src/surf/network_interface.hpp diff --git a/src/surf/network_interface.hpp b/src/surf/network_interface.hpp index 7473f1fa8e..b94a0e0ad8 100644 --- a/src/surf/network_interface.hpp +++ b/src/surf/network_interface.hpp @@ -9,12 +9,11 @@ #include -#include +#include #include "xbt/fifo.h" #include "xbt/dict.h" #include "surf_interface.hpp" -#include "surf_routing.hpp" #include "src/surf/PropertyHolder.hpp" #include "simgrid/link.h" @@ -32,15 +31,10 @@ namespace simgrid { * Signature: `void(NetworkAction *action, simgrid::surf::Action::State old, simgrid::surf::Action::State current)` */ XBT_PUBLIC_DATA(simgrid::xbt::signal) networkActionStateChangedCallbacks; - } -} /********* * Model * *********/ -namespace simgrid { - namespace surf { - /** @ingroup SURF_network_interface * @brief SURF network model interface class * @details A model is an object which handles the interactions between its Resources and its Actions @@ -51,11 +45,7 @@ namespace simgrid { NetworkModel() : Model() { } /** @brief Destructor */ - ~NetworkModel() { - lmm_system_free(maxminSystem_); - xbt_heap_free(actionHeap_); - delete modifiedSet_; - } + ~NetworkModel() override; /** * @brief Create a Link @@ -65,8 +55,8 @@ namespace simgrid { * @param latency The initial latency of the Link in seconds * @param policy The sharing policy of the Link */ - virtual Link* createLink(const char *name, double bandwidth, double latency, - e_surf_link_sharing_policy_t policy, xbt_dict_t properties)=0; + virtual Link* createLink(const char* name, double bandwidth, double latency, + e_surf_link_sharing_policy_t policy) = 0; /** * @brief Create a communication between two hosts. @@ -80,7 +70,7 @@ namespace simgrid { * unlimited. * @return The action representing the communication */ - virtual Action *communicate(NetCard *src, NetCard *dst, double size, double rate)=0; + 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 * @@ -122,7 +112,9 @@ namespace simgrid { * @return The new bandwidth. */ virtual double bandwidthConstraint(double rate, double bound, double size); - double next_occuring_event_full(double now) override; + double nextOccuringEventFull(double now) override; + + Link* loopback_ = nullptr; }; /************ @@ -130,22 +122,20 @@ namespace simgrid { ************/ /** @ingroup SURF_network_interface * @brief SURF network link interface class - * @details A Link represents the link between two [hosts](\ref Host) + * @details A Link represents the link between two [hosts](\ref simgrid::surf::HostImpl) */ class Link : public simgrid::surf::Resource, public simgrid::surf::PropertyHolder { public: - /** @brief Constructor of non-LMM links */ - Link(simgrid::surf::NetworkModel *model, const char *name, xbt_dict_t props); /** @brief Constructor of LMM links */ - Link(simgrid::surf::NetworkModel *model, const char *name, xbt_dict_t props, lmm_constraint_t constraint); + Link(simgrid::surf::NetworkModel* model, const char* name, lmm_constraint_t constraint); - /* Link destruction logic */ - /**************************/ + /* Link destruction logic */ + /**************************/ protected: - ~Link(); + ~Link() override; public: void destroy(); // Must be called instead of the destructor private: @@ -154,33 +144,31 @@ namespace simgrid { public: /** @brief Callback signal fired when a new Link is created. * Signature: void(Link*) */ - static simgrid::xbt::signal onCreation; + static simgrid::xbt::signal onCreation; /** @brief Callback signal fired when a Link is destroyed. * Signature: void(Link*) */ - static simgrid::xbt::signal onDestruction; + static simgrid::xbt::signal onDestruction; /** @brief Callback signal fired when the state of a Link changes (when it is turned on or off) * Signature: `void(Link*)` */ - static simgrid::xbt::signal onStateChange; + static simgrid::xbt::signal onStateChange; /** @brief Callback signal fired when a communication starts - * Signature: `void(NetworkAction *action, RoutingEdge *src, RoutingEdge *dst)` */ - static simgrid::xbt::signal onCommunicate; - - + * Signature: `void(NetworkAction *action, host *src, host *dst)` */ + static simgrid::xbt::signal onCommunicate; /** @brief Get the bandwidth in bytes per second of current Link */ - virtual double getBandwidth(); + virtual double bandwidth(); /** @brief Update the bandwidth in bytes per second of current Link */ - virtual void updateBandwidth(double value)=0; + virtual void setBandwidth(double value) = 0; /** @brief Get the latency in seconds of current Link */ - virtual double getLatency(); + virtual double latency(); /** @brief Update the latency in seconds of current Link */ - virtual void updateLatency(double value)=0; + 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: FULLDUPLEX) */ virtual int sharingPolicy(); @@ -195,20 +183,20 @@ namespace simgrid { 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_iterator_t m_stateEvent = NULL; - s_surf_metric_t m_latency = {1.0,0,NULL}; - s_surf_metric_t m_bandwidth = {1.0,0,NULL}; + tmgr_trace_iterator_t stateEvent_ = nullptr; + s_surf_metric_t latency_ = {1.0, 0, nullptr}; + s_surf_metric_t bandwidth_ = {1.0, 0, nullptr}; /* User data */ public: void *getData() { return userData;} void setData(void *d) { userData=d;} private: - void *userData = NULL; + void *userData = nullptr; - /* List of all links */ + /* List of all links. FIXME: should move to the Engine */ private: - static boost::unordered_map *links; + static std::unordered_map *links; public: static Link *byName(const char* name); static int linksCount(); @@ -221,7 +209,7 @@ namespace simgrid { **********/ /** @ingroup SURF_network_interface * @brief SURF network action interface class - * @details A NetworkAction represents a communication between two [hosts](\ref Host) + * @details A NetworkAction represents a communication between two [hosts](\ref HostImpl) */ class NetworkAction : public simgrid::surf::Action { public: