Comment unused function parameters.

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

diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp
index 2e3bc1e..4960b2a 100644 (file)
--- a/src/surf/network_interface.cpp
+++ b/src/surf/network_interface.cpp
@@ -4,8 +4,8 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "network_interface.hpp"
+#include "simgrid/s4u/Engine.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"
 
@@ -14,52 +14,6 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network, surf, "Logging specific to the SURF network module");
 
-namespace simgrid {
-namespace kernel {
-namespace resource {
-
-/* List of links */
-std::unordered_map<std::string, LinkImpl*>* LinkImpl::links = new std::unordered_map<std::string, LinkImpl*>();
-
-LinkImpl* LinkImpl::byName(std::string name)
-{
-  auto link = links->find(name);
-  return link == links->end() ? nullptr : link->second;
-}
-/** @brief Returns the amount of links in the platform */
-int LinkImpl::linksCount()
-{
-  return links->size();
-}
-void LinkImpl::linksList(std::vector<s4u::Link*>* linkList)
-{
-  for (auto const& kv : *links) {
-    linkList->push_back(&kv.second->piface_);
-  }
-}
-
-/** @brief Returns a list of all existing links */
-LinkImpl** LinkImpl::linksList()
-{
-  LinkImpl** res = xbt_new(LinkImpl*, (int)links->size());
-  int i          = 0;
-  for (auto const& kv : *links) {
-    res[i] = kv.second;
-    i++;
-  }
-  return res;
-}
-/** @brief destructor of the static data */
-void LinkImpl::linksExit()
-{
-  for (auto const& kv : *links)
-    (kv.second)->destroy();
-  delete links;
-}
-}
-}
-} // namespace simgrid
-
 /*********
  * Model *
  *********/
@@ -103,7 +57,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_);
@@ -123,12 +77,12 @@ LinkImpl::LinkImpl(NetworkModel* model, const std::string& name, lmm::Constraint
 {
 
   if (name != "__loopback__")
-    xbt_assert(not LinkImpl::byName(name), "Link '%s' declared several times in the platform.", name.c_str());
+    xbt_assert(not s4u::Link::by_name_or_null(name), "Link '%s' declared several times in the platform.", name.c_str());
 
   latency_.scale   = 1;
   bandwidth_.scale = 1;
 
-  links->insert({name, this});
+  s4u::Engine::get_instance()->link_register(name, &piface_);
   XBT_DEBUG("Create link '%s'", name.c_str());
 }
 
@@ -145,7 +99,7 @@ void LinkImpl::destroy()
 {
   if (not currentlyDestroying_) {
     currentlyDestroying_ = true;
-    s4u::Link::onDestruction(this->piface_);
+    s4u::Link::on_destruction(this->piface_);
     delete this;
   }
 }
@@ -155,17 +109,17 @@ bool LinkImpl::is_used()
   return get_model()->get_maxmin_system()->constraint_used(get_constraint());
 }
 
-double LinkImpl::latency()
+double LinkImpl::get_latency()
 {
   return latency_.peak * latency_.scale;
 }
 
-double LinkImpl::bandwidth()
+double LinkImpl::get_bandwidth()
 {
   return bandwidth_.peak * bandwidth_.scale;
 }
 
-s4u::Link::SharingPolicy LinkImpl::sharingPolicy()
+s4u::Link::SharingPolicy LinkImpl::get_sharing_policy()
 {
   return get_constraint()->get_sharing_policy();
 }
@@ -174,37 +128,30 @@ 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::byName(get_cname())
-        ->getVariable("bandwidth")
-        ->setEvent(surf_get_clock(), sg_bandwidth_factor * bandwidth_.scale * bandwidth_.peak);
   s4u::Link::on_bandwidth_change(this->piface_);
 }
 
-void LinkImpl::setStateTrace(tmgr_trace_t trace)
-{
-  xbt_assert(stateEvent_ == nullptr, "Cannot set a second state trace to Link %s", get_cname());
-  stateEvent_ = future_evt_set->add_trace(trace, this);
-}
-void LinkImpl::setBandwidthTrace(tmgr_trace_t trace)
+void LinkImpl::set_bandwidth_trace(tmgr_trace_t trace)
 {
   xbt_assert(bandwidth_.event == nullptr, "Cannot set a second bandwidth trace to Link %s", get_cname());
   bandwidth_.event = future_evt_set->add_trace(trace, this);
 }
-void LinkImpl::setLatencyTrace(tmgr_trace_t trace)
+
+void LinkImpl::set_latency_trace(tmgr_trace_t trace)
 {
   xbt_assert(latency_.event == nullptr, "Cannot set a second latency trace to Link %s", get_cname());
   latency_.event = future_evt_set->add_trace(trace, this);
@@ -216,8 +163,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 */