X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2c35f563c1eb2624079c12f7ab27453e809ff599..1d66ac4c2a43e3df812bd855d3c385b23127a57d:/src/surf/HostImpl.cpp diff --git a/src/surf/HostImpl.cpp b/src/surf/HostImpl.cpp index f1a1b1ed4d..02796851e1 100644 --- a/src/surf/HostImpl.cpp +++ b/src/surf/HostImpl.cpp @@ -1,16 +1,17 @@ -/* Copyright (c) 2013-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2013-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. */ +#include "simgrid/kernel/routing/NetPoint.hpp" +#include "simgrid/s4u/Engine.hpp" +#include "simgrid/s4u/Host.hpp" #include "src/plugins/vm/VirtualMachineImpl.hpp" #include "src/simix/smx_private.hpp" #include -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_host, surf, "Logging specific to the SURF host module"); - -simgrid::surf::HostModel *surf_host_model = nullptr; +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(res_host, ker_resource, "Host resources agregate CPU, networking and I/O features"); /************* * Callbacks *t @@ -22,71 +23,30 @@ namespace surf { /********* * Model * *********/ -/* Helper function for executeParallelTask */ -static inline double has_cost(const double* array, size_t pos) -{ - if (array) - return array[pos]; - return -1.0; -} - -kernel::resource::Action* HostModel::execute_parallel(const std::vector& host_list, - const double* flops_amount, const double* bytes_amount, - double rate) -{ - kernel::resource::Action* action = nullptr; - if ((host_list.size() == 1) && (has_cost(bytes_amount, 0) <= 0) && (has_cost(flops_amount, 0) > 0)) { - action = host_list[0]->pimpl_cpu->execution_start(flops_amount[0]); - } else if ((host_list.size() == 1) && (has_cost(flops_amount, 0) <= 0)) { - action = surf_network_model->communicate(host_list[0], host_list[0], bytes_amount[0], rate); - } else if ((host_list.size() == 2) && (has_cost(flops_amount, 0) <= 0) && (has_cost(flops_amount, 1) <= 0)) { - int nb = 0; - double value = 0.0; - - for (size_t i = 0; i < host_list.size() * host_list.size(); i++) { - if (has_cost(bytes_amount, i) > 0.0) { - nb++; - value = has_cost(bytes_amount, i); - } - } - if (nb == 1) { - action = surf_network_model->communicate(host_list[0], host_list[1], value, rate); - } else if (nb == 0) { - xbt_die("Cannot have a communication with no flop to exchange in this model. You should consider using the " - "ptask model"); - } else { - xbt_die("Cannot have a communication that is not a simple point-to-point in this model. You should consider " - "using the ptask model"); - } - } else { - xbt_die( - "This model only accepts one of the following. You should consider using the ptask model for the other cases.\n" - " - execution with one host only and no communication\n" - " - Self-comms with one host only\n" - " - Communications with two hosts and no computation"); - } - return action; -} - /************ * Resource * ************/ -HostImpl::HostImpl(s4u::Host* host) : piface_(host) +HostImpl::HostImpl(const std::string& name, s4u::Host* piface) : piface_(this), name_(name) +{ + xbt_assert(s4u::Host::by_name_or_null(name_) == nullptr, "Refusing to create a second host named '%s'.", get_cname()); + s4u::Engine::get_instance()->host_register(name_, piface); +} + +HostImpl::HostImpl(const std::string& name) : piface_(this), name_(name) { - /* The VM wants to reinstall a new HostImpl, but we don't want to leak the previously existing one */ - delete piface_->pimpl_; - piface_->pimpl_ = this; + xbt_assert(s4u::Host::by_name_or_null(name_) == nullptr, "Refusing to create a second host named '%s'.", get_cname()); + s4u::Engine::get_instance()->host_register(name_, &piface_); } HostImpl::~HostImpl() { - /* All processes should be gone when the host is turned off (by the end of the simulation). */ - if (not process_list_.empty()) { - std::string msg = std::string("Shutting down host, but it's not empty:"); - for (auto const& process : process_list_) - msg += "\n\t" + std::string(process.get_name()); + /* 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()); - SIMIX_display_process_status(); + simix_global->display_all_actor_status(); xbt_die("%s", msg.c_str()); } for (auto const& arg : actors_at_boot_) @@ -97,16 +57,27 @@ HostImpl::~HostImpl() d->destroy(); } +/** @brief Fire the required callbacks and destroy the object + * + * Don't delete directly a Host, call h->destroy() instead. + */ +void HostImpl::destroy() +{ + s4u::Host::on_destruction(*this->get_iface()); + s4u::Engine::get_instance()->host_unregister(std::string(name_)); + delete this; +} + /** Re-starts all the actors that are marked as restartable. * * Weird things will happen if you turn on a host that is already on. S4U is fool-proof, not this. */ -void HostImpl::turn_on() +void HostImpl::turn_on() const { for (auto const& arg : actors_at_boot_) { XBT_DEBUG("Booting Actor %s(%s) right now", arg->name.c_str(), arg->host->get_cname()); - simgrid::kernel::actor::ActorImplPtr actor = simgrid::kernel::actor::ActorImpl::create( - arg->name, arg->code, nullptr, arg->host, arg->properties.get(), nullptr); + simgrid::kernel::actor::ActorImplPtr actor = + simgrid::kernel::actor::ActorImpl::create(arg->name, arg->code, nullptr, arg->host, arg->properties, nullptr); if (arg->on_exit) *actor->on_exit = *arg->on_exit; if (arg->kill_time >= 0) @@ -119,18 +90,16 @@ void HostImpl::turn_on() } /** Kill all actors hosted here */ -void HostImpl::turn_off() +void HostImpl::turn_off(const kernel::actor::ActorImpl* issuer) { - if (not process_list_.empty()) { - for (auto& actor : process_list_) { - XBT_DEBUG("Killing Actor %s@%s on behalf of %s which turned off that host.", actor.get_cname(), - actor.get_host()->get_cname(), SIMIX_process_self()->get_cname()); - SIMIX_process_self()->kill(&actor); - } + for (auto& actor : actor_list_) { + XBT_DEBUG("Killing Actor %s@%s on behalf of %s which turned off that host.", actor.get_cname(), + actor.get_host()->get_cname(), issuer->get_cname()); + issuer->kill(&actor); } // When a host is turned off, we want to keep only the actors that should restart for when it will boot again. // Then get rid of the others. - auto elm = remove_if(begin(actors_at_boot_), end(actors_at_boot_), [](kernel::actor::ProcessArg* arg) { + auto elm = remove_if(begin(actors_at_boot_), end(actors_at_boot_), [](const kernel::actor::ProcessArg* arg) { if (arg->auto_restart) return false; delete arg; @@ -142,31 +111,63 @@ void HostImpl::turn_off() std::vector HostImpl::get_all_actors() { std::vector res; - for (auto& actor : process_list_) - res.push_back(actor.ciface()); + for (auto& actor : actor_list_) + res.emplace_back(actor.get_ciface()); return res; } -size_t HostImpl::get_actor_count() +size_t HostImpl::get_actor_count() const { - return process_list_.size(); + return actor_list_.size(); } -std::vector HostImpl::get_disks() +std::vector HostImpl::get_disks() const { std::vector disks; for (auto const& d : disks_) - disks.push_back(&d->piface_); + disks.push_back(d->get_iface()); return disks; } -std::vector HostImpl::get_attached_storages() +HostImpl* HostImpl::set_disks(const std::vector& disks) +{ + disks_ = disks; + for (auto d : disks_) + d->set_host(&piface_); + return this; +} + +s4u::Disk* HostImpl::create_disk(const std::string& name, double read_bandwidth, double write_bandwidth) +{ + auto disk = piface_.get_netpoint()->get_englobing_zone()->get_disk_model()->create_disk(name, read_bandwidth, + write_bandwidth); + return disk->set_host(&piface_)->get_iface(); +} + +void HostImpl::add_disk(const s4u::Disk* disk) { - std::vector storages; - for (auto const& s : storage_) - if (s.second->get_host() == piface_->get_cname()) - storages.push_back(s.second->piface_.get_cname()); - return storages; + disks_.push_back(disk->get_impl()); } +void HostImpl::remove_disk(const std::string& disk_name) +{ + auto position = disks_.begin(); + for (auto const& d : disks_) { + if (d->get_name() == disk_name) { + disks_.erase(position); + break; + } + position++; + } +} + +void HostImpl::seal() +{ + if (sealed_) { + return; + } + // seals host's CPU + get_iface()->pimpl_cpu->seal(); + sealed_ = true; +} } // namespace surf } // namespace simgrid