X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/149c63f36e15b8500b1e826bda5138318ff7ba2b..50102ec1c30562e20d450afa7015374387bf1904:/src/surf/HostImpl.cpp diff --git a/src/surf/HostImpl.cpp b/src/surf/HostImpl.cpp index 2366c33b37..2f235881e0 100644 --- a/src/surf/HostImpl.cpp +++ b/src/surf/HostImpl.cpp @@ -36,7 +36,7 @@ HostImpl::~HostImpl() { /* All actors should be gone when the host is turned off (by the end of the simulation). */ if (not actor_list_.empty()) { - std::string msg = std::string("Shutting down host, but it's not empty:"); + std::string msg = "Shutting down host, but it's not empty:"; for (auto const& actor : actor_list_) msg += "\n\t" + std::string(actor.get_name()); @@ -55,7 +55,7 @@ HostImpl::~HostImpl() * * Weird things will happen if you turn on a host that is already on. S4U is fool-proof, not this. */ -void HostImpl::turn_on() +void HostImpl::turn_on() const { for (auto const& arg : actors_at_boot_) { XBT_DEBUG("Booting Actor %s(%s) right now", arg->name.c_str(), arg->host->get_cname()); @@ -73,7 +73,7 @@ void HostImpl::turn_on() } /** Kill all actors hosted here */ -void HostImpl::turn_off(kernel::actor::ActorImpl* issuer) +void HostImpl::turn_off(const kernel::actor::ActorImpl* issuer) { for (auto& actor : actor_list_) { XBT_DEBUG("Killing Actor %s@%s on behalf of %s which turned off that host.", actor.get_cname(), @@ -95,15 +95,15 @@ std::vector HostImpl::get_all_actors() { std::vector res; for (auto& actor : actor_list_) - res.push_back(actor.ciface()); + res.emplace_back(actor.get_ciface()); return res; } -size_t HostImpl::get_actor_count() +size_t HostImpl::get_actor_count() const { return actor_list_.size(); } -std::vector HostImpl::get_disks() +std::vector HostImpl::get_disks() const { std::vector disks; for (auto const& d : disks_) @@ -113,7 +113,7 @@ std::vector HostImpl::get_disks() void HostImpl::set_disks(const std::vector& disks, s4u::Host* host) { - disks_ = std::move(disks); + disks_ = disks; for (auto d : disks_) d->set_host(host); } @@ -145,7 +145,7 @@ std::vector HostImpl::get_attached_storages() } std::unordered_map* HostImpl::get_mounted_storages() { - std::unordered_map* mounts = new std::unordered_map(); + auto* mounts = new std::unordered_map(); for (auto const& m : storage_) { mounts->insert({m.first, m.second->get_iface()}); }