Simplifies the prototype of the surf::Link::onStateChange signal

diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp
index 0996ae3..14cde62 100644 (file)
--- a/src/surf/network_interface.cpp
+++ b/src/surf/network_interface.cpp
@@ -97,7 +97,7 @@ void Link::linksExit() {
 
 simgrid::xbt::signal<void(simgrid::surf::Link*)> Link::onCreation;
 simgrid::xbt::signal<void(simgrid::surf::Link*)> Link::onDestruction;
 
 simgrid::xbt::signal<void(simgrid::surf::Link*)> Link::onCreation;
 simgrid::xbt::signal<void(simgrid::surf::Link*)> Link::onDestruction;

-simgrid::xbt::signal<void(simgrid::surf::Link*, int, int)> Link::onStateChange; // signature: wasOn, currentlyOn
+simgrid::xbt::signal<void(simgrid::surf::Link*)> Link::onStateChange;

 
 simgrid::xbt::signal<void(simgrid::surf::NetworkAction*, e_surf_action_state_t, e_surf_action_state_t)> networkActionStateChangedCallbacks;
 simgrid::xbt::signal<void(simgrid::surf::NetworkAction*, simgrid::surf::NetCard *src, simgrid::surf::NetCard *dst, double size, double rate)> networkCommunicateCallbacks;
 
 simgrid::xbt::signal<void(simgrid::surf::NetworkAction*, e_surf_action_state_t, e_surf_action_state_t)> networkActionStateChangedCallbacks;
 simgrid::xbt::signal<void(simgrid::surf::NetworkAction*, simgrid::surf::NetCard *src, simgrid::surf::NetCard *dst, double size, double rate)> networkCommunicateCallbacks;


@@ -254,13 +254,13 @@ int Link::sharingPolicy()
 void Link::turnOn(){
   if (isOff()) {
     Resource::turnOn();
 void Link::turnOn(){
   if (isOff()) {
     Resource::turnOn();

-    onStateChange(this, 0, 1);
+    onStateChange(this);

   }
 }
 void Link::turnOff(){
   if (isOn()) {
     Resource::turnOff();
   }
 }
 void Link::turnOff(){
   if (isOn()) {
     Resource::turnOff();

-    onStateChange(this, 1, 0);
+    onStateChange(this);

   }
 }
 
   }
 }
 

diff --git a/src/surf/network_interface.hpp b/src/surf/network_interface.hpp
index 5e26f23..0ead107 100644 (file)
--- a/src/surf/network_interface.hpp
+++ b/src/surf/network_interface.hpp
@@ -211,9 +211,9 @@ public:
    *  Signature: void(Link*) */
   static simgrid::xbt::signal<void(simgrid::surf::Link*)> onDestruction;
 
    *  Signature: void(Link*) */
   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::xbt::signal<void(simgrid::surf::Link*, int, int)> onStateChange;
+  /** @brief Callback signal fired when the state of a Link changes (when it is turned on or off)
+   *  Signature: `void(Link*)` */
+  static simgrid::xbt::signal<void(simgrid::surf::Link*)> onStateChange;

 
 
   /** @brief Get the bandwidth in bytes per second of current Link */
 
 
   /** @brief Get the bandwidth in bytes per second of current Link */