X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/79f2c630c9587d494cb154e6d074294c1e23208e..1046c9806a7cdd50272c2dafe8ec13f48bd58b92:/src/surf/network_interface.hpp

diff --git a/src/surf/network_interface.hpp b/src/surf/network_interface.hpp
index cf080ee9d0..93442c15bb 100644
--- a/src/surf/network_interface.hpp
+++ b/src/surf/network_interface.hpp
@@ -36,11 +36,11 @@ class NetworkAction;
 
 /** @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::surf::signal<void(simgrid::surf::NetworkAction*, e_surf_action_state_t, e_surf_action_state_t)>) networkActionStateChangedCallbacks;
+XBT_PUBLIC_DATA(simgrid::xbt::signal<void(simgrid::surf::NetworkAction*, e_surf_action_state_t, e_surf_action_state_t)>) networkActionStateChangedCallbacks;
 
 /** @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::surf::signal<void(simgrid::surf::NetworkAction*, simgrid::surf::NetCard *src, simgrid::surf::NetCard *dst, double size, double rate)>) networkCommunicateCallbacks;
+XBT_PUBLIC_DATA(simgrid::xbt::signal<void(simgrid::surf::NetworkAction*, simgrid::surf::NetCard *src, simgrid::surf::NetCard *dst, double size, double rate)>) networkCommunicateCallbacks;
 
 }
 }
@@ -50,8 +50,6 @@ XBT_PUBLIC_DATA(simgrid::surf::signal<void(simgrid::surf::NetworkAction*, simgri
  *********/
 XBT_PUBLIC(void) netlink_parse_init(sg_platf_link_cbarg_t link);
 
-XBT_PUBLIC(void) net_add_traces();
-
 /*********
  * Model *
  *********/
@@ -207,15 +205,15 @@ private:
 public:
   /** @brief Callback signal fired when a new Link is created.
    *  Signature: void(Link*) */
-  static simgrid::surf::signal<void(simgrid::surf::Link*)> onCreation;
+  static simgrid::xbt::signal<void(simgrid::surf::Link*)> onCreation;
 
   /** @brief Callback signal fired when a Link is destroyed.
    *  Signature: void(Link*) */
-  static simgrid::surf::signal<void(simgrid::surf::Link*)> onDestruction;
+  static simgrid::xbt::signal<void(simgrid::surf::Link*)> onDestruction;
 
   /** @brief Callback signal fired when the state of a Link changes
    *  Signature: `void(LinkAction *action, int previouslyOn, int currentlyOn)` */
-  static simgrid::surf::signal<void(simgrid::surf::Link*, int, int)> onStateChange;
+  static simgrid::xbt::signal<void(simgrid::surf::Link*, int, int)> onStateChange;
 
 
   /** @brief Get the bandwidth in bytes per second of current Link */
@@ -234,7 +232,7 @@ public:
   virtual int sharingPolicy();
 
   /** @brief Check if the Link is used */
-  bool isUsed();
+  bool isUsed() override;
 
   void turnOn() override;
   void turnOff() override;
@@ -260,7 +258,7 @@ private:
   static boost::unordered_map<std::string, Link *> *links;
 public:
   static Link *byName(const char* name);
-  static int linksAmount();
+  static int linksCount();
   static Link **linksList();
   static void linksExit();
 };