X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9f9d7f60491f8e51576aac7aca58d5cb9818b085..4b0fa756ae6e58a74c374a519389ecb9e8b6a4d9:/src/plugins/link_energy_wifi.cpp

diff --git a/src/plugins/link_energy_wifi.cpp b/src/plugins/link_energy_wifi.cpp
index a422f978cb..b924517949 100644
--- a/src/plugins/link_energy_wifi.cpp
+++ b/src/plugins/link_energy_wifi.cpp
@@ -59,12 +59,12 @@ public:
    */
   void init_watts_range_list();
 
-  double get_consumed_energy(void) { return eDyn_ + eStat_; }
+  double get_consumed_energy(void) const { return eDyn_ + eStat_; }
   /** Get the dynamic part of the energy for this link */
-  double get_energy_dynamic(void) { return eDyn_; }
-  double get_energy_static(void) { return eStat_; }
-  double get_duration_comm(void) { return dur_TxRx_; }
-  double get_duration_idle(void) { return dur_idle_; }
+  double get_energy_dynamic(void) const { return eDyn_; }
+  double get_energy_static(void) const { return eStat_; }
+  double get_duration_comm(void) const { return dur_TxRx_; }
+  double get_duration_idle(void) const { return dur_idle_; }
 
   /** Set the power consumed by this link while idle */
   void set_power_idle(double value) { pIdle_ = value; }
@@ -110,8 +110,7 @@ xbt::Extension<s4u::Link, LinkEnergyWifi> LinkEnergyWifi::EXTENSION_ID;
 
 void LinkEnergyWifi::update_destroy()
 {
-  simgrid::kernel::resource::NetworkWifiLink* wifi_link =
-    static_cast<simgrid::kernel::resource::NetworkWifiLink*>(link_->get_impl());
+  auto const* wifi_link = static_cast<simgrid::kernel::resource::NetworkWifiLink*>(link_->get_impl());
   double duration = surf_get_clock() - prev_update_;
   prev_update_    = surf_get_clock();
 
@@ -135,8 +134,7 @@ void LinkEnergyWifi::update(const simgrid::kernel::resource::NetworkAction&)
   if(duration < 1e-6)
     return;
 
-  simgrid::kernel::resource::NetworkWifiLink* wifi_link =
-      static_cast<simgrid::kernel::resource::NetworkWifiLink*>(link_->get_impl());
+  auto const* wifi_link = static_cast<simgrid::kernel::resource::NetworkWifiLink*>(link_->get_impl());
 
   const kernel::lmm::Variable* var;
   const kernel::lmm::Element* elem = nullptr;
@@ -156,11 +154,8 @@ void LinkEnergyWifi::update(const simgrid::kernel::resource::NetworkAction&)
     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())
@@ -172,7 +167,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;
@@ -301,7 +297,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());
@@ -324,7 +320,7 @@ void sg_wifi_energy_plugin_init()
       [](simgrid::kernel::resource::NetworkAction const& action,
          simgrid::kernel::resource::Action::State /* previous */) {
         // update WiFi links encountered during the communication
-        for (simgrid::kernel::resource::LinkImpl* link : action.get_links()) {
+        for (auto const* link : action.get_links()) {
           if (link != nullptr && link->get_sharing_policy() == simgrid::s4u::Link::SharingPolicy::WIFI) {
             link->get_iface()->extension<LinkEnergyWifi>()->update(action);
           }
@@ -332,7 +328,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;