X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1d97620ce7ee1b0408e879c285eb837aca02a749..51c23076e2b42ff07dc167dea1cb0e3a4ab3cf68:/src/surf/HostImpl.cpp diff --git a/src/surf/HostImpl.cpp b/src/surf/HostImpl.cpp index 9a804338f6..f4c07b3239 100644 --- a/src/surf/HostImpl.cpp +++ b/src/surf/HostImpl.cpp @@ -1,10 +1,9 @@ -/* Copyright (c) 2013-2016. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2013-2018. 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/surf/FileImpl.hpp" #include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_host, surf, "Logging specific to the SURF host module"); @@ -22,22 +21,24 @@ 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() +/* 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::ignore_empty_vm_in_pm_LMM() { /* iterate for all virtual machines */ - for (s4u::VirtualMachine* ws_vm : vm::VirtualMachineImpl::allVms_) { + for (s4u::VirtualMachine* const& ws_vm : vm::VirtualMachineImpl::allVms_) { Cpu* cpu = ws_vm->pimpl_cpu; - int active_tasks = lmm_constraint_get_variable_amount(cpu->constraint()); + int active_tasks = cpu->get_constraint()->get_variable_amount(); /* 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()); + int impact = std::min(active_tasks, ws_vm->getImpl()->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); + if (impact > 0) + ws_vm->getImpl()->action_->set_priority(1. / impact); + else + ws_vm->getImpl()->action_->set_priority(0.); } } @@ -50,10 +51,10 @@ 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(int host_nb, s4u::Host** host_list, double* flops_amount, + double* bytes_amount, double rate) { - Action* action = nullptr; + kernel::resource::Action* action = nullptr; if ((host_nb == 1) && (has_cost(bytes_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)) { @@ -77,13 +78,16 @@ 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); + } + delete[] host_list; + delete[] flops_amount; + delete[] bytes_amount; return action; } @@ -97,114 +101,13 @@ 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->cname(), st->cname()); - return st->close(fd); -} - -Action* HostImpl::read(surf_file_t fd, sg_size_t size) -{ - simgrid::surf::StorageImpl* st = findStorageOnMountList(fd->mount()); - XBT_DEBUG("READ %s on disk '%s'", fd->cname(), st->cname()); - return st->read(fd, size); -} - -Action* HostImpl::write(surf_file_t fd, sg_size_t size) -{ - simgrid::surf::StorageImpl* st = findStorageOnMountList(fd->mount()); - XBT_DEBUG("WRITE %s on disk '%s'", fd->cname(), st->cname()); - return st->write(fd, size); -} - -int HostImpl::unlink(surf_file_t fd) -{ - 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->cname()) == st->content_->end()) { - XBT_WARN("File %s is not on disk %s. Impossible to unlink", fd->cname(), st->cname()); - return -1; - } else { - XBT_DEBUG("UNLINK %s on disk '%s'", fd->cname(), st->cname()); - st->usedSize_ -= fd->size(); - - // Remove the file from storage - st->content_->erase(fd->cname()); - - return 0; - } - } -} - -sg_size_t HostImpl::getSize(surf_file_t fd) +std::vector HostImpl::get_attached_storages() { - return fd->size(); -} - -sg_size_t HostImpl::fileTell(surf_file_t fd) -{ - return fd->tell(); -} - -int HostImpl::fileSeek(surf_file_t fd, sg_offset_t offset, int origin) -{ - switch (origin) { - case SEEK_SET: - fd->setPosition(offset); - return 0; - case SEEK_CUR: - fd->incrPosition(offset); - return 0; - case SEEK_END: - fd->setPosition(fd->size() + offset); - return 0; - default: - return -1; - } -} - -int HostImpl::fileMove(surf_file_t fd, const char* fullpath) -{ - /* Check if the new full path is on the same mount point */ - if (not strncmp(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(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->cname(), fullpath, new_size); - return 0; - } else { - XBT_WARN("File %s doesn't exist", fd->cname()); - 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; } }