X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6863f9aba274bffb41cd9cb736c9bcb390b64cbf..f7416c885321b8233e9ac6da5450f97468e94dac:/src/plugins/link_energy_wifi.cpp

diff --git a/src/plugins/link_energy_wifi.cpp b/src/plugins/link_energy_wifi.cpp
index 5bf8bce6f5..b0d93f534c 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;
@@ -301,7 +299,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());
@@ -321,9 +319,10 @@ void sg_wifi_energy_plugin_init()
   });
 
   simgrid::s4u::Link::on_communication_state_change.connect(
-      [](simgrid::kernel::resource::NetworkAction const& action, simgrid::kernel::resource::Action::State previous) {
+      [](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);
           }
@@ -331,13 +330,13 @@ 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;
 
-    auto link_src  = actionWifi->get_src_link();
-    auto link_dst = actionWifi->get_dst_link();
+    auto const* link_src = actionWifi->get_src_link();
+    auto const* link_dst = actionWifi->get_dst_link();
 
     if(link_src != nullptr)
       link_src->get_iface()->extension<LinkEnergyWifi>()->update(action);