X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ae701792ae00d4b822b890780619878e0a624980..183a6118a95c570b0c66695505dab7dbebc0c7b3:/src/surf/HostImpl.cpp diff --git a/src/surf/HostImpl.cpp b/src/surf/HostImpl.cpp index 407c77fd31..2cb9e021f2 100644 --- a/src/surf/HostImpl.cpp +++ b/src/surf/HostImpl.cpp @@ -3,7 +3,6 @@ /* 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/surf/HostImpl.hpp" #include "src/plugins/vm/VirtualMachineImpl.hpp" #include @@ -26,29 +25,18 @@ namespace surf { * 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 (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->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->pimpl_vm_->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); + ws_vm->pimpl_vm_->action_->setPriority(impact); } } @@ -60,6 +48,7 @@ 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) { @@ -107,125 +96,53 @@ 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::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()); - 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) + if (storage_.find(mount) == storage_.end()) xbt_die("Can't find mount '%s' for '%s'", mount, piface_->cname()); - 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)->cname(); - 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(static_cast(storage->attach_), piface_->cname())) { - xbt_dynar_push_as(result, void*, (void*)storage->cname()); - } - } - } - return result; + return storage_.at(mount); } -Action* HostImpl::open(const char* fullpath) +void HostImpl::getAttachedStorageList(std::vector* storages) { - - simgrid::surf::Storage* st = nullptr; - s_mount_t mnt; - unsigned int cursor; - 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()); - xbt_dynar_foreach (storage_, cursor, mnt) { - 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; + 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::Storage* st = findStorageOnMountList(fd->mount); + 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) { - simgrid::surf::Storage* st = findStorageOnMountList(fd->mount); + simgrid::surf::StorageImpl* 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); + simgrid::surf::StorageImpl* 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) { + 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->content_, fd->name)) { + 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 { @@ -233,7 +150,7 @@ int HostImpl::unlink(surf_file_t fd) st->usedSize_ -= fd->size; // Remove the file from storage - xbt_dict_remove(st->content_, fd->name); + st->content_->erase(fd->name); xbt_free(fd->name); xbt_free(fd->mount); @@ -248,21 +165,6 @@ 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; @@ -270,7 +172,6 @@ sg_size_t HostImpl::fileTell(surf_file_t fd) int HostImpl::fileSeek(surf_file_t fd, sg_offset_t offset, int origin) { - switch (origin) { case SEEK_SET: fd->current_position = offset; @@ -289,15 +190,14 @@ int HostImpl::fileSeek(surf_file_t fd, sg_offset_t offset, int origin) 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); + 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)); - 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); + 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);