X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ae6b6e727bc0b3b7726f48fbac4449c3a9c479a2..3eaab01ff3aaf3b8addf247073237c5891f485d4:/src/surf/HostImpl.cpp diff --git a/src/surf/HostImpl.cpp b/src/surf/HostImpl.cpp index c19465cba8..48679307f8 100644 --- a/src/surf/HostImpl.cpp +++ b/src/surf/HostImpl.cpp @@ -1,21 +1,13 @@ -/* Copyright (c) 2013-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2013-2016. 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 +#include "src/plugins/vm/VirtualMachineImpl.hpp" +#include "src/surf/FileImpl.hpp" +#include -#include "src/simix/smx_private.h" -#include "cpu_cas01.hpp" -#include "src/surf/HostImpl.hpp" -#include "simgrid/sg_config.h" - -#include "network_interface.hpp" -#include "virtual_machine.hpp" - -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_host, surf, - "Logging specific to the SURF host module"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_host, surf, "Logging specific to the SURF host module"); simgrid::surf::HostModel *surf_host_model = nullptr; @@ -26,87 +18,71 @@ simgrid::surf::HostModel *surf_host_model = nullptr; namespace simgrid { namespace surf { -simgrid::xbt::Extension HostImpl::EXTENSION_ID; - /********* * Model * *********/ -HostImpl *HostModel::createHost(const char *name, routing::NetCard *netElm, Cpu *cpu){ - xbt_dynar_t storageList = (xbt_dynar_t)xbt_lib_get_or_null(storage_lib, name, ROUTING_STORAGE_HOST_LEVEL); - - HostImpl *host = new simgrid::surf::HostImpl(surf_host_model, name, storageList, cpu); - XBT_DEBUG("Create host %s with %ld mounted disks", name, xbt_dynar_length(host->p_storage)); - return host; -} /* 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::adjustWeightOfDummyCpuActions() +void HostModel::ignoreEmptyVmInPmLMM() { /* iterate for all virtual machines */ - for (VMModel::vm_list_t::iterator iter = - VMModel::ws_vms.begin(); - iter != VMModel::ws_vms.end(); ++iter) { - - VirtualMachine *ws_vm = &*iter; - Cpu *cpu = ws_vm->p_cpu; + for (s4u::VirtualMachine* ws_vm : vm::VirtualMachineImpl::allVms_) { + Cpu* cpu = ws_vm->pimpl_cpu; + int active_tasks = lmm_constraint_get_variable_amount(cpu->constraint()); - int is_active = lmm_constraint_used(cpu->getModel()->getMaxminSystem(), cpu->getConstraint()); + /* 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()); - if (is_active) { - /* some tasks exist on this VM */ - XBT_DEBUG("set the weight of the dummy CPU action on PM to 1"); - - /* FIXME: we should use lmm_update_variable_weight() ? */ - /* FIXME: If we assign 1.05 and 0.05, the system makes apparently wrong values. */ - ws_vm->action_->setPriority(1); - - } else { - /* no task exits on this VM */ - XBT_DEBUG("set the weight of the dummy CPU action on PM to 0"); - - ws_vm->action_->setPriority(0); - } + 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); } } -Action *HostModel::executeParallelTask(int host_nb, - sg_host_t *host_list, - double *flops_amount, - double *bytes_amount, - double rate){ -#define cost_or_zero(array,pos) ((array)?(array)[pos]:0.0) - Action *action =nullptr; - if ((host_nb == 1) - && (cost_or_zero(bytes_amount, 0) == 0.0)){ +/* Helper function for executeParallelTask */ +static inline double has_cost(double* array, int pos) +{ + if (array) + return array[pos]; + else + return -1.0; +} + +Action* HostModel::executeParallelTask(int host_nb, simgrid::s4u::Host** host_list, double* flops_amount, + double* bytes_amount, double rate) +{ + 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) - && (cost_or_zero(flops_amount, 0) == 0.0)) { - action = surf_network_model->communicate(host_list[0]->pimpl_netcard, - host_list[0]->pimpl_netcard, - bytes_amount[0], rate); - } else if ((host_nb == 2) - && (cost_or_zero(flops_amount, 0) == 0.0) - && (cost_or_zero(flops_amount, 1) == 0.0)) { - int i,nb = 0; + } else if ((host_nb == 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)) { + int nb = 0; double value = 0.0; - for (i = 0; i < host_nb * host_nb; i++) { - if (cost_or_zero(bytes_amount, i) > 0.0) { + for (int i = 0; i < host_nb * host_nb; i++) { + if (has_cost(bytes_amount, i) > 0.0) { nb++; - value = cost_or_zero(bytes_amount, i); + value = has_cost(bytes_amount, i); } } - if (nb == 1){ - action = surf_network_model->communicate(host_list[0]->pimpl_netcard, - host_list[1]->pimpl_netcard, - value, rate); + 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 - THROW_UNIMPLEMENTED; /* This model does not implement parallel tasks for more than 2 hosts */ -#undef cost_or_zero + 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; } @@ -114,300 +90,95 @@ Action *HostModel::executeParallelTask(int host_nb, /************ * Resource * ************/ - - -void HostImpl::classInit() -{ - if (!EXTENSION_ID.valid()) { - EXTENSION_ID = simgrid::s4u::Host::extension_create(); - } -} - -HostImpl::HostImpl(simgrid::surf::HostModel *model, const char *name, xbt_dynar_t storage, Cpu *cpu) - : Resource(model, name) - , PropertyHolder(nullptr) - , p_storage(storage), p_cpu(cpu) -{ - p_params.ramsize = 0; -} - -HostImpl::HostImpl(simgrid::surf::HostModel *model, const char *name, lmm_constraint_t constraint, - xbt_dynar_t storage, Cpu *cpu) - : Resource(model, name, constraint) - , PropertyHolder(nullptr) - , p_storage(storage), p_cpu(cpu) +HostImpl::HostImpl(s4u::Host* host) : piface_(host) { - p_params.ramsize = 0; -} - -/** @brief use destroy() instead of this destructor */ -HostImpl::~HostImpl() -{ -} - -void HostImpl::attach(simgrid::s4u::Host* host) -{ - if (p_host != nullptr) - xbt_die("Already attached to host %s", host->name().c_str()); - host->extension_set(this); - p_host = host; -} - -bool HostImpl::isOn() const { - return p_cpu->isOn(); -} -bool HostImpl::isOff() const { - return p_cpu->isOff(); -} -void HostImpl::turnOn(){ - if (isOff()) { - p_cpu->turnOn(); - simgrid::s4u::Host::onStateChange(*this->p_host); - } -} -void HostImpl::turnOff(){ - if (isOn()) { - p_cpu->turnOff(); - simgrid::s4u::Host::onStateChange(*this->p_host); - } + /* 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; } -simgrid::surf::Storage *HostImpl::findStorageOnMountList(const char* mount) +simgrid::surf::StorageImpl* HostImpl::findStorageOnMountList(const char* mount) { - simgrid::surf::Storage *st = nullptr; - s_mount_t mnt; - unsigned int cursor; + 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()); - XBT_DEBUG("Search for storage name '%s' on '%s'", mount, getName()); - xbt_dynar_foreach(p_storage,cursor,mnt) - { - XBT_DEBUG("See '%s'",mnt.name); - if(!strcmp(mount,mnt.name)){ - st = static_cast(mnt.storage); - break; - } - } - if(!st) xbt_die("Can't find mount '%s' for '%s'", mount, getName()); - return st; + return storage_.at(mount); } -xbt_dict_t HostImpl::getMountedStorageList() +void HostImpl::getAttachedStorageList(std::vector* storages) { - s_mount_t mnt; - unsigned int i; - xbt_dict_t storage_list = xbt_dict_new_homogeneous(nullptr); - char *storage_name = nullptr; - - xbt_dynar_foreach(p_storage,i,mnt){ - storage_name = (char *)static_cast(mnt.storage)->getName(); - xbt_dict_set(storage_list,mnt.name,storage_name,nullptr); - } - return storage_list; + for (auto s : storage_) + if (s.second->attach_ == piface_->cname()) + storages->push_back(s.second->piface_.name()); } -xbt_dynar_t HostImpl::getAttachedStorageList() +Action* HostImpl::close(surf_file_t fd) { - xbt_lib_cursor_t cursor; - char *key; - void **data; - xbt_dynar_t result = xbt_dynar_new(sizeof(void*), nullptr); - xbt_lib_foreach(storage_lib, cursor, key, data) { - if(xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL) != nullptr) { - simgrid::surf::Storage *storage = static_cast(xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL)); - if(!strcmp((const char*)storage->p_attach,this->getName())){ - xbt_dynar_push_as(result, void *, (void*)storage->getName()); - } - } - } - return result; -} - -Action *HostImpl::open(const char* fullpath) { - - simgrid::surf::Storage *st = nullptr; - s_mount_t mnt; - unsigned int cursor; - size_t longest_prefix_length = 0; - char *path = nullptr; - char *file_mount_name = nullptr; - char *mount_name = nullptr; - - XBT_DEBUG("Search for storage name for '%s' on '%s'", fullpath, getName()); - xbt_dynar_foreach(p_storage,cursor,mnt) - { - XBT_DEBUG("See '%s'",mnt.name); - file_mount_name = (char *) xbt_malloc ((strlen(mnt.name)+1)); - strncpy(file_mount_name,fullpath,strlen(mnt.name)+1); - file_mount_name[strlen(mnt.name)] = '\0'; - - if(!strcmp(file_mount_name,mnt.name) && strlen(mnt.name)>longest_prefix_length) - {/* The current mount name is found in the full path and is bigger than the previous*/ - longest_prefix_length = strlen(mnt.name); - st = static_cast(mnt.storage); - } - free(file_mount_name); - } - if(longest_prefix_length>0) - { /* Mount point found, split fullpath into mount_name and path+filename*/ - path = (char *) xbt_malloc ((strlen(fullpath)-longest_prefix_length+1)); - mount_name = (char *) xbt_malloc ((longest_prefix_length+1)); - strncpy(mount_name, fullpath, longest_prefix_length+1); - strncpy(path, fullpath+longest_prefix_length, strlen(fullpath)-longest_prefix_length+1); - path[strlen(fullpath)-longest_prefix_length] = '\0'; - mount_name[longest_prefix_length] = '\0'; - } - else - xbt_die("Can't find mount point for '%s' on '%s'", fullpath, getName()); - - XBT_DEBUG("OPEN %s on disk '%s'",path, st->getName()); - Action *action = st->open((const char*)mount_name, (const char*)path); - free((char*)path); - free((char*)mount_name); - return action; -} - -Action *HostImpl::close(surf_file_t fd) { - simgrid::surf::Storage *st = findStorageOnMountList(fd->mount); - XBT_DEBUG("CLOSE %s on disk '%s'",fd->name, st->getName()); + 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::Storage *st = findStorageOnMountList(fd->mount); - XBT_DEBUG("READ %s on disk '%s'",fd->name, st->getName()); +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::Storage *st = findStorageOnMountList(fd->mount); - XBT_DEBUG("WRITE %s on disk '%s'",fd->name, st->getName()); +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 (!fd){ +int HostImpl::unlink(surf_file_t fd) +{ + if (not fd) { XBT_WARN("No such file descriptor. Impossible to unlink"); return -1; } else { - simgrid::surf::Storage *st = findStorageOnMountList(fd->mount); + simgrid::surf::StorageImpl* st = findStorageOnMountList(fd->mount()); /* Check if the file is on this storage */ - if (!xbt_dict_get_or_null(st->p_content, fd->name)){ - XBT_WARN("File %s is not on disk %s. Impossible to unlink", fd->name, - st->getName()); + 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->name, st->getName()); - st->m_usedSize -= fd->size; + XBT_DEBUG("UNLINK %s on disk '%s'", fd->cname(), st->cname()); + st->usedSize_ -= fd->size(); // Remove the file from storage - xbt_dict_remove(st->p_content, fd->name); + st->content_->erase(fd->cname()); - xbt_free(fd->name); - xbt_free(fd->mount); - xbt_free(fd); return 0; } } } -sg_size_t HostImpl::getSize(surf_file_t fd){ - return fd->size; -} - -xbt_dynar_t HostImpl::getInfo( surf_file_t fd) +int HostImpl::fileMove(surf_file_t fd, const char* fullpath) { - simgrid::surf::Storage *st = findStorageOnMountList(fd->mount); - sg_size_t *psize = xbt_new(sg_size_t, 1); - *psize = fd->size; - xbt_dynar_t info = xbt_dynar_new(sizeof(void*), nullptr); - xbt_dynar_push_as(info, sg_size_t *, psize); - xbt_dynar_push_as(info, void *, fd->mount); - xbt_dynar_push_as(info, void *, (void *)st->getName()); - xbt_dynar_push_as(info, void *, st->p_typeId); - xbt_dynar_push_as(info, void *, st->p_contentType); - - return info; -} - -sg_size_t HostImpl::fileTell(surf_file_t fd){ - return fd->current_position; -} - -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){ /* Check if the new full path is on the same mount point */ - if(!strncmp((const char*)fd->mount, fullpath, strlen(fd->mount))) { - sg_size_t *psize, *new_psize; - psize = (sg_size_t*) - xbt_dict_get_or_null(findStorageOnMountList(fd->mount)->p_content, - fd->name); - new_psize = xbt_new(sg_size_t, 1); - *new_psize = *psize; - if (psize){// src file exists - xbt_dict_remove(findStorageOnMountList(fd->mount)->p_content, fd->name); - char *path = (char *) xbt_malloc ((strlen(fullpath)-strlen(fd->mount)+1)); - strncpy(path, fullpath+strlen(fd->mount), - strlen(fullpath)-strlen(fd->mount)+1); - xbt_dict_set(findStorageOnMountList(fd->mount)->p_content, path, - new_psize,nullptr); - XBT_DEBUG("Move file from %s to %s, size '%llu'",fd->name, fullpath, *psize); - free(path); + 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->name); + 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); + XBT_WARN("New full path %s is not on the same mount point: %s. Action has been canceled.", fullpath, fd->mount()); return -1; } } -xbt_dynar_t HostImpl::getVms() -{ - xbt_dynar_t dyn = xbt_dynar_new(sizeof(simgrid::surf::VirtualMachine*), nullptr); - - /* iterate for all virtual machines */ - for (simgrid::surf::VMModel::vm_list_t::iterator iter = - simgrid::surf::VMModel::ws_vms.begin(); - iter != simgrid::surf::VMModel::ws_vms.end(); ++iter) { - - simgrid::surf::VirtualMachine *ws_vm = &*iter; - if (this == ws_vm->getPm()->extension(simgrid::surf::HostImpl::EXTENSION_ID)) - xbt_dynar_push(dyn, &ws_vm); - } - - return dyn; -} - -void HostImpl::getParams(vm_params_t params) -{ - *params = p_params; -} - -void HostImpl::setParams(vm_params_t params) -{ - /* may check something here. */ - p_params = *params; -} - } }