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

[simgrid.git] / src / surf / network_interface.cpp

diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp
index 4376384..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*, 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;
@@ -201,13 +201,13 @@ Link::Link(simgrid::surf::NetworkModel *model, const char *name, xbt_dict_t prop
 
 Link::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)
 : Resource(model, name, constraint),
   PropertyHolder(props)
 {
   if (state_trace)
-    p_stateEvent = tmgr_history_add_trace(history, state_trace, 0.0, 0, this);
+    p_stateEvent = fes->add_trace(state_trace, 0.0, this);
 
   links->insert({name, this});
   XBT_DEBUG("Create link '%s'",name);
@@ -254,13 +254,13 @@ int Link::sharingPolicy()
 void Link::turnOn(){
   if (isOff()) {
     Resource::turnOn();
-    onStateChange(this, 0, 1);
+    onStateChange(this);
   }
 }
 void Link::turnOff(){
   if (isOn()) {
     Resource::turnOff();
-    onStateChange(this, 1, 0);
+    onStateChange(this);
   }
 }