X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/15120cbae733cd144328bd4610dc6091ae6b7bd8..cf6a1d5f1eddea2b377415ab57c5185058488269:/src/s4u/s4u_Host.cpp diff --git a/src/s4u/s4u_Host.cpp b/src/s4u/s4u_Host.cpp index f2549c6033..7005ea07de 100644 --- a/src/s4u/s4u_Host.cpp +++ b/src/s4u/s4u_Host.cpp @@ -3,6 +3,7 @@ /* 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. */ +#include "simgrid/Exception.hpp" #include "simgrid/host.h" #include "simgrid/kernel/routing/NetPoint.hpp" #include "simgrid/s4u/Actor.hpp" @@ -12,6 +13,7 @@ #include "simgrid/s4u/VirtualMachine.hpp" #include "src/plugins/vm/VirtualMachineImpl.hpp" #include "src/surf/HostImpl.hpp" +#include "xbt/parse_units.hpp" #include #include @@ -30,18 +32,14 @@ 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) +Host* Host::set_netpoint(kernel::routing::NetPoint* netpoint) { - 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 surf::HostImpl(this); + pimpl_netpoint_ = netpoint; + return this; } Host::~Host() { - 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 Engine::get_instance()->netpoint_unregister(pimpl_netpoint_); delete pimpl_cpu; @@ -56,12 +54,7 @@ Host::~Host() */ void Host::destroy() { - if (not currently_destroying_) { - currently_destroying_ = true; - on_destruction(*this); - Engine::get_instance()->host_unregister(std::string(name_)); - delete this; - } + kernel::actor::simcall([this] { this->pimpl_->destroy(); }); } Host* Host::by_name(const std::string& name) @@ -76,11 +69,20 @@ Host* Host::by_name_or_null(const std::string& name) Host* Host::current() { kernel::actor::ActorImpl* self = kernel::actor::ActorImpl::self(); - if (self == nullptr) - xbt_die("Cannot call Host::current() from the maestro context"); + xbt_assert(self != nullptr, "Cannot call Host::current() from the maestro context"); return self->get_host(); } +xbt::string const& Host::get_name() const +{ + return this->pimpl_->get_name(); +} + +const char* Host::get_cname() const +{ + return this->pimpl_->get_cname(); +} + void Host::turn_on() { if (not is_on()) { @@ -132,7 +134,7 @@ std::vector Host::get_all_actors() const } /** @brief Returns how many actors (daemonized or not) have been launched on this host */ -int Host::get_actor_count() const +size_t Host::get_actor_count() const { return pimpl_->get_actor_count(); } @@ -175,16 +177,21 @@ NetZone* Host::get_englobing_zone() return pimpl_netpoint_->get_englobing_zone()->get_iface(); } -void Host::sendto(Host* dest, double byte_amount) +void Host::sendto(Host* dest, double byte_amount) // deprecated 331 { - sendto_async(dest, byte_amount)->wait(); + Comm::sendto_async(this, dest, byte_amount)->wait(); } -CommPtr Host::sendto_async(Host* dest, double byte_amount) +CommPtr Host::sendto_async(Host* dest, double byte_amount) // deprecated 331 { return Comm::sendto_async(this, dest, byte_amount); } +void Host::send_to(Host* dest, double byte_amount) // deprecated 330 +{ + Comm::sendto(this, dest, byte_amount); +} + /** Get the properties assigned to a host */ const std::unordered_map* Host::get_properties() const { @@ -197,21 +204,24 @@ const char* Host::get_property(const std::string& key) const return this->pimpl_->get_property(key); } -void Host::set_property(const std::string& key, const std::string& value) +Host* Host::set_property(const std::string& key, const std::string& value) { kernel::actor::simcall([this, &key, &value] { this->pimpl_->set_property(key, value); }); + return this; } -void Host::set_properties(const std::unordered_map& properties) +Host* Host::set_properties(const std::unordered_map& properties) { kernel::actor::simcall([this, &properties] { this->pimpl_->set_properties(properties); }); + return this; } /** Specify a profile turning the host on and off according to an exhaustive list or a stochastic law. * The profile must contain boolean values. */ -void Host::set_state_profile(kernel::profile::Profile* p) +Host* Host::set_state_profile(kernel::profile::Profile* p) { - return kernel::actor::simcall([this, p] { pimpl_cpu->set_state_profile(p); }); + kernel::actor::simcall([this, p] { pimpl_cpu->set_state_profile(p); }); + return this; } /** Specify a profile modeling the external load according to an exhaustive list or a stochastic law. * @@ -219,9 +229,10 @@ void Host::set_state_profile(kernel::profile::Profile* p) * of the initial value. This means that the actual value is obtained by multiplying the initial value (the peek speed * at this pstate level) by the rate coming from the profile. */ -void Host::set_speed_profile(kernel::profile::Profile* p) +Host* Host::set_speed_profile(kernel::profile::Profile* p) { - return kernel::actor::simcall([this, p] { pimpl_cpu->set_speed_profile(p); }); + kernel::actor::simcall([this, p] { pimpl_cpu->set_speed_profile(p); }); + return this; } /** @brief Get the peak processor speed (in flops/s), at the specified pstate */ @@ -248,20 +259,89 @@ int Host::get_core_count() const return this->pimpl_cpu->get_core_count(); } +Host* Host::set_core_count(int core_count) +{ + kernel::actor::simcall([this, core_count] { this->pimpl_cpu->set_core_count(core_count); }); + return this; +} + +Host* Host::set_pstate_speed(const std::vector& speed_per_state) +{ + kernel::actor::simcall([this, &speed_per_state] { pimpl_cpu->set_pstate_speed(speed_per_state); }); + return this; +} + +std::vector Host::convert_pstate_speed_vector(const std::vector& speed_per_state) +{ + std::vector speed_list; + speed_list.reserve(speed_per_state.size()); + for (const auto& speed_str : speed_per_state) { + try { + double speed = xbt_parse_get_speed("", 0, speed_str.c_str(), nullptr, ""); + speed_list.push_back(speed); + } catch (const simgrid::ParseError&) { + throw std::invalid_argument(std::string("Invalid speed value: ") + speed_str); + } + } + return speed_list; +} + +Host* Host::set_pstate_speed(const std::vector& speed_per_state) +{ + set_pstate_speed(Host::convert_pstate_speed_vector(speed_per_state)); + return this; +} + /** @brief Set the pstate at which the host should run */ -void Host::set_pstate(int pstate_index) +Host* Host::set_pstate(int pstate_index) { kernel::actor::simcall([this, pstate_index] { this->pimpl_cpu->set_pstate(pstate_index); }); + return this; } + /** @brief Retrieve the pstate at which the host is currently running */ int Host::get_pstate() const { return this->pimpl_cpu->get_pstate(); } +Host* Host::set_coordinates(const std::string& coords) +{ + if (not coords.empty()) + kernel::actor::simcall([this, coords] { this->pimpl_netpoint_->set_coordinates(coords); }); + return this; +} std::vector Host::get_disks() const { - return kernel::actor::simcall([this] { return this->pimpl_->get_disks(); }); + return this->pimpl_->get_disks(); +} + +Disk* Host::create_disk(const std::string& name, double read_bandwidth, double write_bandwidth) +{ + return kernel::actor::simcall([this, &name, read_bandwidth, write_bandwidth] { + auto* disk = pimpl_->create_disk(name, read_bandwidth, write_bandwidth); + pimpl_->add_disk(disk); + return disk; + }); +} + +Disk* Host::create_disk(const std::string& name, const std::string& read_bandwidth, const std::string& write_bandwidth) +{ + double d_read; + try { + d_read = xbt_parse_get_bandwidth("", 0, read_bandwidth.c_str(), nullptr, ""); + } catch (const simgrid::ParseError&) { + throw std::invalid_argument(std::string("Impossible to create disk: ") + name + + std::string(". Invalid read bandwidth: ") + read_bandwidth); + } + double d_write; + try { + d_write = xbt_parse_get_bandwidth("", 0, write_bandwidth.c_str(), nullptr, ""); + } catch (const simgrid::ParseError&) { + throw std::invalid_argument(std::string("Impossible to create disk: ") + name + + std::string(". Invalid write bandwidth: ") + write_bandwidth); + } + return create_disk(name, d_read, d_write); } void Host::add_disk(const Disk* disk) @@ -294,6 +374,13 @@ void Host::execute(double flops, double priority) const this_actor::exec_init(flops)->set_priority(1 / priority)->vetoable_start()->wait(); } +Host* Host::seal() +{ + kernel::actor::simcall([this]() { this->pimpl_->seal(); }); + simgrid::s4u::Host::on_creation(*this); // notify the signal + return this; +} + } // namespace s4u } // namespace simgrid @@ -305,12 +392,13 @@ size_t sg_host_count() sg_host_t* sg_host_list() { const simgrid::s4u::Engine* e = simgrid::s4u::Engine::get_instance(); - size_t host_count = e->get_host_count(); + size_t host_count = e->get_host_count(); + xbt_assert(host_count > 0, "There is no host!"); std::vector hosts = e->get_all_hosts(); sg_host_t* res = xbt_new(sg_host_t, hosts.size()); - memcpy(res, hosts.data(), sizeof(sg_host_t) * hosts.size()); + std::copy(begin(hosts), end(hosts), res); return res; } @@ -369,27 +457,14 @@ void sg_host_data_set(sg_host_t host, void* userdata) // XBT_ATTRIB_DEPRECATED_v { sg_host_set_data(host, userdata); } -void* sg_host_user(sg_host_t host) // XBT_ATTRIB_DEPRECATED_v328 -{ - return host->get_data(); -} -void sg_host_user_set(sg_host_t host, void* userdata) // XBT_ATTRIB_DEPRECATED_v328 -{ - host->set_data(userdata); -} -void sg_host_user_destroy(sg_host_t host) // XBT_ATTRIB_DEPRECATED_v328 -{ - host->set_data(nullptr); -} // ========= Disk related functions ============ void sg_host_get_disks(const_sg_host_t host, unsigned int* disk_count, sg_disk_t** disks) { std::vector list = host->get_disks(); *disk_count = list.size(); - *disks = static_cast(xbt_malloc(sizeof(sg_disk_t) * (*disk_count))); - for (size_t i = 0; i < *disk_count; i++) - (*disks)[i] = list[i]; + *disks = xbt_new(sg_disk_t, list.size()); + std::copy(begin(list), end(list), *disks); } // =========== user-level functions =============== @@ -499,8 +574,9 @@ int sg_host_is_on(const_sg_host_t host) /** @brief Get the properties of a host */ xbt_dict_t sg_host_get_properties(const_sg_host_t host) { - xbt_dict_t as_dict = xbt_dict_new_homogeneous(xbt_free_f); const std::unordered_map* props = host->get_properties(); + xbt_dict_t as_dict = xbt_dict_new_homogeneous(xbt_free_f); + if (props == nullptr) return nullptr; for (auto const& elm : *props) { @@ -590,7 +666,7 @@ double sg_host_route_bandwidth(const_sg_host_t from, const_sg_host_t to) // XBT_ void sg_host_sendto(sg_host_t from, sg_host_t to, double byte_amount) { - from->sendto(to, byte_amount); + simgrid::s4u::Comm::sendto(from, to, byte_amount); } /** @brief Displays debugging information about a host */