modernize one more simcall

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

diff --git a/src/surf/HostImpl.cpp b/src/surf/HostImpl.cpp
index fa047d2..0b5ac06 100644 (file)
--- a/src/surf/HostImpl.cpp
+++ b/src/surf/HostImpl.cpp
@@ -4,6 +4,7 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "src/plugins/vm/VirtualMachineImpl.hpp"
+#include "src/surf/FileImpl.hpp"
 #include <string>
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_host, surf, "Logging specific to the SURF host module");
@@ -36,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.);
   }
 }
 
@@ -114,94 +118,43 @@ void HostImpl::getAttachedStorageList(std::vector<const char*>* storages)
 
 Action* HostImpl::close(surf_file_t fd)
 {
-  simgrid::surf::StorageImpl* st = findStorageOnMountList(fd->mount);
-  XBT_DEBUG("CLOSE %s on disk '%s'", fd->name, st->cname());
+  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->name, st->cname());
+  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->name, st->cname());
+  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->name) == st->content_->end()) {
-      XBT_WARN("File %s is not on disk %s. Impossible to unlink", fd->name, st->cname());
-      return -1;
-    } else {
-      XBT_DEBUG("UNLINK %s on disk '%s'", fd->name, st->cname());
-      st->usedSize_ -= fd->size;
-
-      // Remove the file from storage
-      st->content_->erase(fd->name);
-
-      return 0;
-    }
-  }
-}
-
-sg_size_t HostImpl::getSize(surf_file_t fd)
-{
-  return fd->size;
-}
-
-sg_size_t HostImpl::fileTell(surf_file_t fd)
-{
-  return fd->current_position;
-}
-
-int HostImpl::fileSeek(surf_file_t fd, sg_offset_t offset, int origin)
-{
-  switch (origin) {
-  case SEEK_SET:
-    fd->current_position = offset;
-    return 0;
-  case SEEK_CUR:
-    fd->current_position += offset;
-    return 0;
-  case SEEK_END:
-    fd->current_position = fd->size + offset;
-    return 0;
-  default:
-    return -1;
-  }
-}
-
 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((const char*)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(std::string(fd->name));
-      content->erase(fd->name);
-      std::string path = std::string(fullpath).substr(strlen(fd->mount), strlen(fullpath));
+  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->name, fullpath, 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->name);
+      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);
+    XBT_WARN("New full path %s is not on the same mount point: %s. Action has been canceled.", fullpath, fd->mount());
     return -1;
   }
 }