Kill a no-op.

[simgrid.git] / src / plugins / link_energy_wifi.cpp

diff --git a/src/plugins/link_energy_wifi.cpp b/src/plugins/link_energy_wifi.cpp
index 13a8f49..fa10e24 100644 (file)
--- a/src/plugins/link_energy_wifi.cpp
+++ b/src/plugins/link_energy_wifi.cpp
@@ -152,13 +152,9 @@ void LinkEnergyWifi::update(const simgrid::kernel::resource::NetworkAction&)
   while((var = wifi_link->get_constraint()->get_variable(&elem))) {
     auto* action = static_cast<kernel::resource::NetworkWifiAction*>(var->get_id());
     XBT_DEBUG("cost: %f action value: %f link rate 1: %f link rate 2: %f", action->get_cost(), action->get_variable()->get_value(), wifi_link->get_host_rate(&action->get_src()),wifi_link->get_host_rate(&action->get_dst()));
-    action->get_variable();
-
-    double du = 0; // durUsage on the current flow
-    std::map<simgrid::kernel::resource::NetworkWifiAction *, std::pair<int, double>>::iterator it;
 
     if(action->get_variable()->get_value()) {
-      it = flowTmp.find(action);
+      auto it = flowTmp.find(action);
 
       // if the flow has not been registered, initialize it: 0 bytes sent, and not updated since its creation timestamp
       if(it == flowTmp.end())
@@ -170,7 +166,8 @@ void LinkEnergyWifi::update(const simgrid::kernel::resource::NetworkAction&)
        * The active duration of the link is equal to the amount of data it had to send divided by the bandwidth on the link.
        * If this is longer than the duration since the previous update, active duration = now - previous_update
        */
-      du = (action->get_cost()-it->second.first) / action->get_variable()->get_value();
+      double du = // durUsage on the current flow
+          (action->get_cost() - it->second.first) / action->get_variable()->get_value();
 
       if(du > surf_get_clock()-it->second.second)
         du = surf_get_clock()-it->second.second;
@@ -299,7 +296,7 @@ void sg_wifi_energy_plugin_init()
     // verify the link is appropriate to WiFi energy computations
     if (link.get_sharing_policy() == simgrid::s4u::Link::SharingPolicy::WIFI) {
       XBT_DEBUG("Wifi Link: %s, initialization of wifi energy plugin", link.get_cname());
-      LinkEnergyWifi* plugin = new LinkEnergyWifi(&link);
+      auto* plugin = new LinkEnergyWifi(&link);
       link.extension_set(plugin);
     } else {
       XBT_DEBUG("Not Wifi Link: %s, wifi energy on link not computed", link.get_cname());
@@ -330,7 +327,7 @@ void sg_wifi_energy_plugin_init()
       });
 
   simgrid::s4u::Link::on_communicate.connect([](const simgrid::kernel::resource::NetworkAction& action) {
-    const simgrid::kernel::resource::NetworkWifiAction* actionWifi = dynamic_cast<const simgrid::kernel::resource::NetworkWifiAction*>(&action);
+    auto const* actionWifi = dynamic_cast<const simgrid::kernel::resource::NetworkWifiAction*>(&action);
 
     if (actionWifi == nullptr)
       return;