X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/58af52ab2edc3d4044102920b15f7778694ff91b..a48a21761805fa35836d89b496ccc7efb90f7bb4:/src/surf/HostImpl.cpp diff --git a/src/surf/HostImpl.cpp b/src/surf/HostImpl.cpp index bc4c7de2fa..f07e935f24 100644 --- a/src/surf/HostImpl.cpp +++ b/src/surf/HostImpl.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2013-2022. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2013-2023. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -7,6 +7,7 @@ #include #include +#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,29 +29,34 @@ 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() { /* 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 = "Shutting down host, but it's not empty:"; - for (auto const& actor : actor_list_) - msg += "\n\t" + std::string(actor.get_name()); - - EngineImpl::get_instance()->display_all_actor_status(); - xbt_die("%s", msg.c_str()); + const char* msg = "Shutting down host, but it's not empty"; + try { + std::string actors; + for (auto const& actor : actor_list_) + actors += "\n\t" + actor.get_name(); + + EngineImpl::get_instance()->display_all_actor_status(); + xbt_die("%s:%s", msg, actors.c_str()); + } catch (const std::bad_alloc& ba) { + xbt_die("%s (cannot print actor list: %s)", msg, ba.what()); + } } for (auto const& arg : actors_at_boot_) 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 @@ -81,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(), @@ -92,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.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. @@ -133,14 +134,21 @@ size_t HostImpl::get_actor_count() const std::vector HostImpl::get_disks() const { std::vector 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; } s4u::VirtualMachine* HostImpl::create_vm(const std::string& name, int core_amount, size_t ramsize) { - auto* vm = new s4u::VirtualMachine(name, get_iface(), core_amount, ramsize); + auto* host_vm = new kernel::resource::VirtualMachineImpl(name, get_iface(), core_amount, ramsize); + auto* vm = new s4u::VirtualMachine(host_vm); + host_vm->set_piface(vm); + return create_vm(name, vm); +} + +s4u::VirtualMachine* HostImpl::create_vm(const std::string& name, s4u::VirtualMachine* vm) +{ vms_[name] = vm->get_vm_impl(); // Create a VCPU for this VM @@ -148,13 +156,15 @@ s4u::VirtualMachine* HostImpl::create_vm(const std::string& name, int core_amoun for (unsigned long i = 0; i < get_iface()->get_pstate_count(); i++) speeds.push_back(get_iface()->get_pstate_speed(i)); - auto* cpu = englobing_zone_->get_cpu_vm_model()->create_cpu(vm, speeds)->set_core_count(core_amount); - - if (get_iface()->get_pstate() != 0) - cpu->set_pstate(get_iface()->get_pstate()); + auto* cpu = + englobing_zone_->get_cpu_vm_model()->create_cpu(vm, speeds)->set_core_count(vm->get_vm_impl()->get_core_amount()); 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()); @@ -181,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 HostImpl::get_vms() const { std::vector 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; } @@ -199,6 +207,8 @@ s4u::Disk* HostImpl::create_disk(const std::string& name, double read_bandwidth, { auto disk = piface_.get_netpoint()->get_englobing_zone()->get_disk_model()->create_disk(name, read_bandwidth, write_bandwidth); + if (sealed_) + disk->seal(); return disk->set_host(&piface_)->get_iface(); } @@ -222,13 +232,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