From 80ce67cf70a6fb429270a319c441eb7cd374fee5 Mon Sep 17 00:00:00 2001
From: Fabien Chaix <chaix@ics.forth.gr>
Date: Thu, 19 May 2022 17:47:19 +0300
Subject: [PATCH] Cosmetics

---
 include/simgrid/s4u/Comm.hpp         | 2 --
 src/kernel/activity/ActivityImpl.cpp | 2 +-
 src/kernel/activity/ActivityImpl.hpp | 9 ++++-----
 src/kernel/activity/ExecImpl.cpp     | 5 ++---
 src/surf/HostImpl.cpp                | 2 +-
 5 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/include/simgrid/s4u/Comm.hpp b/include/simgrid/s4u/Comm.hpp
index 0acc9d25fa..84b0cbbb3f 100644
--- a/include/simgrid/s4u/Comm.hpp
+++ b/include/simgrid/s4u/Comm.hpp
@@ -158,8 +158,6 @@ public:
     return detach();
   }
 
-  Comm* abort_me();
-
   Comm* wait_for(double timeout) override;
 
   /*! take a vector s4u::CommPtr and return the rank of the first finished one (or -1 if none is done). */
diff --git a/src/kernel/activity/ActivityImpl.cpp b/src/kernel/activity/ActivityImpl.cpp
index 86cd48a36c..c75799ab3f 100644
--- a/src/kernel/activity/ActivityImpl.cpp
+++ b/src/kernel/activity/ActivityImpl.cpp
@@ -59,7 +59,7 @@ const char* ActivityImpl::get_state_str() const
 {
   return to_c_str(state_);
 }
-  
+
 bool ActivityImpl::test(actor::ActorImpl* issuer)
 {
   if (state_ != State::WAITING && state_ != State::RUNNING) {
diff --git a/src/kernel/activity/ActivityImpl.hpp b/src/kernel/activity/ActivityImpl.hpp
index ff05528c66..f3dca0b2cc 100644
--- a/src/kernel/activity/ActivityImpl.hpp
+++ b/src/kernel/activity/ActivityImpl.hpp
@@ -24,7 +24,7 @@ XBT_DECLARE_ENUM_CLASS(State, WAITING, READY, RUNNING, DONE, CANCELED, FAILED, S
 
 class XBT_PUBLIC ActivityImpl {
   std::atomic_int_fast32_t refcount_{0};
-  std::string name_ = "";
+  std::string name_        = "";
   actor::ActorImpl* actor_ = nullptr;
   State state_             = State::WAITING; /* State of the activity */
   double start_time_       = -1.0;
@@ -48,10 +48,9 @@ protected:
   void set_start_time(double start_time) { start_time_ = start_time; }
   void clear_hosts() { hosts_.clear(); }
   void add_host(s4u::Host* host) { hosts_.push_back(host); }
-  void set_hosts(const std::vector<s4u::Host*>& hosts) { hosts_=hosts; }
-  
-public:
+  void set_hosts(const std::vector<s4u::Host*>& hosts) { hosts_ = hosts; }
 
+public:
   const std::string& get_name() const { return name_; }
   const char* get_cname() const { return name_.c_str(); }
 
@@ -87,7 +86,7 @@ public:
                              // the model or because it terminated without waiting for the model
 
   s4u::Host* get_host() const { return hosts_.front(); }
-  const std::vector<s4u::Host*>& get_hosts() const { return hosts_;} ;
+  const std::vector<s4u::Host*>& get_hosts() const { return hosts_; };
 
   void register_simcall(actor::Simcall* simcall);
   void unregister_simcall(actor::Simcall* simcall);
diff --git a/src/kernel/activity/ExecImpl.cpp b/src/kernel/activity/ExecImpl.cpp
index fdaf2dcc04..503e2c5d84 100644
--- a/src/kernel/activity/ExecImpl.cpp
+++ b/src/kernel/activity/ExecImpl.cpp
@@ -31,8 +31,7 @@ ExecImpl::ExecImpl()
 
 ExecImpl& ExecImpl::set_host(s4u::Host* host)
 {
-  clear_hosts();
-  add_host(host);
+  ActivityImpl::set_hosts({host});
   return *this;
 }
 
@@ -146,7 +145,7 @@ ExecImpl& ExecImpl::update_sharing_penalty(double sharing_penalty)
 void ExecImpl::post()
 {
   xbt_assert(surf_action_ != nullptr);
-  auto hosts=get_hosts();
+  auto const& hosts = get_hosts();
   if (std::any_of(hosts.begin(), hosts.end(), [](const s4u::Host* host) { return not host->is_on(); })) {
     /* If one of the hosts running the synchro failed, notice it. This way, the asking
      * process can be killed if it runs on that host itself */
diff --git a/src/surf/HostImpl.cpp b/src/surf/HostImpl.cpp
index 5ba84b961c..ef5b9f6546 100644
--- a/src/surf/HostImpl.cpp
+++ b/src/surf/HostImpl.cpp
@@ -95,7 +95,7 @@ void HostImpl::turn_off(const actor::ActorImpl* issuer)
     issuer->kill(&actor);
   }
   for (const auto& activity : EngineImpl::get_instance()->get_maestro()->activities_) {
-    auto hosts = activity->get_hosts();
+    auto const& hosts = activity->get_hosts();
     if (std::find(hosts.begin(), hosts.end(), &piface_) != hosts.end()) {
       activity->cancel();
       activity->set_state(activity::State::FAILED);
-- 
2.20.1