X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dc9b8feaddd53842f6204f4f24409b2382393fa9..b176f1f30ac1534c1e299bd01cfe35e4c517c084:/src/s4u/s4u_Host.cpp diff --git a/src/s4u/s4u_Host.cpp b/src/s4u/s4u_Host.cpp index f17edf7f58..a99e6a8680 100644 --- a/src/s4u/s4u_Host.cpp +++ b/src/s4u/s4u_Host.cpp @@ -7,9 +7,12 @@ #include "simgrid/s4u/Actor.hpp" #include "simgrid/s4u/Engine.hpp" #include "simgrid/s4u/Exec.hpp" +#include "simgrid/s4u/VirtualMachine.hpp" +#include "src/plugins/vm/VirtualMachineImpl.hpp" #include "src/simix/smx_private.hpp" #include "src/surf/HostImpl.hpp" +#include #include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_host, s4u, "Logging specific to the S4U hosts"); @@ -18,23 +21,22 @@ XBT_LOG_EXTERNAL_CATEGORY(surf_route); int USER_HOST_LEVEL = -1; namespace simgrid { - namespace xbt { -template class Extendable; -} +template class Extendable; +} // namespace xbt namespace s4u { -simgrid::xbt::signal Host::on_creation; -simgrid::xbt::signal Host::on_destruction; -simgrid::xbt::signal Host::on_state_change; -simgrid::xbt::signal Host::on_speed_change; +xbt::signal Host::on_creation; +xbt::signal Host::on_destruction; +xbt::signal Host::on_state_change; +xbt::signal Host::on_speed_change; Host::Host(const std::string& name) : name_(name) { xbt_assert(Host::by_name_or_null(name_) == nullptr, "Refusing to create a second host named '%s'.", get_cname()); Engine::get_instance()->host_register(name_, this); - new simgrid::surf::HostImpl(this); + new surf::HostImpl(this); } Host::~Host() @@ -43,7 +45,7 @@ Host::~Host() delete pimpl_; if (pimpl_netpoint != nullptr) // not removed yet by a children class - simgrid::s4u::Engine::get_instance()->netpoint_unregister(pimpl_netpoint); + Engine::get_instance()->netpoint_unregister(pimpl_netpoint); delete pimpl_cpu; delete mounts_; } @@ -52,9 +54,8 @@ Host::~Host() * * Don't delete directly a host, call h->destroy() instead. * - * This is cumbersome but this is the simplest solution to ensure that the - * onDestruction() callback receives a valid object (because of the destructor - * order in a class hierarchy). + * This is cumbersome but this is the simplest solution to ensure that the onDestruction() callback receives a valid + * object (because of the destructor order in a class hierarchy). */ void Host::destroy() { @@ -77,7 +78,7 @@ Host* Host::by_name_or_null(const std::string& name) Host* Host::current() { - smx_actor_t self = SIMIX_process_self(); + kernel::actor::ActorImpl* self = SIMIX_process_self(); if (self == nullptr) xbt_die("Cannot call Host::current() from the maestro context"); return self->get_host(); @@ -86,7 +87,7 @@ Host* Host::current() void Host::turn_on() { if (not is_on()) { - simgrid::simix::simcall([this] { + simix::simcall([this] { this->pimpl_cpu->turn_on(); this->pimpl_->turn_on(); on_state_change(*this); @@ -98,7 +99,12 @@ void Host::turn_on() void Host::turn_off() { if (is_on()) { - simgrid::simix::simcall([this] { + simix::simcall([this] { + for (VirtualMachine* const& vm : vm::VirtualMachineImpl::allVms_) + if (vm->get_pm() == this) { + vm->shutdown(); + vm->turn_off(); + } this->pimpl_cpu->turn_off(); this->pimpl_->turn_off(); @@ -133,22 +139,6 @@ int Host::get_actor_count() return pimpl_->get_actor_count(); } -/** @deprecated */ -void Host::getProcesses(std::vector* list) -{ - auto actors = get_all_actors(); - for (auto& actor : actors) - list->push_back(actor); -} - -/** @deprecated */ -void Host::actorList(std::vector* whereto) -{ - auto actors = get_all_actors(); - for (auto& actor : actors) - whereto->push_back(actor); -} - /** * @brief Find a route toward another host * @@ -172,7 +162,7 @@ void Host::route_to(Host* dest, std::vector& links, double* latency) /** @brief Just like Host::routeTo, but filling an array of link implementations */ void Host::route_to(Host* dest, std::vector& links, double* latency) { - simgrid::kernel::routing::NetZoneImpl::get_global_route(pimpl_netpoint, dest->pimpl_netpoint, links, latency); + kernel::routing::NetZoneImpl::get_global_route(pimpl_netpoint, dest->pimpl_netpoint, links, latency); if (XBT_LOG_ISENABLED(surf_route, xbt_log_priority_debug)) { XBT_CDEBUG(surf_route, "Route from '%s' to '%s' (latency: %f):", get_cname(), dest->get_cname(), (latency == nullptr ? -1 : *latency)); @@ -182,9 +172,9 @@ void Host::route_to(Host* dest, std::vector& links, } /** Get the properties assigned to a host */ -std::unordered_map* Host::get_properties() +const std::unordered_map* Host::get_properties() const { - return simgrid::simix::simcall([this] { return this->pimpl_->get_properties(); }); + return this->pimpl_->get_properties(); } /** Retrieve the property value (or nullptr if not set) */ @@ -195,13 +185,19 @@ const char* Host::get_property(const std::string& key) const void Host::set_property(const std::string& key, const std::string& value) { - simgrid::simix::simcall([this, &key, &value] { this->pimpl_->set_property(key, value); }); + simix::simcall([this, &key, &value] { this->pimpl_->set_property(key, value); }); } + +void Host::set_properties(const std::map& properties) +{ + simix::simcall([this, &properties] { this->pimpl_->set_properties(properties); }); +} + /** Specify a profile turning the host on and off according to a exhaustive list or a stochastic law. * The profile must contain boolean values. */ void Host::set_state_profile(kernel::profile::Profile* p) { - return simgrid::simix::simcall([this, p] { pimpl_cpu->set_state_profile(p); }); + return simix::simcall([this, p] { pimpl_cpu->set_state_profile(p); }); } /** Specify a profile modeling the external load according to a exhaustive list or a stochastic law. * @@ -211,13 +207,13 @@ void Host::set_state_profile(kernel::profile::Profile* p) */ void Host::set_speed_profile(kernel::profile::Profile* p) { - return simgrid::simix::simcall([this, p] { pimpl_cpu->set_speed_profile(p); }); + return simix::simcall([this, p] { pimpl_cpu->set_speed_profile(p); }); } /** @brief Get the peak processor speed (in flops/s), at the specified pstate */ double Host::get_pstate_speed(int pstate_index) const { - return simgrid::simix::simcall([this, pstate_index] { return this->pimpl_cpu->get_pstate_peak_speed(pstate_index); }); + return this->pimpl_cpu->get_pstate_peak_speed(pstate_index); } /** @brief Get the peak computing speed in flops/s at the current pstate, NOT taking the external load into account. @@ -266,7 +262,7 @@ int Host::get_core_count() const /** @brief Set the pstate at which the host should run */ void Host::set_pstate(int pstate_index) { - simgrid::simix::simcall([this, pstate_index] { this->pimpl_cpu->set_pstate(pstate_index); }); + simix::simcall([this, pstate_index] { this->pimpl_cpu->set_pstate(pstate_index); }); } /** @brief Retrieve the pstate at which the host is currently running */ int Host::get_pstate() const @@ -281,15 +277,7 @@ int Host::get_pstate() const */ std::vector Host::get_attached_storages() const { - return simgrid::simix::simcall([this] { return this->pimpl_->get_attached_storages(); }); -} - -void Host::getAttachedStorages(std::vector* storages) -{ - std::vector local_storages = - simgrid::simix::simcall([this] { return this->pimpl_->get_attached_storages(); }); - for (auto elm : local_storages) - storages->push_back(elm); + return simix::simcall([this] { return this->pimpl_->get_attached_storages(); }); } std::unordered_map const& Host::get_mounted_storages() @@ -341,7 +329,7 @@ sg_host_t* sg_host_list() xbt_assert(sg_host_count() > 0, "There is no host!"); std::vector hosts = simgrid::s4u::Engine::get_instance()->get_all_hosts(); - sg_host_t* res = (sg_host_t*)malloc(sizeof(sg_host_t) * hosts.size()); + sg_host_t* res = xbt_new(sg_host_t, hosts.size()); memcpy(res, hosts.data(), sizeof(sg_host_t) * hosts.size()); return res; @@ -369,19 +357,16 @@ sg_host_t sg_host_by_name(const char* name) xbt_dynar_t sg_hosts_as_dynar() { - xbt_dynar_t res = xbt_dynar_new(sizeof(sg_host_t), nullptr); - std::vector list = simgrid::s4u::Engine::get_instance()->get_all_hosts(); - for (auto const& host : list) { - if (host && host->pimpl_netpoint && host->pimpl_netpoint->is_host()) - xbt_dynar_push(res, &host); - } - xbt_dynar_sort(res, [](const void* pa, const void* pb) { - const std::string& na = (*static_cast(pa))->get_name(); - const std::string& nb = (*static_cast(pb))->get_name(); - return na.compare(nb); + auto last = std::remove_if(begin(list), end(list), [](const simgrid::s4u::Host* host) { + return not host || not host->pimpl_netpoint || not host->pimpl_netpoint->is_host(); }); + std::sort(begin(list), last, + [](const simgrid::s4u::Host* a, const simgrid::s4u::Host* b) { return a->get_name() < b->get_name(); }); + + xbt_dynar_t res = xbt_dynar_new(sizeof(sg_host_t), nullptr); + std::for_each(begin(list), last, [res](sg_host_t host) { xbt_dynar_push_as(res, sg_host_t, host); }); return res; } @@ -533,7 +518,7 @@ int sg_host_is_off(sg_host_t host) xbt_dict_t sg_host_get_properties(sg_host_t host) { xbt_dict_t as_dict = xbt_dict_new_homogeneous(xbt_free_f); - std::unordered_map* props = host->get_properties(); + const std::unordered_map* props = host->get_properties(); if (props == nullptr) return nullptr; for (auto const& elm : *props) { @@ -612,7 +597,7 @@ void sg_host_dump(sg_host_t host) XBT_INFO("Displaying host %s", host->get_cname()); XBT_INFO(" - speed: %.0f", host->get_speed()); XBT_INFO(" - available speed: %.2f", sg_host_get_available_speed(host)); - std::unordered_map* props = host->get_properties(); + const std::unordered_map* props = host->get_properties(); if (not props->empty()) { XBT_INFO(" - properties:");