X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4ab78e1e1fa8ed22fbeb559d33486669c3b313d9..66f8d6364c9d16e5ba469db4c93d98da40ae007a:/src/surf/HostImpl.cpp diff --git a/src/surf/HostImpl.cpp b/src/surf/HostImpl.cpp index 810757f8d6..b8ca1e8dd9 100644 --- a/src/surf/HostImpl.cpp +++ b/src/surf/HostImpl.cpp @@ -3,8 +3,8 @@ /* 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 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_host, surf, "Logging specific to the SURF host module"); @@ -106,135 +106,104 @@ 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; + + return storage_.at(mount); } 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); + for (auto mnt : storage_) { + storage_name = (char*)mnt.second->cname(); + xbt_dict_set(storage_list, mnt.first.c_str(), storage_name, nullptr); } return storage_list; } -xbt_dynar_t HostImpl::getAttachedStorageList() +void HostImpl::getAttachedStorageList(std::vector* storages) { 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( + simgrid::surf::StorageImpl* 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_->cname())) { - xbt_dynar_push_as(result, void*, (void*)storage->cname()); + if (not strcmp(static_cast(storage->attach_), piface_->cname())) { + storages->push_back(storage->cname()); } } } - return result; } Action* HostImpl::open(const char* fullpath) { - - simgrid::surf::Storage* st = nullptr; - s_mount_t mnt; - unsigned int cursor; + simgrid::surf::StorageImpl* st = nullptr; size_t longest_prefix_length = 0; - char* path = nullptr; - char* file_mount_name = nullptr; - char* mount_name = nullptr; + 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); - 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); + for (auto 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; } - 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'; + 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, st->cname()); - Action* action = st->open((const char*)mount_name, (const char*)path); - free((char*)path); - free((char*)mount_name); + 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); + 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 { @@ -242,7 +211,9 @@ int HostImpl::unlink(surf_file_t fd) st->usedSize_ -= fd->size; // Remove the file from storage - xbt_dict_remove(st->content_, fd->name); + sg_size_t* psize = st->content_->at(fd->name); + delete psize; + st->content_->erase(fd->name); xbt_free(fd->name); xbt_free(fd->mount); @@ -259,7 +230,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); @@ -267,7 +238,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; } @@ -279,7 +249,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; @@ -298,17 +267,17 @@ 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); + 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)); + sg_size_t* new_psize = new sg_size_t; *new_psize = *psize; - 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); + delete psize; + content->erase(fd->name); + std::string path = std::string(fullpath).substr(strlen(fd->mount), strlen(fullpath)); + content->insert({path.c_str(), new_psize}); 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);