Remove explicit conversion to std::string when it's not required.

[simgrid.git] / src / surf / HostImpl.cpp

diff --git a/src/surf/HostImpl.cpp b/src/surf/HostImpl.cpp
index de2ba8f..7b7175d 100644 (file)
--- a/src/surf/HostImpl.cpp
+++ b/src/surf/HostImpl.cpp
@@ -7,6 +7,7 @@
 #include <simgrid/s4u/Engine.hpp>
 #include <simgrid/s4u/Host.hpp>
 
+#include "xbt/asserts.hpp"
 #include "src/kernel/EngineImpl.hpp"
 #include "src/kernel/resource/VirtualMachineImpl.hpp"
 
@@ -18,9 +19,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(res_host, ker_resource, "Host resources agregate
  * Callbacks *t
  *************/
 
-namespace simgrid {
-namespace kernel {
-namespace resource {
+namespace simgrid::kernel::resource {
 
 /*********
  * Model *
@@ -30,7 +29,7 @@ namespace resource {
  ************/
 HostImpl::HostImpl(const std::string& name) : piface_(this), name_(name)
 {
-  xbt_assert(s4u::Host::by_name_or_null(name_) == nullptr, "Refusing to create a second host named '%s'.", get_cname());
+  xbt_enforce(s4u::Host::by_name_or_null(name_) == nullptr, "Refusing to create a second host named '%s'.", get_cname());
 }
 
 HostImpl::~HostImpl()
@@ -41,11 +40,11 @@ HostImpl::~HostImpl()
     try {
       std::string actors;
       for (auto const& actor : actor_list_)
-        actors += "\n\t" + std::string(actor.get_name());
+        actors += "\n\t" + actor.get_name();
 
       EngineImpl::get_instance()->display_all_actor_status();
       xbt_die("%s:%s", msg, actors.c_str());
-    } catch (std::bad_alloc& ba) {
+    } catch (const std::bad_alloc& ba) {
       xbt_die("%s (cannot print actor list: %s)", msg, ba.what());
     }
   }
@@ -53,11 +52,11 @@ HostImpl::~HostImpl()
     delete arg;
   actors_at_boot_.clear();
 
-  for (auto const& d : disks_)
-    d.second->destroy();
+  for (auto const& [_, d] : disks_)
+    d->destroy();
 
-  for (auto const& vm : vms_)
-    vm.second->vm_destroy();
+  for (auto const& [_, vm] : vms_)
+    vm->vm_destroy();
 }
 
 /** @brief Fire the required callbacks and destroy the object
@@ -86,10 +85,10 @@ void HostImpl::turn_on() const
 void HostImpl::turn_off(const actor::ActorImpl* issuer)
 {
   /* turn_off VMs running on host */
-  for (const auto& kv : vms_) {
+  for (const auto& [_, vm] : vms_) {
     // call s4u functions to generate the good on_state_change signal, maybe one day this wont be necessary
-    kv.second->get_iface()->shutdown();
-    kv.second->get_iface()->turn_off();
+    vm->get_iface()->shutdown();
+    vm->get_iface()->turn_off();
   }
   for (auto& actor : actor_list_) {
     XBT_DEBUG("Killing Actor %s@%s on behalf of %s which turned off that host.", actor.get_cname(),
@@ -97,13 +96,10 @@ void HostImpl::turn_off(const actor::ActorImpl* issuer)
     issuer->kill(&actor);
   }
   for (const auto& activity : EngineImpl::get_instance()->get_maestro()->activities_) {
-    auto* exec = dynamic_cast<activity::ExecImpl*>(activity.get());
-    if (exec != nullptr) {
-      auto hosts = exec->get_hosts();
-      if (std::find(hosts.begin(), hosts.end(), &piface_) != hosts.end()) {
-        exec->cancel();
-        exec->set_state(activity::State::FAILED);
-      }
+    auto const& hosts = activity->get_hosts();
+    if (std::find(hosts.begin(), hosts.end(), &piface_) != hosts.end()) {
+      activity->cancel();
+      activity->set_state(activity::State::FAILED);
     }
   }
   // When a host is turned off, we want to keep only the actors that should restart for when it will boot again.
@@ -138,8 +134,8 @@ size_t HostImpl::get_actor_count() const
 std::vector<s4u::Disk*> HostImpl::get_disks() const
 {
   std::vector<s4u::Disk*> disks;
-  for (auto const& d : disks_)
-    disks.push_back(d.second->get_iface());
+  for (auto const& [_, d] : disks_)
+    disks.push_back(d->get_iface());
   return disks;
 }
 
@@ -163,11 +159,12 @@ s4u::VirtualMachine* HostImpl::create_vm(const std::string& name, s4u::VirtualMa
   auto* cpu =
       englobing_zone_->get_cpu_vm_model()->create_cpu(vm, speeds)->set_core_count(vm->get_vm_impl()->get_core_amount());
 
-  if (get_iface()->get_pstate() != 0)
-    cpu->set_pstate(get_iface()->get_pstate());
-
   cpu->seal();
 
+  if (get_iface()->get_pstate() != 0) {
+    cpu->set_pstate(get_iface()->get_pstate());
+  }
+
   /* Currently, a VM uses the network resource of its physical host */
   vm->set_netpoint(get_iface()->get_netpoint());
 
@@ -194,16 +191,14 @@ void HostImpl::destroy_vm(const std::string& name)
 VirtualMachineImpl* HostImpl::get_vm_by_name_or_null(const std::string& name) const
 {
   auto vm_it = vms_.find(name);
-  if (vm_it != vms_.end())
-    return vm_it->second;
-  return nullptr;
+  return vm_it == vms_.end() ? nullptr : vm_it->second;
 }
 
 std::vector<s4u::VirtualMachine*> HostImpl::get_vms() const
 {
   std::vector<s4u::VirtualMachine*> vms;
-  for (const auto& kv : vms_) {
-    vms.push_back(kv.second->get_iface());
+  for (const auto& [_, vm] : vms_) {
+    vms.push_back(vm->get_iface());
   }
   return vms;
 }
@@ -235,13 +230,11 @@ void HostImpl::seal()
   sealed_ = true;
 
   /* seal its disks */
-  for (auto const& disk : disks_)
-    disk.second->seal();
+  for (auto const& [_, disk] : disks_)
+    disk->seal();
 
   /* seal its VMs */
-  for (auto const& vm : vms_)
-    vm.second->seal();
+  for (auto const& [_, vm] : vms_)
+    vm->seal();
 }
-} // namespace resource
-} // namespace kernel
-} // namespace simgrid
+} // namespace simgrid::kernel::resource