X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f05e94875ba4e3844da6824b91b8258179a90d08..ebc355d0c96552d0bc2aa301d90723490337bca3:/src/surf/HostImpl.cpp diff --git a/src/surf/HostImpl.cpp b/src/surf/HostImpl.cpp index fa047d27f9..088e84864c 100644 --- a/src/surf/HostImpl.cpp +++ b/src/surf/HostImpl.cpp @@ -1,9 +1,11 @@ -/* Copyright (c) 2013-2016. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2013-2019. 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 "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"); @@ -11,7 +13,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_host, surf, "Logging specific to the SURF h simgrid::surf::HostModel *surf_host_model = nullptr; /************* - * Callbacks * + * Callbacks *t *************/ namespace simgrid { @@ -20,28 +22,8 @@ namespace surf { /********* * Model * *********/ - -/* Each VM has a dummy CPU action on the PM layer. This CPU action works as the - * constraint (capacity) of the VM in the PM layer. If the VM does not have any - * active task, the dummy CPU action must be deactivated, so that the VM does - * not get any CPU share in the PM layer. */ -void HostModel::ignoreEmptyVmInPmLMM() -{ - /* iterate for all virtual machines */ - for (s4u::VirtualMachine* ws_vm : vm::VirtualMachineImpl::allVms_) { - Cpu* cpu = ws_vm->pimpl_cpu; - int active_tasks = lmm_constraint_get_variable_amount(cpu->constraint()); - - /* The impact of the VM over its PM is the min between its vCPU amount and the amount of tasks it contains */ - int impact = std::min(active_tasks, ws_vm->pimpl_vm_->coreAmount()); - - XBT_DEBUG("set the weight of the dummy CPU action of VM%p on PM to %d (#tasks: %d)", ws_vm, impact, active_tasks); - ws_vm->pimpl_vm_->action_->setPriority(impact); - } -} - /* Helper function for executeParallelTask */ -static inline double has_cost(double* array, int pos) +static inline double has_cost(const double* array, size_t pos) { if (array) return array[pos]; @@ -49,19 +31,20 @@ static inline double has_cost(double* array, int pos) return -1.0; } -Action* HostModel::executeParallelTask(int host_nb, simgrid::s4u::Host** host_list, double* flops_amount, - double* bytes_amount, double rate) +kernel::resource::Action* HostModel::execute_parallel(const std::vector& host_list, + const double* flops_amount, const double* bytes_amount, + double rate) { - Action* action = nullptr; - if ((host_nb == 1) && (has_cost(bytes_amount, 0) <= 0)) { + 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_nb == 1) && (has_cost(flops_amount, 0) <= 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_nb == 2) && (has_cost(flops_amount, 0) <= 0) && (has_cost(flops_amount, 1) <= 0)) { + } 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 (int i = 0; i < host_nb * host_nb; i++) { + 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); @@ -76,13 +59,13 @@ Action* HostModel::executeParallelTask(int host_nb, simgrid::s4u::Host** host_li 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 + } 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"); - xbt_free(host_list); + } return action; } @@ -96,114 +79,80 @@ HostImpl::HostImpl(s4u::Host* host) : piface_(host) piface_->pimpl_ = this; } -simgrid::surf::StorageImpl* HostImpl::findStorageOnMountList(const char* mount) -{ - XBT_DEBUG("Search for storage name '%s' on '%s'", mount, piface_->cname()); - if (storage_.find(mount) == storage_.end()) - xbt_die("Can't find mount '%s' for '%s'", mount, piface_->cname()); - - return storage_.at(mount); -} - -void HostImpl::getAttachedStorageList(std::vector* storages) -{ - for (auto s : storage_) - if (s.second->attach_ == piface_->cname()) - storages->push_back(s.second->piface_.name()); -} - -Action* HostImpl::close(surf_file_t fd) -{ - simgrid::surf::StorageImpl* st = findStorageOnMountList(fd->mount); - XBT_DEBUG("CLOSE %s on disk '%s'", fd->name, st->cname()); - return st->close(fd); -} - -Action* HostImpl::read(surf_file_t fd, sg_size_t size) +HostImpl::~HostImpl() { - simgrid::surf::StorageImpl* st = findStorageOnMountList(fd->mount); - XBT_DEBUG("READ %s on disk '%s'", fd->name, st->cname()); - return st->read(fd, size); + /* 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()); + + SIMIX_display_process_status(); + THROWF(arg_error, 0, "%s", msg.c_str()); + } + for (auto const& arg : actors_at_boot_) + delete arg; + actors_at_boot_.clear(); } -Action* HostImpl::write(surf_file_t fd, sg_size_t size) +/** 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() { - simgrid::surf::StorageImpl* st = findStorageOnMountList(fd->mount); - XBT_DEBUG("WRITE %s on disk '%s'", fd->name, st->cname()); - return st->write(fd, size); + 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.c_str(), arg->code, nullptr, arg->host, arg->properties.get(), nullptr); + if (arg->kill_time >= 0) + actor->set_kill_time(arg->kill_time); + if (arg->auto_restart) + actor->set_auto_restart(arg->auto_restart); + if (arg->daemon_) + actor->daemonize(); + } } -int HostImpl::unlink(surf_file_t fd) +/** Kill all actors hosted here */ +void HostImpl::turn_off() { - if (not fd) { - XBT_WARN("No such file descriptor. Impossible to unlink"); - return -1; - } else { - - simgrid::surf::StorageImpl* st = findStorageOnMountList(fd->mount); - /* Check if the file is on this storage */ - if (st->content_->find(fd->name) == st->content_->end()) { - XBT_WARN("File %s is not on disk %s. Impossible to unlink", fd->name, st->cname()); - return -1; - } else { - XBT_DEBUG("UNLINK %s on disk '%s'", fd->name, st->cname()); - st->usedSize_ -= fd->size; - - // Remove the file from storage - st->content_->erase(fd->name); - - return 0; + 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); } } -} - -sg_size_t HostImpl::getSize(surf_file_t fd) + // 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) { + if (arg->auto_restart) + return false; + delete arg; + return true; + }); + actors_at_boot_.erase(elm, end(actors_at_boot_)); +} + +std::vector HostImpl::get_all_actors() { - return fd->size; + std::vector res; + for (auto& actor : process_list_) + res.push_back(actor.ciface()); + return res; } - -sg_size_t HostImpl::fileTell(surf_file_t fd) +size_t HostImpl::get_actor_count() { - return fd->current_position; + return process_list_.size(); } - -int HostImpl::fileSeek(surf_file_t fd, sg_offset_t offset, int origin) -{ - switch (origin) { - case SEEK_SET: - fd->current_position = offset; - return 0; - case SEEK_CUR: - fd->current_position += offset; - return 0; - case SEEK_END: - fd->current_position = fd->size + offset; - return 0; - default: - return -1; - } -} - -int HostImpl::fileMove(surf_file_t fd, const char* fullpath) +std::vector HostImpl::get_attached_storages() { - /* Check if the new full path is on the same mount point */ - if (not strncmp((const char*)fd->mount, fullpath, strlen(fd->mount))) { - std::map* content = findStorageOnMountList(fd->mount)->content_; - if (content->find(fd->name) != content->end()) { // src file exists - sg_size_t new_size = content->at(std::string(fd->name)); - content->erase(fd->name); - std::string path = std::string(fullpath).substr(strlen(fd->mount), strlen(fullpath)); - content->insert({path.c_str(), new_size}); - XBT_DEBUG("Move file from %s to %s, size '%llu'", fd->name, fullpath, new_size); - return 0; - } else { - XBT_WARN("File %s doesn't exist", fd->name); - return -1; - } - } else { - XBT_WARN("New full path %s is not on the same mount point: %s. Action has been canceled.", fullpath, fd->mount); - return -1; - } + std::vector storages; + for (auto const& s : storage_) + if (s.second->getHost() == piface_->get_cname()) + storages.push_back(s.second->piface_.get_cname()); + return storages; } }