X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0236bbc683363a58fdef428ce7de140909de5db1..abc6ac8b859794c5e38b56629674377872c70939:/src/surf/network_interface.hpp diff --git a/src/surf/network_interface.hpp b/src/surf/network_interface.hpp index dcd3136bd3..ca9f7e10c0 100644 --- a/src/surf/network_interface.hpp +++ b/src/surf/network_interface.hpp @@ -15,6 +15,7 @@ #include "xbt/dict.h" #include "surf_interface.hpp" #include "surf_routing.hpp" +#include "src/surf/PropertyHolder.hpp" #include "simgrid/link.h" @@ -32,35 +33,14 @@ class NetworkAction; * Callbacks * *************/ -/** @ingroup SURF_callbacks - * @brief Callbacks handler which emits the callbacks after Link creation - * @details Callback functions have the following signature: `void(Link*)` - */ -XBT_PUBLIC_DATA( surf_callback(void, simgrid::surf::Link*)) networkLinkCreatedCallbacks; - -/** @ingroup SURF_callbacks - * @brief Callbacks handler which emits the callbacks after Link destruction - * @details Callback functions have the following signature: `void(Link*)` - */ -XBT_PUBLIC_DATA( surf_callback(void, simgrid::surf::Link*)) networkLinkDestructedCallbacks; - -/** @ingroup SURF_callbacks - * @brief Callbacks handler which emits the callbacks after Link State changed - * @details Callback functions have the following signature: `void(LinkAction *action, e_surf_resource_state_t old, e_surf_resource_state_t current)` - */ -XBT_PUBLIC_DATA( surf_callback(void, simgrid::surf::Link*, e_surf_resource_state_t, e_surf_resource_state_t)) networkLinkStateChangedCallbacks; -/** @ingroup SURF_callbacks - * @brief Callbacks handler which emits the callbacks after NetworkAction State changed - * @details Callback functions have the following signature: `void(NetworkAction *action, e_surf_action_state_t old, e_surf_action_state_t current)` - */ -XBT_PUBLIC_DATA( surf_callback(void, simgrid::surf::NetworkAction*, e_surf_action_state_t, e_surf_action_state_t)) networkActionStateChangedCallbacks; +/** @brief Callback signal fired when the state of a NetworkAction changes + * Signature: `void(NetworkAction *action, e_surf_action_state_t old, e_surf_action_state_t current)` */ +XBT_PUBLIC_DATA(simgrid::xbt::signal) networkActionStateChangedCallbacks; -/** @ingroup SURF_callbacks - * @brief Callbacks handler which emits the callbacks after communication created - * @details Callback functions have the following signature: `void(NetworkAction *action, RoutingEdge *src, RoutingEdge *dst, double size, double rate)` - */ -XBT_PUBLIC_DATA( surf_callback(void, simgrid::surf::NetworkAction*, simgrid::surf::RoutingEdge *src, simgrid::surf::RoutingEdge *dst, double size, double rate)) networkCommunicateCallbacks; +/** @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; } } @@ -70,8 +50,6 @@ XBT_PUBLIC_DATA( surf_callback(void, simgrid::surf::NetworkAction*, simgrid::sur *********/ XBT_PUBLIC(void) netlink_parse_init(sg_platf_link_cbarg_t link); -XBT_PUBLIC(void) net_add_traces(); - /********* * Model * *********/ @@ -90,12 +68,12 @@ public: /** @brief Destructor */ ~NetworkModel() { - if (p_maxminSystem) - lmm_system_free(p_maxminSystem); - if (p_actionHeap) - xbt_heap_free(p_actionHeap); - if (p_modifiedSet) - delete p_modifiedSet; + if (p_maxminSystem) + lmm_system_free(p_maxminSystem); + if (p_actionHeap) + xbt_heap_free(p_actionHeap); + if (p_modifiedSet) + delete p_modifiedSet; } /** @@ -106,7 +84,7 @@ public: * @param bw_trace The trace associated to the Link bandwidth * @param lat_initial The initial latency of the Link in seconds * @param lat_trace The trace associated to the Link latency - * @param state_initial The initial Link (state)[e_surf_resource_state_t] + * @param initiallyOn The initial Link (state)[e_surf_resource_state_t] * @param state_trace The trace associated to the Link (state)[e_surf_resource_state_t] * @param policy The sharing policy of the Link * @param properties Dictionary of properties associated to this Resource @@ -117,7 +95,7 @@ public: tmgr_trace_t bw_trace, double lat_initial, tmgr_trace_t lat_trace, - e_surf_resource_state_t state_initial, + int initiallyOn, tmgr_trace_t state_trace, e_surf_link_sharing_policy_t policy, xbt_dict_t properties)=0; @@ -134,8 +112,8 @@ public: * unlimited. * @return The action representing the communication */ - virtual Action *communicate(RoutingEdge *src, RoutingEdge *dst, - double size, double rate)=0; + virtual Action *communicate(NetCard *src, NetCard *dst, + double size, double rate)=0; /** @brief Function pointer to the function to use to solve the lmm_system_t * @@ -177,7 +155,7 @@ public: * @return The new bandwidth. */ virtual double bandwidthConstraint(double rate, double bound, double size); - double shareResourcesFull(double now); + double next_occuring_event_full(double now) override; }; /************ @@ -187,7 +165,9 @@ public: * @brief SURF network link interface class * @details A Link represents the link between two [hosts](\ref Host) */ -class Link : public simgrid::surf::Resource { +class Link : + public simgrid::surf::Resource, + public simgrid::surf::PropertyHolder { public: /** * @brief Link constructor @@ -205,45 +185,63 @@ public: * @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 - * @param history [TODO] * @param state_trace [TODO] */ Link(simgrid::surf::NetworkModel *model, const char *name, xbt_dict_t props, lmm_constraint_t constraint, - tmgr_history_t history, tmgr_trace_t state_trace); - /** @brief Link destructor */ + /* Link destruction logic */ + /**************************/ +protected: ~Link(); +public: + void destroy(); // Must be called instead of the destructor +private: + bool currentlyDestroying_ = false; + +public: + /** @brief Callback signal fired when a new Link is created. + * Signature: void(Link*) */ + static simgrid::xbt::signal onCreation; + + /** @brief Callback signal fired when a Link is destroyed. + * Signature: void(Link*) */ + 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; + /** @brief Get the bandwidth in bytes per second of current Link */ virtual double getBandwidth(); /** @brief Update the bandwidth in bytes per second of current Link */ - virtual void updateBandwidth(double value, double date=surf_get_clock())=0; + virtual void updateBandwidth(double value)=0; /** @brief Get the latency in seconds of current Link */ virtual double getLatency(); /** @brief Update the latency in seconds of current Link */ - virtual void updateLatency(double value, double date=surf_get_clock())=0; + virtual void updateLatency(double value)=0; - /** @brief The sharing policy is a @{link #e_surf_link_sharing_policy_t} (0: FATPIPE, 1: SHARED, 2: FULLDUPLEX) */ + /** @brief The sharing policy is a @{link e_surf_link_sharing_policy_t::EType} (0: FATPIPE, 1: SHARED, 2: FULLDUPLEX) */ virtual int sharingPolicy(); /** @brief Check if the Link is used */ - bool isUsed(); + bool isUsed() override; - void setState(e_surf_resource_state_t state); + void turnOn() override; + void turnOff() override; - /* Using this object with the public part of - model does not make sense */ - double m_latCurrent = 0; - tmgr_trace_event_t p_latEvent = NULL; + virtual void set_state_trace(tmgr_trace_t trace); /*< setup the trace file with states events (ON or OFF). Trace must contain boolean values. */ + virtual void set_bandwidth_trace(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 set_latency_trace(tmgr_trace_t trace); /*< setup the trace file with latency events (peak latency changes due to external load). Trace must contain absolute values */ - /* LMM */ - tmgr_trace_event_t p_stateEvent = NULL; - s_surf_metric_t p_speed; + 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}; /* User data */ public: @@ -252,17 +250,12 @@ public: private: void *userData = NULL; -public: - xbt_dict_t getProperties(); -protected: - xbt_dict_t p_properties = NULL; - /* List of all links */ private: static boost::unordered_map *links; public: static Link *byName(const char* name); - static int linksAmount(); + static int linksCount(); static Link **linksList(); static void linksExit(); };