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 9a80433..160224e 100644 (file)
--- a/src/surf/HostImpl.cpp
+++ b/src/surf/HostImpl.cpp
@@ -37,7 +37,10 @@ void HostModel::ignoreEmptyVmInPmLMM()
     int impact = std::min(active_tasks, ws_vm->pimpl_vm_->coreAmount());
 
     XBT_DEBUG("set the weight of the dummy CPU action of VM%p on PM to %d (#tasks: %d)", ws_vm, impact, active_tasks);
-    ws_vm->pimpl_vm_->action_->setPriority(impact);
+    if (impact > 0)
+      ws_vm->pimpl_vm_->action_->setSharingWeight(1. / impact);
+    else
+      ws_vm->pimpl_vm_->action_->setSharingWeight(0.);
   }
 }
 
@@ -99,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);
 }
@@ -109,102 +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);
-}
-
-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::unlink(surf_file_t fd)
-{
-  if (not fd) {
-    XBT_WARN("No such file descriptor. Impossible to unlink");
-    return -1;
-  } else {
-
-    simgrid::surf::StorageImpl* st = findStorageOnMountList(fd->mount());
-    /* Check if the file is on this storage */
-    if (st->content_->find(fd->cname()) == st->content_->end()) {
-      XBT_WARN("File %s is not on disk %s. Impossible to unlink", fd->cname(), st->cname());
-      return -1;
+  if (fd->tell() + size > fd->size()) {
+    if (fd->tell() > fd->size()) {
+      size = 0;
     } else {
-      XBT_DEBUG("UNLINK %s on disk '%s'", fd->cname(), st->cname());
-      st->usedSize_ -= fd->size();
-
-      // Remove the file from storage
-      st->content_->erase(fd->cname());
-
-      return 0;
+      size = fd->size() - fd->tell();
     }
-  }
-}
-
-sg_size_t HostImpl::getSize(surf_file_t fd)
-{
-  return fd->size();
-}
+    fd->setPosition(fd->size());
+  } else
+    fd->incrPosition(size);
 
-sg_size_t HostImpl::fileTell(surf_file_t fd)
-{
-  return fd->tell();
+  return st->read(size);
 }
 
-int HostImpl::fileSeek(surf_file_t fd, sg_offset_t offset, int origin)
-{
-  switch (origin) {
-  case SEEK_SET:
-    fd->setPosition(offset);
-    return 0;
-  case SEEK_CUR:
-    fd->incrPosition(offset);
-    return 0;
-  case SEEK_END:
-    fd->setPosition(fd->size() + offset);
-    return 0;
-  default:
-    return -1;
-  }
-}
-
-int HostImpl::fileMove(surf_file_t fd, const char* fullpath)
+Action* HostImpl::write(surf_file_t fd, sg_size_t size)
 {
-  /* Check if the new full path is on the same mount point */
-  if (not strncmp(fd->mount(), fullpath, strlen(fd->mount()))) {
-    std::map<std::string, sg_size_t>* 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;
+  simgrid::surf::StorageImpl* st = findStorageOnMountList(fd->mount());
+  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;
 }
 
 }