UPPER_CASE the Action::State values (+ uniformity with s4u::Activity)

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

diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp
index 2ccae96..d462377 100644 (file)
--- a/src/surf/network_interface.cpp
+++ b/src/surf/network_interface.cpp
@@ -5,7 +5,6 @@
 
 #include "network_interface.hpp"
 #include "simgrid/sg_config.hpp"
-#include "src/instr/instr_private.hpp" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals
 #include "src/surf/surf_interface.hpp"
 #include "surf/surf.hpp"
 
@@ -103,7 +102,7 @@ double NetworkModel::next_occuring_event_full(double now)
 {
   double minRes = Model::next_occuring_event_full(now);
 
-  for (Action const& action : *get_running_action_set()) {
+  for (Action const& action : *get_started_action_set()) {
     const NetworkAction& net_action = static_cast<const NetworkAction&>(action);
     if (net_action.latency_ > 0)
       minRes = (minRes < 0) ? net_action.latency_ : std::min(minRes, net_action.latency_);
@@ -145,7 +144,7 @@ void LinkImpl::destroy()
 {
   if (not currentlyDestroying_) {
     currentlyDestroying_ = true;
-    s4u::Link::onDestruction(this->piface_);
+    s4u::Link::on_destruction(this->piface_);
     delete this;
   }
 }
@@ -174,23 +173,20 @@ void LinkImpl::turn_on()
 {
   if (is_off()) {
     Resource::turn_on();
-    s4u::Link::onStateChange(this->piface_);
+    s4u::Link::on_state_change(this->piface_);
   }
 }
+
 void LinkImpl::turn_off()
 {
   if (is_on()) {
     Resource::turn_off();
-    s4u::Link::onStateChange(this->piface_);
+    s4u::Link::on_state_change(this->piface_);
   }
 }
 
 void LinkImpl::on_bandwidth_change()
 {
-  if (TRACE_categorized() || TRACE_uncategorized() || TRACE_platform())
-    instr::Container::by_name(get_cname())
-        ->get_variable("bandwidth")
-        ->set_event(surf_get_clock(), sg_bandwidth_factor * bandwidth_.scale * bandwidth_.peak);
   s4u::Link::on_bandwidth_change(this->piface_);
 }
 
@@ -216,8 +212,10 @@ void LinkImpl::setLatencyTrace(tmgr_trace_t trace)
 
 void NetworkAction::set_state(Action::State state)
 {
+  Action::State previous = get_state();
   Action::set_state(state);
-  s4u::Link::onCommunicationStateChange(this);
+  if (previous != state) // Trigger only if the state changed
+    s4u::Link::on_communication_state_change(this);
 }
 
 /** @brief returns a list of all Links that this action is using */