X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e6a1650c1da9d6a60f8fc5d12ebce854120ccdb7..4c1f0785858b31028eb208c42a33b30b9ec48676:/src/s4u/s4u_Host.cpp diff --git a/src/s4u/s4u_Host.cpp b/src/s4u/s4u_Host.cpp index ff0a2f6294..bfe5c6726d 100644 --- a/src/s4u/s4u_Host.cpp +++ b/src/s4u/s4u_Host.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2006-2020. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-2021. 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. */ @@ -6,6 +6,7 @@ #include "simgrid/host.h" #include "simgrid/kernel/routing/NetPoint.hpp" #include "simgrid/s4u/Actor.hpp" +#include "simgrid/s4u/Comm.hpp" #include "simgrid/s4u/Engine.hpp" #include "simgrid/s4u/Exec.hpp" #include "simgrid/s4u/VirtualMachine.hpp" @@ -36,15 +37,18 @@ Host::Host(const std::string& name) : name_(name) new surf::HostImpl(this); } -Host::~Host() +Host* Host::set_netpoint(kernel::routing::NetPoint* netpoint) { - xbt_assert(currently_destroying_, "Please call h->destroy() instead of manually deleting it."); + pimpl_netpoint_ = netpoint; + return this; +} +Host::~Host() +{ delete pimpl_; if (pimpl_netpoint_ != nullptr) // not removed yet by a children class Engine::get_instance()->netpoint_unregister(pimpl_netpoint_); delete pimpl_cpu; - delete mounts_; } /** @brief Fire the required callbacks and destroy the object @@ -56,12 +60,9 @@ 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; - } + on_destruction(*this); + Engine::get_instance()->host_unregister(std::string(name_)); + delete this; } Host* Host::by_name(const std::string& name) @@ -96,7 +97,7 @@ void Host::turn_on() void Host::turn_off() { if (is_on()) { - kernel::actor::ActorImpl* self = kernel::actor::ActorImpl::self(); + const kernel::actor::ActorImpl* self = kernel::actor::ActorImpl::self(); kernel::actor::simcall([this, self] { for (VirtualMachine* const& vm : vm::VirtualMachineImpl::allVms_) if (vm->get_pm() == this) { @@ -180,12 +181,9 @@ void Host::sendto(Host* dest, double byte_amount) sendto_async(dest, byte_amount)->wait(); } -ActivityPtr Host::sendto_async(Host* dest, double byte_amount) +CommPtr Host::sendto_async(Host* dest, double byte_amount) { - std::vector m_host_list = {this, dest}; - std::vector flops_amount = {0, 0}; - std::vector bytes_amount = {0, byte_amount, 0, 0}; - return this_actor::exec_init(m_host_list, flops_amount, bytes_amount)->start(); + return Comm::sendto_async(this, dest, byte_amount); } /** Get the properties assigned to a host */ @@ -200,14 +198,16 @@ 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. @@ -267,7 +267,12 @@ std::vector Host::get_disks() const return kernel::actor::simcall([this] { return this->pimpl_->get_disks(); }); } -void Host::add_disk(Disk* disk) +Disk* Host::create_disk(const std::string& name, double read_bandwidth, double write_bandwidth) +{ + return surf_disk_model->create_disk(name, read_bandwidth, write_bandwidth)->set_host(this)->get_iface(); +} + +void Host::add_disk(const Disk* disk) { kernel::actor::simcall([this, disk] { this->pimpl_->add_disk(disk); }); } @@ -276,28 +281,15 @@ void Host::remove_disk(const std::string& disk_name) { kernel::actor::simcall([this, disk_name] { this->pimpl_->remove_disk(disk_name); }); } -/** - * @ingroup simix_storage_management - * @brief Returns the list of storages attached to a host. - * @return a vector containing all storages attached to the host - */ -std::vector Host::get_attached_storages() const -{ - return kernel::actor::simcall([this] { return this->pimpl_->get_attached_storages(); }); -} -std::unordered_map const& Host::get_mounted_storages() +ExecPtr Host::exec_init(double flops) const { - kernel::actor::simcall([this] { - if (mounts_ == nullptr) - mounts_ = pimpl_->get_mounted_storages(); - }); - return *mounts_; + return this_actor::exec_init(flops); } ExecPtr Host::exec_async(double flops) const { - return this_actor::exec_init(flops); + return this_actor::exec_async(flops); } void Host::execute(double flops) const @@ -307,7 +299,7 @@ void Host::execute(double flops) const void Host::execute(double flops, double priority) const { - this_actor::exec_init(flops)->set_priority(1 / priority)->start()->wait(); + this_actor::exec_init(flops)->set_priority(1 / priority)->vetoable_start()->wait(); } } // namespace s4u @@ -369,29 +361,37 @@ xbt_dynar_t sg_hosts_as_dynar() // XBT_ATTRIB_DEPRECATED_v330 // ========= Layering madness ==============* // ========== User data Layer ========== -void* sg_host_data(const_sg_host_t host) +void* sg_host_get_data(const_sg_host_t host) { return host->get_data(); } -void sg_host_data_set(sg_host_t host, void* userdata) +void sg_host_set_data(sg_host_t host, void* userdata) { host->set_data(userdata); } -void* sg_host_user(sg_host_t host) // deprecated +void* sg_host_data(const_sg_host_t host) // XBT_ATTRIB_DEPRECATED_v330 +{ + return sg_host_get_data(host); +} +void sg_host_data_set(sg_host_t host, void* userdata) // XBT_ATTRIB_DEPRECATED_v330 +{ + 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) // deprecated +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) // deprecated +void sg_host_user_destroy(sg_host_t host) // XBT_ATTRIB_DEPRECATED_v328 { host->set_data(nullptr); } -// ========= storage related functions ============ -void sg_host_disks(const_sg_host_t host, unsigned int* disk_count, sg_disk_t** disks) +// ========= 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(); @@ -400,36 +400,19 @@ void sg_host_disks(const_sg_host_t host, unsigned int* disk_count, sg_disk_t** d (*disks)[i] = list[i]; } -xbt_dict_t sg_host_get_mounted_storage_list(sg_host_t host) // XBT_ATTRIB_DEPRECATED_v330 -{ - xbt_assert((host != nullptr), "Invalid parameters"); - xbt_dict_t res = xbt_dict_new_homogeneous(nullptr); - for (auto const& elm : host->get_mounted_storages()) { - const char* mount_name = elm.first.c_str(); - const simgrid::s4u::Storage* storage = elm.second; - xbt_dict_set(res, mount_name, (void*)storage->get_cname()); - } - - return res; -} - -xbt_dynar_t sg_host_get_attached_storage_list(const_sg_host_t host) -{ - xbt_dynar_t storage_dynar = xbt_dynar_new(sizeof(const char*), nullptr); - std::vector storage_vector = host->get_attached_storages(); - for (auto const& name : storage_vector) - xbt_dynar_push(storage_dynar, &name); - return storage_dynar; -} - // =========== user-level functions =============== // ================================================ /** @brief Returns the total speed of a host */ -double sg_host_speed(const_sg_host_t host) +double sg_host_get_speed(const_sg_host_t host) { return host->get_speed(); } +double sg_host_speed(const_sg_host_t host) // XBT_ATTRIB_DEPRECATED_v330 +{ + return sg_host_get_speed(host); +} + /** @brief Return the speed of the processor (in flop/s) at a given pstate. See also @ref plugin_energy. * * @param host host to test @@ -558,7 +541,7 @@ void sg_host_set_property_value(sg_host_t host, const char* name, const char* va * @param to where to * @param links [OUT] where to store the list of links (must exist, cannot be nullptr). */ -void sg_host_route(const_sg_host_t from, const_sg_host_t to, xbt_dynar_t links) +void sg_host_get_route(const_sg_host_t from, const_sg_host_t to, xbt_dynar_t links) { std::vector vlinks; from->route_to(to, vlinks, nullptr); @@ -571,7 +554,7 @@ void sg_host_route(const_sg_host_t from, const_sg_host_t to, xbt_dynar_t links) * @param from where from * @param to where to */ -double sg_host_route_latency(const_sg_host_t from, const_sg_host_t to) +double sg_host_get_route_latency(const_sg_host_t from, const_sg_host_t to) { std::vector vlinks; double res = 0; @@ -584,7 +567,7 @@ double sg_host_route_latency(const_sg_host_t from, const_sg_host_t to) * @param from where from * @param to where to */ -double sg_host_route_bandwidth(const_sg_host_t from, const_sg_host_t to) +double sg_host_get_route_bandwidth(const_sg_host_t from, const_sg_host_t to) { double min_bandwidth = -1.0; @@ -598,6 +581,21 @@ double sg_host_route_bandwidth(const_sg_host_t from, const_sg_host_t to) return min_bandwidth; } +void sg_host_route(const_sg_host_t from, const_sg_host_t to, xbt_dynar_t links) // XBT_ATTRIB_DEPRECATED_v330 +{ + sg_host_get_route(from, to, links); +} + +double sg_host_route_latency(const_sg_host_t from, const_sg_host_t to) // XBT_ATTRIB_DEPRECATED_v330 +{ + return sg_host_get_route_latency(from, to); +} + +double sg_host_route_bandwidth(const_sg_host_t from, const_sg_host_t to) // XBT_ATTRIB_DEPRECATED_v330 +{ + return sg_host_get_route_bandwidth(from, to); +} + void sg_host_sendto(sg_host_t from, sg_host_t to, double byte_amount) { from->sendto(to, byte_amount); @@ -648,7 +646,12 @@ const char* sg_host_self_get_name() return res; } -double sg_host_load(const_sg_host_t host) +double sg_host_get_load(const_sg_host_t host) { return host->get_load(); } + +double sg_host_load(const_sg_host_t host) // XBT_ATTRIB_DEPRECATED_v330 +{ + return sg_host_get_load(host); +}