X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/215555956513ba0d24707980da429e3c4a4a37a6..3287799e891ebf4d99a64c7d955955da1a37eb44:/src/surf/HostImpl.cpp diff --git a/src/surf/HostImpl.cpp b/src/surf/HostImpl.cpp index 9e5602fd0c..72f0f72f68 100644 --- a/src/surf/HostImpl.cpp +++ b/src/surf/HostImpl.cpp @@ -25,7 +25,7 @@ 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_) { @@ -38,12 +38,11 @@ void HostModel::adjustWeightOfDummyCpuActions() /* 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 */ + /* no task exist on this VM */ XBT_DEBUG("set the weight of the dummy CPU action on PM to 0"); ws_vm->pimpl_vm_->action_->setPriority(0); @@ -106,28 +105,13 @@ HostImpl::HostImpl(s4u::Host* host) : piface_(host) piface_->pimpl_ = this; } -/** @brief use destroy() instead of this destructor */ -HostImpl::~HostImpl() +simgrid::surf::StorageImpl* HostImpl::findStorageOnMountList(const char* mount) { - for (auto mnt : storage_) - xbt_free(mnt.name); -} - -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) + if (storage_.find(mount) == storage_.end()) xbt_die("Can't find mount '%s' for '%s'", mount, piface_->cname()); - return st; + + return storage_.at(mount); } xbt_dict_t HostImpl::getMountedStorageList() @@ -136,47 +120,35 @@ xbt_dict_t HostImpl::getMountedStorageList() 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); + storage_name = (char*)mnt.second->cname(); + xbt_dict_set(storage_list, mnt.first.c_str(), storage_name, nullptr); } return storage_list; } void HostImpl::getAttachedStorageList(std::vector* storages) { - xbt_lib_cursor_t cursor; - char* key; - void** data; - 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())) { - storages->push_back(storage->cname()); - } - } - } + for (auto s : storage_) + if (not strcmp(static_cast(s.second->attach_), piface_->cname())) + storages->push_back(s.second->piface_.name()); } Action* HostImpl::open(const char* fullpath) { - - simgrid::surf::Storage* st = nullptr; + simgrid::surf::StorageImpl* 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); + XBT_DEBUG("See '%s'", mnt.first.c_str()); + std::string file_mount_name = std::string(fullpath).substr(0, mnt.first.size()); + + if (file_mount_name == mnt.first && mnt.first.length() > longest_prefix_length) { + /* The current mount name is found in the full path and is bigger than the previous*/ + longest_prefix_length = mnt.first.length(); + st = mnt.second; } } if (longest_prefix_length > 0) { /* Mount point found, split fullpath into mount_name and path+filename*/ @@ -192,33 +164,33 @@ Action* HostImpl::open(const char* fullpath) 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 (st->content_->find(fd->name) == st->content_->end()) { XBT_WARN("File %s is not on disk %s. Impossible to unlink", fd->name, st->cname()); @@ -247,7 +219,7 @@ sg_size_t HostImpl::getSize(surf_file_t fd) xbt_dynar_t HostImpl::getInfo(surf_file_t fd) { - simgrid::surf::Storage* st = findStorageOnMountList(fd->mount); + simgrid::surf::StorageImpl* 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); @@ -255,7 +227,6 @@ xbt_dynar_t HostImpl::getInfo(surf_file_t fd) 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; } @@ -285,7 +256,7 @@ 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))) { + 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* psize = content->at(std::string(fd->name));