X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6050383ef0dc59e1ca54d02bcf6bccb993593add..6c619fe932602290423c6a789c2aa034ae9f1cad:/src/surf/network_interface.hpp diff --git a/src/surf/network_interface.hpp b/src/surf/network_interface.hpp index 4b4c2567b7..fdf56e473a 100644 --- a/src/surf/network_interface.hpp +++ b/src/surf/network_interface.hpp @@ -26,30 +26,14 @@ namespace simgrid { namespace surf { - class NetworkModel; class NetworkAction; - /************* - * Callbacks * - *************/ - - /** @brief Callback signal fired when the state of a NetworkAction changes * Signature: `void(NetworkAction *action, simgrid::surf::Action::State old, simgrid::surf::Action::State current)` */ XBT_PUBLIC_DATA(simgrid::xbt::signal) networkActionStateChangedCallbacks; - /** @brief Callback signal fired when a NetworkAction is created (when a communication starts) - * Signature: `void(NetworkAction *action, RoutingEdge *src, RoutingEdge *dst, double size, double rate)` */ - XBT_PUBLIC_DATA(simgrid::xbt::signal) networkCommunicateCallbacks; - } } - -/********* - * Tools * - *********/ -XBT_PUBLIC(void) netlink_parse_init(sg_platf_link_cbarg_t link); - /********* * Model * *********/ @@ -67,13 +51,7 @@ namespace simgrid { NetworkModel() : Model() { } /** @brief Destructor */ - ~NetworkModel() { - if (maxminSystem_) - lmm_system_free(maxminSystem_); - if (actionHeap_) - xbt_heap_free(actionHeap_); - delete modifiedSet_; - } + ~NetworkModel() override; /** * @brief Create a Link @@ -82,8 +60,7 @@ namespace simgrid { * @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 properties Dictionary of properties associated to this Resource - * @return The created Link + * @param props Dictionary of properties associated to this Link */ virtual Link* createLink(const char *name, double bandwidth, double latency, e_surf_link_sharing_policy_t policy, xbt_dict_t properties)=0; @@ -91,7 +68,7 @@ namespace simgrid { /** * @brief Create a communication between two hosts. * @details It makes calls to the routing part, and execute the communication - * between the two end points. + * between the two end points. * * @param src The source of the communication * @param dst The destination of the communication @@ -100,7 +77,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(kernel::routing::NetCard *src, kernel::routing::NetCard *dst, double size, double rate)=0; /** @brief Function pointer to the function to use to solve the lmm_system_t * @@ -150,35 +127,22 @@ 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 Link constructor - * - * @param model The NetworkModel associated to this Link - * @param name The name of the Link - * @param props Dictionary of properties associated to this Link - */ - Link(simgrid::surf::NetworkModel *model, const char *name, xbt_dict_t props); - /** - * @brief Link constructor - * - * @param model The NetworkModel associated to this Link - * @param name The name of the Link - * @param props Dictionary of properties associated to this Link - * @param constraint The lmm constraint associated to this Cpu if it is part of a LMM component - */ + /** @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 destruction logic */ /**************************/ protected: - ~Link(); + ~Link() override; public: void destroy(); // Must be called instead of the destructor private: @@ -187,15 +151,20 @@ 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; + /** @brief Get the bandwidth in bytes per second of current Link */ @@ -223,16 +192,16 @@ 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 m_stateEvent = nullptr; + s_surf_metric_t m_latency = {1.0,0,nullptr}; + s_surf_metric_t m_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 */ private: @@ -249,7 +218,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: