X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/029f4e3fda0aaddabf8312586a1a6d73643967fc..8d777265e12b0b9c5f13fecfc719474cdd214e9e:/src/surf/network_interface.hpp diff --git a/src/surf/network_interface.hpp b/src/surf/network_interface.hpp index 5b9f960a37..5e26f23832 100644 --- a/src/surf/network_interface.hpp +++ b/src/surf/network_interface.hpp @@ -185,12 +185,12 @@ 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 fes Future Event Set in which our events must be registered * @param state_trace [TODO] */ Link(simgrid::surf::NetworkModel *model, const char *name, xbt_dict_t props, lmm_constraint_t constraint, - tmgr_history_t history, + sg_future_evt_set_t fes, tmgr_trace_t state_trace); /* Link destruction logic */ @@ -228,7 +228,7 @@ public: /** @brief Update the latency in seconds of current Link */ virtual void updateLatency(double value, double date=surf_get_clock())=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 */ @@ -240,10 +240,10 @@ public: /* Using this object with the public part of model does not make sense */ double m_latCurrent = 0; - tmgr_trace_event_t p_latEvent = NULL; + tmgr_trace_iterator_t p_latEvent = NULL; /* LMM */ - tmgr_trace_event_t p_stateEvent = NULL; + tmgr_trace_iterator_t p_stateEvent = NULL; s_surf_metric_t p_speed; /* User data */