syntax issues

diff --git a/src/kernel/lmm/System.cpp b/src/kernel/lmm/System.cpp
index 3f97566..100917b 100644 (file)
--- a/src/kernel/lmm/System.cpp
+++ b/src/kernel/lmm/System.cpp
@@ -30,7 +30,7 @@ Element::Element(Constraint* constraint, Variable* variable, double cweight)
 int Element::get_concurrency() const
 {
   // just to try having the computation of the concurrency
-  if(constraint->get_sharing_policy() == Constraint::SharingPolicy::WIFI) {
+  if (constraint->get_sharing_policy() == Constraint::SharingPolicy::WIFI) {
     return 1;
   }
 

diff --git a/src/kernel/resource/WifiLinkImpl.cpp b/src/kernel/resource/WifiLinkImpl.cpp
index c4fbc12..52fdbd8 100644 (file)
--- a/src/kernel/resource/WifiLinkImpl.cpp
+++ b/src/kernel/resource/WifiLinkImpl.cpp
@@ -9,7 +9,6 @@
 #include "src/surf/surf_interface.hpp"
 #include "src/kernel/activity/CommImpl.hpp"
 
-
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(res_network);
 
 namespace simgrid::kernel::resource {
@@ -24,18 +23,13 @@ WifiLinkImpl::WifiLinkImpl(const std::string& name, const std::vector<double>& b
   this->set_constraint(system->constraint_new(this, 1));
   for (auto bandwidth : bandwidths)
     bandwidths_.push_back({bandwidth, 1.0, nullptr});
-
   kernel::activity::CommImpl::on_start.connect(&update_bw_comm_start);
   s4u::Link::on_communication_state_change_cb(&update_bw_comm_end);
-
-
 }
 
 void WifiLinkImpl::set_host_rate(const s4u::Host* host, int rate_level)
 {
-  auto insert_done = host_rates_.insert(std::make_pair(host->get_name(), rate_level));
-  if (not insert_done.second)
-    insert_done.first->second = rate_level;
+  host_rates_[host->get_name()] = rate_level;
 }
 
 double WifiLinkImpl::get_host_rate(const s4u::Host* host) const
@@ -74,13 +68,15 @@ double WifiLinkImpl::wifi_link_dynamic_sharing(WifiLinkImpl* link, double capaci
   return ratio;
 }
 
-void WifiLinkImpl::inc_active_flux() {
-  xbt_assert(nb_active_flux_>=0, "Negative nb_active_flux should not exist");
+void WifiLinkImpl::inc_active_flux()
+{
+  xbt_assert(nb_active_flux_ >= 0, "Negative nb_active_flux should not exist");
   nb_active_flux_++;
 }
 
-void WifiLinkImpl::dec_active_flux() {
-  xbt_assert(nb_active_flux_>0, "Negative nb_active_flux should not exist");
+void WifiLinkImpl::dec_active_flux()
+{
+  xbt_assert(nb_active_flux_ > 0, "Negative nb_active_flux should not exist");
   nb_active_flux_--;
 }
 
@@ -94,52 +90,50 @@ void WifiLinkImpl::update_bw_comm_start(const kernel::activity::CommImpl& comm)
 
   auto* link_src = actionWifi->get_src_link();
   auto* link_dst = actionWifi->get_dst_link();
-  if(link_src != nullptr) {
+  if (link_src != nullptr) {
     link_src->inc_active_flux();
   }
-  if(link_dst != nullptr) {
+  if (link_dst != nullptr) {
     link_dst->inc_active_flux();
   }
 }
 
 void WifiLinkImpl::update_bw_comm_end(simgrid::kernel::resource::NetworkAction& action, simgrid::kernel::resource::Action::State state)
 {
-  if(action.get_state() != kernel::resource::Action::State::FINISHED)
+  if (action.get_state() != kernel::resource::Action::State::FINISHED)
     return;
 
   auto const* actionWifi = dynamic_cast<const simgrid::kernel::resource::WifiLinkAction*>(&action);
   if (actionWifi == nullptr)
     return;
 
-  auto* link_src = actionWifi->get_src_link();
-  auto* link_dst = actionWifi->get_dst_link();
-  if(link_src != nullptr) {
+  if (auto* link_src = actionWifi->get_src_link()) {
     link_src->dec_active_flux();
   }
-  if(link_dst != nullptr) {
+  if (auto* link_dst = actionWifi->get_dst_link()) {
     link_dst->dec_active_flux();
   }
 }
 
-double WifiLinkImpl::get_max_ratio(int nb_active_flux)
+double WifiLinkImpl::get_max_ratio(int nb_active_flux) const
 {
   double new_peak = -1;
-  if(nb_active_flux_ > conc_lim_){
+  if (nb_active_flux_ > conc_lim_) {
     new_peak = (nb_active_flux_-conc_lim_) * co_acc_ + x0_;
-    XBT_DEBUG("Wi-Fi link peak=(%d-%d)*%lf+%lf=%lf",nb_active_flux_,conc_lim_,co_acc_,x0_,new_peak);
-  }else{
+    XBT_DEBUG("Wi-Fi link peak=(%d-%d)*%lf+%lf=%lf", nb_active_flux_, conc_lim_, co_acc_, x0_, new_peak);
+  } else {
     new_peak = x0_;
-    XBT_DEBUG("Wi-Fi link peak=%lf",x0_);
+    XBT_DEBUG("Wi-Fi link peak=%lf", x0_);
   }
   // should be the new maximum bandwidth ratio (comparison between max throughput without concurrency and with it)
-  double propCap = new_peak/x0_;
+  double propCap = new_peak / x0_;
 
   return propCap;
 }
 
 bool WifiLinkImpl::toggle_callback()
 {
-  if(! use_callback_) {
+  if (not use_callback_) {
       XBT_DEBUG("Activate throughput reduction mechanism");
     use_callback_ = true;
     this->set_sharing_policy(simgrid::s4u::Link::SharingPolicy::WIFI,

diff --git a/src/kernel/resource/WifiLinkImpl.hpp b/src/kernel/resource/WifiLinkImpl.hpp
index 5f5fec0..223f63e 100644 (file)
--- a/src/kernel/resource/WifiLinkImpl.hpp
+++ b/src/kernel/resource/WifiLinkImpl.hpp
@@ -53,7 +53,6 @@ public:
   void apply_event(kernel::profile::Event*, double) override { THROW_UNIMPLEMENTED; }
   void set_bandwidth(double) override { THROW_UNIMPLEMENTED; }
   void set_latency(double) override;
-  double get_max_ratio();
   bool toggle_callback();
 
   static void update_bw_comm_start(const kernel::activity::CommImpl&);
@@ -61,7 +60,7 @@ public:
   void inc_active_flux();
   void dec_active_flux();
   static double wifi_link_dynamic_sharing(WifiLinkImpl* link, double capacity, int n);
-  double get_max_ratio(int);
+  double get_max_ratio(int) const;
   size_t get_host_count() const;
 };
 

diff --git a/teshsuite/models/wifi_usage_decay/wifi_usage_decay.cpp b/teshsuite/models/wifi_usage_decay/wifi_usage_decay.cpp
index 48aeeae..9d63d35 100644 (file)
--- a/teshsuite/models/wifi_usage_decay/wifi_usage_decay.cpp
+++ b/teshsuite/models/wifi_usage_decay/wifi_usage_decay.cpp
@@ -11,7 +11,7 @@
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(simulator, "[usage] wifi_usage <platform-file>");
 
-void run_ping_test(std::vector<std::pair<std::string,std::string>> mboxes, int data_size);
+void run_ping_test(const std::vector<std::pair<std::string,std::string>>& mboxes, int data_size);
 
 /* We need a separate actor so that it can sleep after each test */
 static void main_dispatcher()
@@ -62,7 +62,7 @@ int main(int argc, char** argv)
   return 0;
 }
 
-void run_ping_test(std::vector<std::pair<std::string,std::string>> mboxes, int data_size)
+void run_ping_test(const std::vector<std::pair<std::string,std::string>>& mboxes, int data_size)
 {
   auto* mailbox = simgrid::s4u::Mailbox::by_name("Test");
   for(auto pair : mboxes) {