X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8f4c00936fdabbd005cbf15ca132ceb248f72dcd..51c23076e2b42ff07dc167dea1cb0e3a4ab3cf68:/src/surf/HostImpl.cpp diff --git a/src/surf/HostImpl.cpp b/src/surf/HostImpl.cpp index 5366a5d6fb..f4c07b3239 100644 --- a/src/surf/HostImpl.cpp +++ b/src/surf/HostImpl.cpp @@ -1,4 +1,4 @@ -/* 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. */ @@ -21,33 +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::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 (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 = cpu->get_constraint()->get_variable_amount(); - int is_active = lmm_constraint_used(cpu->model()->getMaxminSystem(), cpu->constraint()); - - 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->pimpl_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"); + /* 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()); - ws_vm->pimpl_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); + if (impact > 0) + ws_vm->getImpl()->action_->set_priority(1. / impact); + else + ws_vm->getImpl()->action_->set_priority(0.); } } @@ -59,10 +50,11 @@ static inline double has_cost(double* array, int pos) else 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)) { @@ -86,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; } @@ -106,200 +101,13 @@ HostImpl::HostImpl(s4u::Host* host) : piface_(host) piface_->pimpl_ = this; } -/** @brief use destroy() instead of this destructor */ -HostImpl::~HostImpl() = default; - -simgrid::surf::Storage* HostImpl::findStorageOnMountList(const char* mount) -{ - simgrid::surf::Storage* st = nullptr; - - XBT_DEBUG("Search for storage name '%s' on '%s'", mount, piface_->cname()); - for (auto mnt : storage_) { - 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_->cname()); - return st; -} - -xbt_dict_t HostImpl::getMountedStorageList() -{ - xbt_dict_t storage_list = xbt_dict_new_homogeneous(nullptr); - char* storage_name = nullptr; - - for (auto mnt : storage_) { - storage_name = (char*)static_cast(mnt.storage)->cname(); - xbt_dict_set(storage_list, mnt.name, storage_name, nullptr); - } - return storage_list; -} - -std::vector HostImpl::getAttachedStorageList() -{ - xbt_lib_cursor_t cursor; - char* key; - void** data; - std::vector result; - 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(static_cast(storage->attach_), piface_->cname())) { - result.push_back(storage->cname()); - } - } - } - return result; -} - -Action* HostImpl::open(const char* fullpath) +std::vector HostImpl::get_attached_storages() { - - simgrid::surf::Storage* st = nullptr; - size_t longest_prefix_length = 0; - std::string path; - std::string mount_name; - - XBT_DEBUG("Search for storage name for '%s' on '%s'", fullpath, piface_->cname()); - for (auto mnt : storage_) { - XBT_DEBUG("See '%s'", mnt.name); - std::string file_mount_name = std::string(fullpath).substr(0, strlen(mnt.name)); - - if (!strcmp(file_mount_name.c_str(), 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); - } - } - if (longest_prefix_length > 0) { /* Mount point found, split fullpath into mount_name and path+filename*/ - mount_name = std::string(fullpath).substr(0, longest_prefix_length); - path = std::string(fullpath).substr(longest_prefix_length, strlen(fullpath)); - } else - xbt_die("Can't find mount point for '%s' on '%s'", fullpath, piface_->cname()); - - XBT_DEBUG("OPEN %s on disk '%s'", path.c_str(), st->cname()); - Action* action = st->open(mount_name.c_str(), path.c_str()); - 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->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->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->cname()); - 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->cname()); - return -1; - } else { - XBT_DEBUG("UNLINK %s on disk '%s'", fd->name, st->cname()); - 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) -{ - 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->cname()); - xbt_dynar_push_as(info, void*, st->typeId_); - xbt_dynar_push_as(info, void*, st->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 = (sg_size_t*)xbt_dict_get_or_null(findStorageOnMountList(fd->mount)->content_, fd->name); - if (psize) { // src file exists - sg_size_t* new_psize = xbt_new(sg_size_t, 1); - *new_psize = *psize; - xbt_dict_remove(findStorageOnMountList(fd->mount)->content_, fd->name); - std::string path = std::string(fullpath).substr(strlen(fd->mount), strlen(fullpath)); - xbt_dict_set(findStorageOnMountList(fd->mount)->content_, path.c_str(), new_psize, nullptr); - XBT_DEBUG("Move file from %s to %s, size '%llu'", fd->name, fullpath, *psize); - 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; } }