X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3516ecc808bba20973c58b49c33dded30960613a..fb75e2d8200e8fed10ed4436462fb73038a233ee:/src/surf/network_interface.hpp

diff --git a/src/surf/network_interface.hpp b/src/surf/network_interface.hpp
index b532f72be4..188539fd66 100644
--- a/src/surf/network_interface.hpp
+++ b/src/surf/network_interface.hpp
@@ -7,6 +7,8 @@
 #include "surf_interface.hpp"
 #include "surf_routing.hpp"
 
+#include "simgrid/link.h"
+
 #ifndef SURF_NETWORK_INTERFACE_HPP_
 #define SURF_NETWORK_INTERFACE_HPP_
 
@@ -16,9 +18,6 @@
 class NetworkModel;
 typedef NetworkModel *NetworkModelPtr;
 
-class NetworkLink;
-typedef NetworkLink *NetworkLinkPtr;
-
 class NetworkAction;
 typedef NetworkAction *NetworkActionPtr;
 
@@ -27,22 +26,22 @@ typedef NetworkAction *NetworkActionPtr;
  *************/
 
 /** @ingroup SURF_callbacks
- * @brief Callbacks handler which emits 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 emits 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 emits 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(LinkActionPtr 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 emits the callbacks after NetworkAction State changed
@@ -72,26 +71,17 @@ XBT_PUBLIC(void) net_add_traces();
  */
 class NetworkModel : public Model {
 public:
-  /**
-   * @brief NetworkModel constructor
-   */
+  /** @brief NetworkModel constructor */
   NetworkModel() : Model("network") {
     f_networkSolve = lmm_solve;
   };
 
-  /**
-   * @brief NetworkModel constructor
-   *
-   * @param name The name of the NetworkModel
-   */
+  /** @brief NetworkModel constructor */
   NetworkModel(const char *name) : Model(name) {
 	f_networkSolve = lmm_solve;
-	m_haveGap = false;
   };
 
-  /**
-   * @brief The destructor of the NetworkModel
-   */
+  /** @brief The destructor of the NetworkModel */
   ~NetworkModel() {
 	if (p_maxminSystem)
 	  lmm_system_free(p_maxminSystem);
@@ -102,20 +92,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
-   * @param lat_initial The initial latency of the NetworkLink in seconds
-   * @param lat_trace The trace associated to the NetworkLink latency
-   * @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]
-   * @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,10 +115,10 @@ 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*/, NetworkActionPtr /*action*/) {};
 
   /**
-   * @brief Create a communication between two workstations.
+   * @brief Create a communication between two hosts.
    * @details It makes calls to the routing part, and execute the communication
    * between the two end points.
    *
@@ -184,7 +174,7 @@ public:
    */
   virtual double bandwidthConstraint(double rate, double bound, double size);
   double shareResourcesFull(double now);
-  bool m_haveGap;
+  bool m_haveGap = false;
 };
 
 /************
@@ -192,75 +182,57 @@ public:
  ************/
  /** @ingroup SURF_network_interface
   * @brief SURF network link interface class
-  * @details A NetworkLink represents 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 NetworkModel 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(NetworkModelPtr model, const char *name, xbt_dict_t props);
 
   /**
-   * @brief NetworkLink constructor
+   * @brief Link constructor
    *
-   * @param model The NetworkModel 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,
+  Link(NetworkModelPtr 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
+   * @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);
@@ -273,6 +245,12 @@ public:
   /* 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;
 };
 
 /**********
@@ -280,8 +258,7 @@ public:
  **********/
 /** @ingroup SURF_network_interface
  * @brief SURF network action interface class
- * @details A NetworkAction represents a communication between two
- * [Workstations](\ref Workstation)
+ * @details A NetworkAction represents a communication between two [hosts](\ref Host)
  */
 class NetworkAction : public Action {
 public: