X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d07491b881cc0dd542507d598e1099f178b79c59..fbf5fafb60eb44c0c00a7283fd05a6dec5f2b58f:/src/s4u/s4u_Host.cpp diff --git a/src/s4u/s4u_Host.cpp b/src/s4u/s4u_Host.cpp index 95002eda7b..746d4d3bd0 100644 --- a/src/s4u/s4u_Host.cpp +++ b/src/s4u/s4u_Host.cpp @@ -7,6 +7,7 @@ #include "simgrid/s4u/Actor.hpp" #include "simgrid/s4u/Engine.hpp" #include "simgrid/s4u/Exec.hpp" +#include "src/simix/smx_private.hpp" #include "src/surf/HostImpl.hpp" #include @@ -17,32 +18,31 @@ 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(std::string name) : name_(std::move(name)) +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(std::string(name_), this); - new simgrid::surf::HostImpl(this); + Engine::get_instance()->host_register(name_, this); + new surf::HostImpl(this); } Host::~Host() { - xbt_assert(currentlyDestroying_, "Please call h->destroy() instead of manually deleting it."); + xbt_assert(currently_destroying_, "Please call h->destroy() instead of manually deleting it."); 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_; } @@ -51,14 +51,13 @@ 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() { - if (not currentlyDestroying_) { - currentlyDestroying_ = true; + if (not currently_destroying_) { + currently_destroying_ = true; on_destruction(*this); Engine::get_instance()->host_unregister(std::string(name_)); delete this; @@ -76,16 +75,16 @@ Host* Host::by_name_or_null(const std::string& name) Host* Host::current() { - smx_actor_t smx_proc = SIMIX_process_self(); - if (smx_proc == nullptr) + kernel::actor::ActorImpl* self = SIMIX_process_self(); + if (self == nullptr) xbt_die("Cannot call Host::current() from the maestro context"); - return smx_proc->host_; + return self->get_host(); } 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); @@ -97,7 +96,7 @@ void Host::turn_on() void Host::turn_off() { if (is_on()) { - simgrid::simix::simcall([this] { + simix::simcall([this] { this->pimpl_cpu->turn_off(); this->pimpl_->turn_off(); @@ -171,7 +170,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)); @@ -183,7 +182,7 @@ void Host::route_to(Host* dest, std::vector& links, /** Get the properties assigned to a host */ std::unordered_map* Host::get_properties() { - return simgrid::simix::simcall([this] { return this->pimpl_->get_properties(); }); + return simix::simcall([this] { return this->pimpl_->get_properties(); }); } /** Retrieve the property value (or nullptr if not set) */ @@ -192,15 +191,15 @@ const char* Host::get_property(const std::string& key) const return this->pimpl_->get_property(key); } -void Host::set_property(const std::string& key, std::string value) +void Host::set_property(const std::string& key, const std::string& value) { - simgrid::simix::simcall([this, key, value] { this->pimpl_->set_property(key, std::move(value)); }); + simix::simcall([this, &key, &value] { this->pimpl_->set_property(key, value); }); } /** 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. * @@ -210,13 +209,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 simix::simcall([this, 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. @@ -265,7 +264,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 @@ -280,13 +279,12 @@ int Host::get_pstate() const */ std::vector Host::get_attached_storages() const { - return simgrid::simix::simcall([this] { return this->pimpl_->get_attached_storages(); }); + return 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(); }); + std::vector local_storages = simix::simcall([this] { return this->pimpl_->get_attached_storages(); }); for (auto elm : local_storages) storages->push_back(elm); } @@ -304,7 +302,7 @@ std::unordered_map const& Host::get_mounted_storages() ExecPtr Host::exec_async(double flops) { - return this_actor::exec_init(flops)->set_host(this); + return this_actor::exec_init(flops); } void Host::execute(double flops) @@ -314,7 +312,7 @@ void Host::execute(double flops) void Host::execute(double flops, double priority) { - this_actor::exec_init(flops)->set_host(this)->set_priority(1 / priority)->start()->wait(); + this_actor::exec_init(flops)->set_priority(1 / priority)->start()->wait(); } } // namespace s4u @@ -366,12 +364,6 @@ sg_host_t sg_host_by_name(const char* name) return simgrid::s4u::Host::by_name_or_null(name); } -static int hostcmp_voidp(const void* pa, const void* pb) -{ - return strcmp((*static_cast(pa))->get_cname(), - (*static_cast(pb))->get_cname()); -} - xbt_dynar_t sg_hosts_as_dynar() { xbt_dynar_t res = xbt_dynar_new(sizeof(sg_host_t), nullptr); @@ -382,7 +374,11 @@ xbt_dynar_t sg_hosts_as_dynar() if (host && host->pimpl_netpoint && host->pimpl_netpoint->is_host()) xbt_dynar_push(res, &host); } - xbt_dynar_sort(res, hostcmp_voidp); + 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); + }); return res; } @@ -638,7 +634,17 @@ void sg_host_get_actor_list(sg_host_t host, xbt_dynar_t whereto) sg_host_t sg_host_self() { smx_actor_t process = SIMIX_process_self(); - return (process == nullptr) ? nullptr : process->host_; + return (process == nullptr) ? nullptr : process->get_host(); +} + +/* needs to be public and without simcall for exceptions and logging events */ +const char* sg_host_self_get_name() +{ + sg_host_t host = sg_host_self(); + if (host == nullptr || SIMIX_process_self() == simix_global->maestro_process) + return ""; + + return host->get_cname(); } double sg_host_load(sg_host_t host)