TESH: msg to s4u - act 1

[simgrid.git] / include / simgrid / s4u / Link.hpp

diff --git a/include/simgrid/s4u/Link.hpp b/include/simgrid/s4u/Link.hpp
index af44cb4..de05738 100644 (file)
--- a/include/simgrid/s4u/Link.hpp
+++ b/include/simgrid/s4u/Link.hpp
@@ -6,14 +6,12 @@
 #ifndef S4U_LINK_HPP_
 #define S4U_LINK_HPP_
 
+#include <simgrid/link.h>
 #include <xbt/base.h>
+#include <xbt/signal.hpp>
 
 #include <unordered_map>
 
-#include "xbt/signal.hpp"
-
-#include "simgrid/link.h"
-
 /***********
  * Classes *
  ***********/
@@ -21,14 +19,13 @@
 namespace simgrid {
 namespace surf {
 class NetworkAction;
-class Action;
 };
 namespace s4u {
 /** @brief A Link represents the network facilities between [hosts](\ref simgrid::s4u::Host) */
-class Link {
+XBT_PUBLIC_CLASS Link
+{
   friend simgrid::surf::LinkImpl;
 
-private:
   // Links are created from the NetZone, and destroyed by their private implementation when the simulation ends
   explicit Link(surf::LinkImpl* pimpl) : pimpl_(pimpl) {}
   virtual ~Link() = default;
@@ -70,13 +67,13 @@ public:
 
   /* The signals */
   /** @brief Callback signal fired when a new Link is created */
-  static simgrid::xbt::signal<void(surf::LinkImpl*)> onCreation;
+  static simgrid::xbt::signal<void(s4u::Link&)> onCreation;
 
   /** @brief Callback signal fired when a Link is destroyed */
-  static simgrid::xbt::signal<void(surf::LinkImpl*)> onDestruction;
+  static simgrid::xbt::signal<void(s4u::Link&)> onDestruction;
 
   /** @brief Callback signal fired when the state of a Link changes (when it is turned on or off) */
-  static simgrid::xbt::signal<void(surf::LinkImpl*)> onStateChange;
+  static simgrid::xbt::signal<void(s4u::Link&)> onStateChange;
 
   /** @brief Callback signal fired when a communication starts */
   static simgrid::xbt::signal<void(surf::NetworkAction*, s4u::Host* src, s4u::Host* dst)> onCommunicate;