X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cdb1be49a934b298f1c83cbecf0525b33625e9c4..f2907d4c4e2bfdd55ae8a7c41711b731d106f668:/src/surf/network_interface.hpp diff --git a/src/surf/network_interface.hpp b/src/surf/network_interface.hpp index 159a650864..59c93ccc0e 100644 --- a/src/surf/network_interface.hpp +++ b/src/surf/network_interface.hpp @@ -1,126 +1,55 @@ -/* Copyright (c) 2004-2014. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2004-2017. The SimGrid Team. All rights reserved. */ /* 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 "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_ +#include "simgrid/s4u/Link.hpp" +#include "src/surf/PropertyHolder.hpp" +#include "src/surf/surf_interface.hpp" +#include "xbt/base.h" +#include +#include + /*********** * Classes * ***********/ -class NetworkModel; -typedef NetworkModel *NetworkModelPtr; - -class NetworkAction; -typedef NetworkAction *NetworkActionPtr; - -/************* - * Callbacks * - *************/ - -/** @ingroup SURF_callbacks - * @brief Callbacks handler which emits the callbacks after Link creation - * @details Callback functions have the following signature: `void(LinkPtr)` - */ -XBT_PUBLIC_DATA( surf_callback(void, LinkPtr)) networkLinkCreatedCallbacks; - -/** @ingroup SURF_callbacks - * @brief Callbacks handler which emits the callbacks after Link destruction - * @details Callback functions have the following signature: `void(LinkPtr)` - */ -XBT_PUBLIC_DATA( surf_callback(void, LinkPtr)) networkLinkDestructedCallbacks; - -/** @ingroup SURF_callbacks - * @brief Callbacks handler which emits the callbacks after Link State changed - * @details Callback functions have the following signature: `void(LinkActionPtr action, e_surf_resource_state_t old, e_surf_resource_state_t current)` - */ -XBT_PUBLIC_DATA( surf_callback(void, LinkPtr, 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(NetworkActionPtr 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; - -/** @ingroup SURF_callbacks - * @brief Callbacks handler which emits the callbacks after communication created - * @details Callback functions have the following signature: `void(NetworkActionPtr action, RoutingEdgePtr src, RoutingEdgePtr dst, double size, double rate)` - */ -XBT_PUBLIC_DATA( surf_callback(void, NetworkActionPtr, RoutingEdgePtr src, RoutingEdgePtr dst, double size, double rate)) networkCommunicateCallbacks; - -/********* - * Tools * - *********/ -XBT_PUBLIC(void) netlink_parse_init(sg_platf_link_cbarg_t link); - -XBT_PUBLIC(void) net_add_traces(); +namespace simgrid { +namespace surf { /********* * Model * *********/ + /** @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 */ class NetworkModel : public Model { public: - /** @brief NetworkModel constructor */ - NetworkModel() : Model("network") { - f_networkSolve = lmm_solve; - }; - - /** @brief NetworkModel constructor */ - NetworkModel(const char *name) : Model(name) { - f_networkSolve = lmm_solve; - }; - - /** @brief The destructor of the NetworkModel */ - ~NetworkModel() { - if (p_maxminSystem) - lmm_system_free(p_maxminSystem); - if (p_actionHeap) - xbt_heap_free(p_actionHeap); - if (p_modifiedSet) - delete p_modifiedSet; - } + /** @brief Constructor */ + NetworkModel() : Model() {} + + /** @brief Destructor */ + ~NetworkModel() override; /** * @brief Create a Link * * @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 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 */ - virtual LinkPtr createLink(const char *name, - double bw_initial, - tmgr_trace_t bw_trace, - double lat_initial, - tmgr_trace_t lat_trace, - e_surf_resource_state_t state_initial, - tmgr_trace_t state_trace, - e_surf_link_sharing_policy_t policy, - xbt_dict_t properties)=0; - - virtual void gapAppend(double /*size*/, const LinkPtr /*link*/, NetworkActionPtr /*action*/) {}; + virtual LinkImpl* createLink(const char* name, double bandwidth, double latency, + e_surf_link_sharing_policy_t policy) = 0; /** * @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 @@ -129,15 +58,13 @@ public: * unlimited. * @return The action representing the communication */ - virtual ActionPtr communicate(RoutingEdgePtr src, RoutingEdgePtr 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 + /** @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 Get the right multiplicative factor for the latency. @@ -173,78 +100,81 @@ public: * @return The new bandwidth. */ virtual double bandwidthConstraint(double rate, double bound, double size); - double shareResourcesFull(double now); - bool m_haveGap = false; + double nextOccuringEventFull(double now) override; + + LinkImpl* loopback_ = nullptr; }; /************ * Resource * ************/ - /** @ingroup SURF_network_interface - * @brief SURF network link interface class - * @details A Link represents the link between two [hosts](\ref Host) - */ -class Link : public Resource { -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(NetworkModelPtr model, const char *name, xbt_dict_t props); +/** @ingroup SURF_network_interface + * @brief SURF network link interface class + * @details A Link represents the link between two [hosts](\ref simgrid::surf::HostImpl) + */ +class LinkImpl : public simgrid::surf::Resource, public simgrid::surf::PropertyHolder { +protected: + LinkImpl(simgrid::surf::NetworkModel* model, const char* name, lmm_constraint_t constraint); + ~LinkImpl() override; - /** - * @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 - * @param history [TODO] - * @param state_trace [TODO] - */ - Link(NetworkModelPtr model, const char *name, xbt_dict_t props, - lmm_constraint_t constraint, - tmgr_history_t history, - tmgr_trace_t state_trace); +public: + void destroy(); // Must be called instead of the destructor +private: + bool currentlyDestroying_ = false; - /** @brief Link destructor */ - ~Link(); +public: + /** @brief Public interface */ + s4u::Link piface_; /** @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, double date=surf_get_clock())=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, double date=surf_get_clock())=0; + virtual void setLatency(double value) = 0; - /** - * @brief Check if the Link is shared - * - * @return true if the current NetwokrLink is shared, false otherwise - */ - virtual bool isShared(); + /** @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 turnOn() override; + void turnOff() override; - void setState(e_surf_resource_state_t state); + virtual void setStateTrace(tmgr_trace_t trace); /*< setup the trace file with states events (ON or OFF). + Trace must contain boolean values. */ + 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 */ - /* Using this object with the public part of - model does not make sense */ - double m_latCurrent; - tmgr_trace_event_t p_latEvent; + tmgr_trace_event_t stateEvent_ = nullptr; + s_surf_metric_t latency_ = {1.0, 0, nullptr}; + s_surf_metric_t bandwidth_ = {1.0, 0, nullptr}; - /* LMM */ - tmgr_trace_event_t p_stateEvent; - s_surf_metric_t p_power; + /* User data */ + void* getData() { return userData; } + void setData(void* d) { userData = d; } +private: + void* userData = nullptr; + + /* List of all links. FIXME: should move to the Engine */ + static std::unordered_map* links; + +public: + static LinkImpl* byName(const char* name); + static int linksCount(); + static LinkImpl** linksList(); + static void linksExit(); }; /********** @@ -252,19 +182,17 @@ public: **********/ /** @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 Action { +class NetworkAction : public simgrid::surf::Action { public: - /** - * @brief NetworkAction constructor + /** @brief Constructor * * @param model The NetworkModel associated to this NetworkAction * @param cost The cost of this NetworkAction in [TODO] * @param failed [description] */ - NetworkAction(ModelPtr model, double cost, bool failed) - : Action(model, cost, failed) {} + NetworkAction(simgrid::surf::Model* model, double cost, bool failed) : simgrid::surf::Action(model, cost, failed) {} /** * @brief NetworkAction constructor @@ -272,36 +200,21 @@ 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) - : Action(model, cost, failed, var) {}; - - void setState(e_surf_action_state_t state); + NetworkAction(simgrid::surf::Model* model, double cost, bool failed, lmm_variable_t var) + : simgrid::surf::Action(model, cost, failed, var){}; -#ifdef HAVE_LATENCY_BOUND_TRACKING - /** - * @brief Check if the action is limited by latency. - * - * @return 1 if action is limited by latency, 0 otherwise - */ - virtual int getLatencyLimited() {return m_latencyLimited;} -#endif - - double m_latency; - double m_latCurrent; - double m_weight; - double m_rate; - const char* p_senderLinkName; - double m_senderGap; - double m_senderSize; - xbt_fifo_item_t p_senderFifoItem; -#ifdef HAVE_LATENCY_BOUND_TRACKING - int m_latencyLimited; -#endif + void setState(simgrid::surf::Action::State state) override; + virtual std::list links(); + double latency_; + double latCurrent_; + double weight_; + double rate_; }; +} +} #endif /* SURF_NETWORK_INTERFACE_HPP_ */