X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c527cde5e1ee1bfe22dd33b3bbb77aaae8bcdcb1..51c23076e2b42ff07dc167dea1cb0e3a4ab3cf68:/src/surf/HostImpl.cpp diff --git a/src/surf/HostImpl.cpp b/src/surf/HostImpl.cpp index b05ca954c3..f4c07b3239 100644 --- a/src/surf/HostImpl.cpp +++ b/src/surf/HostImpl.cpp @@ -1,17 +1,10 @@ -/* 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 - -#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" +#include "src/plugins/vm/VirtualMachineImpl.hpp" +#include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_host, surf, "Logging specific to the SURF host module"); @@ -28,316 +21,94 @@ 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::adjustWeightOfDummyCpuActions() +/* 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 (VirtualMachine *ws_vm : VirtualMachine::allVms_) { - - Cpu* cpu = ws_vm->piface_->pimpl_cpu; - - int is_active = lmm_constraint_used(cpu->getModel()->getMaxminSystem(), cpu->getConstraint()); - - 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); - } + for (s4u::VirtualMachine* const& ws_vm : vm::VirtualMachineImpl::allVms_) { + Cpu* cpu = ws_vm->pimpl_cpu; + 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->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); + if (impact > 0) + ws_vm->getImpl()->action_->set_priority(1. / impact); + else + ws_vm->getImpl()->action_->set_priority(0.); } } -Action* HostModel::executeParallelTask(int host_nb, simgrid::s4u::Host** host_list, double* flops_amount, - double* bytes_amount, double rate) +/* Helper function for executeParallelTask */ +static inline double has_cost(double* array, int pos) +{ + if (array) + return array[pos]; + else + return -1.0; +} + +kernel::resource::Action* HostModel::execute_parallel(int host_nb, s4u::Host** 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)){ + 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) - && (cost_or_zero(flops_amount, 0) == 0.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) - && (cost_or_zero(flops_amount, 0) == 0.0) - && (cost_or_zero(flops_amount, 1) == 0.0)) { - int i,nb = 0; + } 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], 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"); + 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"); -#undef cost_or_zero - xbt_free(host_list); + } 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"); + } + delete[] host_list; + delete[] flops_amount; + delete[] bytes_amount; return action; } /************ * Resource * ************/ -HostImpl::HostImpl(s4u::Host* host, xbt_dynar_t storage) : PropertyHolder(nullptr), storage_(storage), piface_(host) +HostImpl::HostImpl(s4u::Host* host) : piface_(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; - params_.ramsize = 0; -} - -/** @brief use destroy() instead of this destructor */ -HostImpl::~HostImpl() = default; - -simgrid::surf::Storage *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_->name().c_str()); - xbt_dynar_foreach(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, piface_->name().c_str()); - return st; -} - -xbt_dict_t HostImpl::getMountedStorageList() -{ - s_mount_t mnt; - unsigned int i; - xbt_dict_t storage_list = xbt_dict_new_homogeneous(nullptr); - char *storage_name = nullptr; - - xbt_dynar_foreach(storage_,i,mnt){ - storage_name = (char *)static_cast(mnt.storage)->getName(); - xbt_dict_set(storage_list,mnt.name,storage_name,nullptr); - } - return storage_list; -} - -xbt_dynar_t HostImpl::getAttachedStorageList() -{ - 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->attach_, piface_->name().c_str())) { - 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, piface_->name().c_str()); - xbt_dynar_foreach(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, piface_->name().c_str()); - - 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()); - 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()); - 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()); - return st->write(fd, size); -} - -int HostImpl::unlink(surf_file_t fd) { - if (!fd){ - XBT_WARN("No such file descriptor. Impossible to unlink"); - return -1; - } else { - - simgrid::surf::Storage *st = findStorageOnMountList(fd->mount); - /* Check if the file is on this storage */ - if (!xbt_dict_get_or_null(st->content_, fd->name)){ - XBT_WARN("File %s is not on disk %s. Impossible to unlink", fd->name, - st->getName()); - return -1; - } else { - XBT_DEBUG("UNLINK %s on disk '%s'",fd->name, st->getName()); - st->usedSize_ -= fd->size; - - // Remove the file from storage - xbt_dict_remove(st->content_, fd->name); - - 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) +std::vector HostImpl::get_attached_storages() { - 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->typeId_); - xbt_dynar_push_as(info, void *, st->contentType_); - - return info; + 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; } -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)->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)->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)->content_, path, - new_psize,nullptr); - XBT_DEBUG("Move file from %s to %s, size '%llu'",fd->name, fullpath, *psize); - free(path); - 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; - } -} - -xbt_dynar_t HostImpl::getVms() -{ - xbt_dynar_t dyn = xbt_dynar_new(sizeof(simgrid::surf::VirtualMachine*), nullptr); - - for (VirtualMachine *ws_vm : VirtualMachine::allVms_) { - if (this == ws_vm->getPm()->pimpl_) - xbt_dynar_push(dyn, &ws_vm); - } - - return dyn; -} - -void HostImpl::getParams(vm_params_t params) -{ - *params = params_; -} - -void HostImpl::setParams(vm_params_t params) -{ - /* may check something here. */ - params_ = *params; -} - -}}