X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6cf6f6913a06a9b7e64923042e25049b529e5cdc..672e33e4ec04de8fa4f69d453cf97de31478e721:/src/surf/HostImpl.cpp diff --git a/src/surf/HostImpl.cpp b/src/surf/HostImpl.cpp index 0b5ac06d5c..6d88f2734f 100644 --- a/src/surf/HostImpl.cpp +++ b/src/surf/HostImpl.cpp @@ -100,63 +100,11 @@ HostImpl::HostImpl(s4u::Host* host) : piface_(host) piface_->pimpl_ = this; } -simgrid::surf::StorageImpl* HostImpl::findStorageOnMountList(const char* mount) -{ - XBT_DEBUG("Search for storage name '%s' on '%s'", mount, piface_->cname()); - if (storage_.find(mount) == storage_.end()) - xbt_die("Can't find mount '%s' for '%s'", mount, piface_->cname()); - - return storage_.at(mount); -} - void HostImpl::getAttachedStorageList(std::vector* storages) { 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::StorageImpl* st = findStorageOnMountList(fd->mount()); - XBT_DEBUG("CLOSE %s on disk '%s'", fd->cname(), st->cname()); - return st->close(fd); -} - -Action* HostImpl::read(surf_file_t fd, sg_size_t size) -{ - simgrid::surf::StorageImpl* st = findStorageOnMountList(fd->mount()); - XBT_DEBUG("READ %s on disk '%s'", fd->cname(), st->cname()); - return st->read(fd, size); -} - -Action* HostImpl::write(surf_file_t fd, sg_size_t size) -{ - simgrid::surf::StorageImpl* st = findStorageOnMountList(fd->mount()); - XBT_DEBUG("WRITE %s on disk '%s'", fd->cname(), st->cname()); - return st->write(fd, size); -} - -int HostImpl::fileMove(surf_file_t fd, const char* fullpath) -{ - /* Check if the new full path is on the same mount point */ - if (not strncmp(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(fd->name()); - content->erase(fd->name()); - std::string path = std::string(fullpath).substr(strlen(fd->mount()), strlen(fullpath)); - content->insert({path.c_str(), new_size}); - XBT_DEBUG("Move file from %s to %s, size '%llu'", fd->cname(), fullpath, new_size); - return 0; - } else { - XBT_WARN("File %s doesn't exist", fd->cname()); - 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; - } + if (s.second->getHost() == piface_->getCname()) + storages->push_back(s.second->piface_.getName()); } }