X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3f38d568f0b8155a643e15a3171177060ee15c3c..def26f4b4bce4809f6708780a57a675ee382d6e4:/src/s4u/s4u_file.cpp diff --git a/src/s4u/s4u_file.cpp b/src/s4u/s4u_file.cpp index 8c90137942..af4a32d907 100644 --- a/src/s4u/s4u_file.cpp +++ b/src/s4u/s4u_file.cpp @@ -45,7 +45,7 @@ File::File(std::string fullpath, sg_host_t host, void* userdata) : path_(fullpat pimpl_ = simgrid::simix::kernelImmediate([this, st, path] { return new simgrid::surf::FileImpl(st, path, mount_point); }); - onStorage = st; + localStorage = st; } File::~File() @@ -55,28 +55,28 @@ File::~File() sg_size_t File::read(sg_size_t size) { - XBT_DEBUG("READ %s on disk '%s'", getPath(), onStorage->getCname()); + XBT_DEBUG("READ %s on disk '%s'", getPath(), localStorage->getCname()); // if the current position is close to the end of the file, we may not be able to read the requested size - sg_size_t read_size = onStorage->read(std::min(size, this->size() - this->tell())); + sg_size_t read_size = localStorage->read(std::min(size, this->size() - this->tell())); pimpl_->incrPosition(read_size); return read_size; } sg_size_t File::write(sg_size_t size) { - XBT_DEBUG("WRITE %s on disk '%s'. size '%llu/%llu'", getPath(), onStorage->getCname(), size, this->size()); + XBT_DEBUG("WRITE %s on disk '%s'. size '%llu/%llu'", getPath(), localStorage->getCname(), size, this->size()); // If the storage is full before even starting to write - if (onStorage->getSizeUsed() >= onStorage->getSize()) + if (localStorage->getSizeUsed() >= localStorage->getSize()) return 0; /* Substract the part of the file that might disappear from the used sized on the storage element */ - onStorage->decrUsedSize(this->size() - this->tell()); + localStorage->decrUsedSize(this->size() - this->tell()); - sg_size_t write_size = onStorage->write(size); + sg_size_t write_size = localStorage->write(size); pimpl_->incrPosition(write_size); pimpl_->setSize(this->tell()); - onStorage->getContent()->erase(pimpl_->getName()); - onStorage->getContent()->insert({pimpl_->getName(), this->size()}); + localStorage->getContent()->erase(pimpl_->getName()); + localStorage->getContent()->insert({pimpl_->getName(), this->size()}); return write_size; }