move some of the file mgmt logic out of the storage model

[simgrid.git] / src / surf / HostImpl.cpp

diff --git a/src/surf/HostImpl.cpp b/src/surf/HostImpl.cpp
index 9e03407..160224e 100644 (file)
--- a/src/surf/HostImpl.cpp
+++ b/src/surf/HostImpl.cpp
@@ -102,9 +102,9 @@ HostImpl::HostImpl(s4u::Host* host) : piface_(host)
 
 simgrid::surf::StorageImpl* HostImpl::findStorageOnMountList(const char* mount)
 {
-  XBT_DEBUG("Search for storage name '%s' on '%s'", mount, piface_->cname());
+  XBT_DEBUG("Search for storage name '%s' on '%s'", mount, piface_->getCname());
   if (storage_.find(mount) == storage_.end())
-    xbt_die("Can't find mount '%s' for '%s'", mount, piface_->cname());
+    xbt_die("Can't find mount '%s' for '%s'", mount, piface_->getCname());
 
   return storage_.at(mount);
 }
@@ -112,29 +112,41 @@ simgrid::surf::StorageImpl* HostImpl::findStorageOnMountList(const char* mount)
 void HostImpl::getAttachedStorageList(std::vector<const char*>* 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);
+    if (s.second->attach_ == piface_->getCname())
+      storages->push_back(s.second->piface_.getName());
 }
 
 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);
+  if (fd->tell() + size > fd->size()) {
+    if (fd->tell() > fd->size()) {
+      size = 0;
+    } else {
+      size = fd->size() - fd->tell();
+    }
+    fd->setPosition(fd->size());
+  } else
+    fd->incrPosition(size);
+
+  return st->read(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);
+  XBT_DEBUG("WRITE %s on disk '%s'. size '%llu/%llu'", fd->cname(), st->cname(), size, fd->size());
+
+  StorageAction* action = st->write(size);
+  action->file_         = fd;
+  /* Substract the part of the file that might disappear from the used sized on the storage element */
+  st->usedSize_ -= (fd->size() - fd->tell());
+  // If the storage is full before even starting to write
+  if (st->usedSize_ >= st->size_) {
+    action->setState(Action::State::failed);
+  }
+  return action;
 }
 
 }