X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c26cf1d94cbe1d90f8236c9b61da741a4258dcb6..8a4f05a5d0b69c4f1a421bfdc1a016ae7471abb8:/src/surf/network_interface.hpp diff --git a/src/surf/network_interface.hpp b/src/surf/network_interface.hpp index b654419962..9858267157 100644 --- a/src/surf/network_interface.hpp +++ b/src/surf/network_interface.hpp @@ -4,58 +4,56 @@ /* 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. */ +#include + +#include "xbt/fifo.h" #include "surf_interface.hpp" #include "surf_routing.hpp" +#include "simgrid/link.h" + #ifndef SURF_NETWORK_INTERFACE_HPP_ #define SURF_NETWORK_INTERFACE_HPP_ - /*********** * Classes * ***********/ class NetworkModel; -typedef NetworkModel *NetworkModelPtr; - -class NetworkLink; -typedef NetworkLink *NetworkLinkPtr; - class NetworkAction; -typedef NetworkAction *NetworkActionPtr; /************* * Callbacks * *************/ /** @ingroup SURF_callbacks - * @brief Callbacks handler which emit the callbacks after NetworkLink creation - * @details Callback functions have the following signature: `void(NetworkLinkPtr)` + * @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, NetworkLinkPtr)) networkLinkCreatedCallbacks; +XBT_PUBLIC_DATA( surf_callback(void, Link*)) networkLinkCreatedCallbacks; /** @ingroup SURF_callbacks - * @brief Callbacks handler which emit the callbacks after NetworkLink destruction - * @details Callback functions have the following signature: `void(NetworkLinkPtr)` + * @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, NetworkLinkPtr)) networkLinkDestructedCallbacks; +XBT_PUBLIC_DATA( surf_callback(void, Link*)) networkLinkDestructedCallbacks; /** @ingroup SURF_callbacks - * @brief Callbacks handler which emit the callbacks after NetworkLink State changed - * @details Callback functions have the following signature: `void(NetworkLinkActionPtr action, e_surf_resource_state_t old, e_surf_resource_state_t current)` + * @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, NetworkLinkPtr, e_surf_resource_state_t, e_surf_resource_state_t)) networkLinkStateChangedCallbacks; +XBT_PUBLIC_DATA( surf_callback(void, Link*, e_surf_resource_state_t, e_surf_resource_state_t)) networkLinkStateChangedCallbacks; /** @ingroup SURF_callbacks - * @brief Callbacks handler which emit the callbacks after NetworkAction State changed - * @details Callback functions have the following signature: `void(NetworkActionPtr action, e_surf_action_state_t old, e_surf_action_state_t current)` + * @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, NetworkActionPtr, e_surf_action_state_t, e_surf_action_state_t)) networkActionStateChangedCallbacks; +XBT_PUBLIC_DATA( surf_callback(void, NetworkAction*, e_surf_action_state_t, e_surf_action_state_t)) networkActionStateChangedCallbacks; /** @ingroup SURF_callbacks - * @brief Callbacks handler which emit the callbacks after communication created - * @details Callback functions have the following signature: `void(NetworkActionPtr action, RoutingEdgePtr src, RoutingEdgePtr dst, double size, double rate)` + * @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, NetworkActionPtr, RoutingEdgePtr src, RoutingEdgePtr dst, double size, double rate)) networkCommunicateCallbacks; +XBT_PUBLIC_DATA( surf_callback(void, NetworkAction*, RoutingEdge *src, RoutingEdge *dst, double size, double rate)) networkCommunicateCallbacks; /********* * Tools * @@ -69,29 +67,17 @@ XBT_PUBLIC(void) net_add_traces(); *********/ /** @ingroup SURF_network_interface * @brief SURF network model interface class - * @details A model is an object which handle the interactions between its Resources and its Actions + * @details A model is an object which handles the interactions between its Resources and its Actions */ class NetworkModel : public Model { public: - /** - * @brief NetworkModel constructor - */ - NetworkModel() : Model("network") { - }; + /** @brief Constructor */ + NetworkModel() : Model("network") { } - /** - * @brief NetworkModel constructor - * - * @param name The name of the NetworkModel - */ - NetworkModel(const char *name) : Model(name) { - f_networkSolve = lmm_solve; - m_haveGap = false; - }; + /** @brief Constructor */ + NetworkModel(const char *name) : Model(name) { } - /** - * @brief The destructor of the NetworkModel - */ + /** @brief The destructor of the NetworkModel */ ~NetworkModel() { if (p_maxminSystem) lmm_system_free(p_maxminSystem); @@ -102,20 +88,20 @@ public: } /** - * @brief Create a NetworkLink + * @brief Create a Link * - * @param name The name of the NetworkLink - * @param bw_initial The initial bandwidth of the NetworkLink in bytes per second - * @param bw_trace The trace associated to the NetworkLink bandwidth [TODO] - * @param lat_initial The initial latency of the NetworkLink in seconds - * @param lat_trace The trace associated to the NetworkLink latency [TODO] - * @param state_initial The initial NetworkLink (state)[e_surf_resource_state_t] - * @param state_trace The trace associated to the NetworkLink (state)[e_surf_resource_state_t] [TODO] - * @param policy The sharing policy of the NetworkLink + * @param name The name of the Link + * @param bw_initial The initial bandwidth of the Link in bytes per second + * @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 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 - * @return The created NetworkLink + * @return The created Link */ - virtual NetworkLinkPtr createNetworkLink(const char *name, + virtual Link* createLink(const char *name, double bw_initial, tmgr_trace_t bw_trace, double lat_initial, @@ -125,57 +111,65 @@ public: e_surf_link_sharing_policy_t policy, xbt_dict_t properties)=0; - virtual void gapAppend(double /*size*/, const NetworkLinkPtr /*link*/, NetworkActionPtr /*action*/) {}; + virtual void gapAppend(double /*size*/, const Link* /*link*/, NetworkAction */*action*/) {}; /** - * @brief Create a communication between two [TODO] - * @details [TODO] + * @brief Create a communication between two hosts. + * @details It makes calls to the routing part, and execute the communication + * between the two end points. * - * @param src The source [TODO] - * @param dst The destination [TODO] + * @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 The + * @param rate Allows to limit the transfer rate. Negative value means + * unlimited. * @return The action representing the communication */ - virtual ActionPtr communicate(RoutingEdgePtr src, RoutingEdgePtr dst, + virtual Action *communicate(RoutingEdge *src, RoutingEdge *dst, double size, double rate)=0; - /** - * @brief Function pointer to the function to use to solve the lmm_system_t + /** @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); + void (*f_networkSolve)(lmm_system_t) = lmm_solve; /** - * @brief [brief description] - * @details [long description] + * @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. * - * @param size [description] - * @return [description] + * @param size The size of the message. + * @return The latency factor. */ virtual double latencyFactor(double size); /** - * @brief [brief description] - * @details [long description] + * @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. * - * @param size [description] - * @return [description] + * @param size The size of the message. + * @return The bandwidth factor. */ virtual double bandwidthFactor(double size); /** - * @brief [brief description] - * @details [long description] - * - * @param rate [description] - * @param bound [description] - * @param size [description] - * @return [description] + * @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. + * @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); - bool m_haveGap; + double shareResourcesFull(double now); + bool m_haveGap = false; }; /************ @@ -183,76 +177,57 @@ public: ************/ /** @ingroup SURF_network_interface * @brief SURF network link interface class - * @details A NetworkLink represent the link between two [Workstations](\ref Workstation) + * @details A Link represents the link between two [hosts](\ref Host) */ -class NetworkLink : public Resource { +class Link : public Resource { public: /** - * @brief NetworkLink constructor + * @brief Link constructor * - * @param model The CpuModel associated to this NetworkLink - * @param name The name of the NetworkLink - * @param props Dictionary of properties associated to this NetworkLink + * @param model The NetworkModel associated to this Link + * @param name The name of the Link + * @param props Dictionary of properties associated to this Link */ - NetworkLink(NetworkModelPtr model, const char *name, xbt_dict_t props); + Link(NetworkModel *model, const char *name, xbt_dict_t props); /** - * @brief NetworkLink constructor + * @brief Link constructor * - * @param model The CpuModel associated to this NetworkLink - * @param name The name of the NetworkLink - * @param props Dictionary of properties associated to this NetworkLink + * @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 * @param history [TODO] * @param state_trace [TODO] */ - NetworkLink(NetworkModelPtr model, const char *name, xbt_dict_t props, - lmm_constraint_t constraint, - tmgr_history_t history, - tmgr_trace_t state_trace); + Link(NetworkModel *model, const char *name, xbt_dict_t props, + lmm_constraint_t constraint, + tmgr_history_t history, + tmgr_trace_t state_trace); - /** - * @brief NetworkLink destructor - */ - ~NetworkLink(); + /** @brief Link destructor */ + ~Link(); - /** - * @brief Get the bandwidth in bytes per second of current NetworkLink - * - * @return The bandwith in bytes per second of the current NetworkLink - */ + /** @brief Get the bandwidth in bytes per second of current Link */ virtual double getBandwidth(); - /** - * @brief Update the bandwidth in bytes per second of current NetworkLink - */ + /** @brief Update the bandwidth in bytes per second of current Link */ virtual void updateBandwidth(double value, double date=surf_get_clock())=0; - /** - * @brief Get the latency in seconds of current NetworkLink - * - * @return The latency in seconds of the current NetworkLink - */ + /** @brief Get the latency in seconds of current Link */ virtual double getLatency(); - /** - * @brief Update the latency in seconds of current NetworkLink - */ + /** @brief Update the latency in seconds of current Link */ virtual void updateLatency(double value, double date=surf_get_clock())=0; /** - * @brief Check if the NetworkLink is shared - * @details [long description] + * @brief Check if the Link is shared * * @return true if the current NetwokrLink is shared, false otherwise */ virtual bool isShared(); - /** - * @brief Check if the NetworkLink is used - * - * @return true if the current NetwokrLink is used, false otherwise - */ + /** @brief Check if the Link is used */ bool isUsed(); void setState(e_surf_resource_state_t state); @@ -263,8 +238,24 @@ public: tmgr_trace_event_t p_latEvent; /* LMM */ - tmgr_trace_event_t p_stateEvent; + tmgr_trace_event_t p_stateEvent = NULL; s_surf_metric_t p_power; + + /* User data */ +public: + void *getData() { return userData;} + void setData(void *d) { userData=d;} +private: + void *userData = NULL; + + /* List of all links */ +private: + static boost::unordered_map *links; +public: + static Link *byName(const char* name); + static int linksAmount(); + static Link **linksList(); + static void linksExit(); }; /********** @@ -272,7 +263,7 @@ public: **********/ /** @ingroup SURF_network_interface * @brief SURF network action interface class - * @details A NetworkAction represent a communication bettween two [Workstations](\ref Workstation) + * @details A NetworkAction represents a communication between two [hosts](\ref Host) */ class NetworkAction : public Action { public: @@ -283,7 +274,7 @@ public: * @param cost The cost of this NetworkAction in [TODO] * @param failed [description] */ - NetworkAction(ModelPtr model, double cost, bool failed) + NetworkAction(Model *model, double cost, bool failed) : Action(model, cost, failed) {} /** @@ -292,9 +283,10 @@ public: * @param model The NetworkModel associated to this NetworkAction * @param cost The cost of this NetworkAction in [TODO] * @param failed [description] - * @param var The lmm variable associated to this Action if it is part of a LMM component + * @param var The lmm variable associated to this Action if it is part of a + * LMM component */ - NetworkAction(ModelPtr model, double cost, bool failed, lmm_variable_t var) + NetworkAction(Model *model, double cost, bool failed, lmm_variable_t var) : Action(model, cost, failed, var) {}; void setState(e_surf_action_state_t state);