X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0fa9ed41d1824b9f5f37f3e3e1e616886a410b18..503aa37006d22d261b792dd00d526976fafa7052:/src/plugins/file_system/s4u_FileSystem.cpp

diff --git a/src/plugins/file_system/s4u_FileSystem.cpp b/src/plugins/file_system/s4u_FileSystem.cpp
index e6a7b28fe0..6c37927962 100644
--- a/src/plugins/file_system/s4u_FileSystem.cpp
+++ b/src/plugins/file_system/s4u_FileSystem.cpp
@@ -9,6 +9,7 @@
 #include "src/surf/HostImpl.hpp"
 #include "src/surf/xml/platf_private.hpp"
 #include "xbt/config.hpp"
+#include "xbt/parse_units.hpp"
 
 #include <algorithm>
 #include <boost/algorithm/string.hpp>
@@ -93,52 +94,56 @@ File::File(const std::string& fullpath, void* userdata) : File(fullpath, Host::c
 
 File::File(const std::string& fullpath, sg_host_t host, void* userdata) : fullpath_(fullpath)
 {
-  this->set_data(userdata);
-  // this cannot fail because we get a xbt_die if the mountpoint does not exist
-  if (not host->get_mounted_storages().empty()) {
-    local_storage_ = find_local_storage_on(host);
-  }
-  if (not host->get_disks().empty()) {
-    local_disk_ = find_local_disk_on(host);
-  }
+  kernel::actor::simcall([this, &host, userdata] {
+    this->set_data(userdata);
+    // this cannot fail because we get a xbt_die if the mountpoint does not exist
+    if (not host->get_mounted_storages().empty()) {
+      local_storage_ = find_local_storage_on(host);
+    }
+    if (not host->get_disks().empty()) {
+      local_disk_ = find_local_disk_on(host);
+    }
 
-  // assign a file descriptor id to the newly opened File
-  FileDescriptorHostExt* ext = host->extension<simgrid::s4u::FileDescriptorHostExt>();
-  if (ext->file_descriptor_table == nullptr) {
-    ext->file_descriptor_table.reset(new std::vector<int>(sg_storage_max_file_descriptors));
-    std::iota(ext->file_descriptor_table->rbegin(), ext->file_descriptor_table->rend(), 0); // Fill with ..., 1, 0.
-  }
-  xbt_assert(not ext->file_descriptor_table->empty(), "Too much files are opened! Some have to be closed.");
-  desc_id = ext->file_descriptor_table->back();
-  ext->file_descriptor_table->pop_back();
+    // assign a file descriptor id to the newly opened File
+    FileDescriptorHostExt* ext = host->extension<simgrid::s4u::FileDescriptorHostExt>();
+    if (ext->file_descriptor_table == nullptr) {
+      ext->file_descriptor_table.reset(new std::vector<int>(sg_storage_max_file_descriptors));
+      std::iota(ext->file_descriptor_table->rbegin(), ext->file_descriptor_table->rend(), 0); // Fill with ..., 1, 0.
+    }
+    xbt_assert(not ext->file_descriptor_table->empty(), "Too much files are opened! Some have to be closed.");
+    desc_id = ext->file_descriptor_table->back();
+    ext->file_descriptor_table->pop_back();
 
-  XBT_DEBUG("\tOpen file '%s'", path_.c_str());
-  std::map<std::string, sg_size_t>* content = nullptr;
-  if (local_storage_)
-    content = local_storage_->extension<FileSystemStorageExt>()->get_content();
+    XBT_DEBUG("\tOpen file '%s'", path_.c_str());
+    std::map<std::string, sg_size_t>* content = nullptr;
+    if (local_storage_)
+      content = local_storage_->extension<FileSystemStorageExt>()->get_content();
 
-  if (local_disk_)
-    content = local_disk_->extension<FileSystemDiskExt>()->get_content();
+    if (local_disk_)
+      content = local_disk_->extension<FileSystemDiskExt>()->get_content();
 
-  // if file does not exist create an empty file
-  if (content) {
-    auto sz = content->find(path_);
-    if (sz != content->end()) {
-      size_ = sz->second;
-    } else {
-      size_ = 0;
-      content->insert({path_, size_});
-      XBT_DEBUG("File '%s' was not found, file created.", path_.c_str());
+    // if file does not exist create an empty file
+    if (content) {
+      auto sz = content->find(path_);
+      if (sz != content->end()) {
+        size_ = sz->second;
+      } else {
+        size_ = 0;
+        content->insert({path_, size_});
+        XBT_DEBUG("File '%s' was not found, file created.", path_.c_str());
+      }
     }
-  }
+  });
 }
 
 File::~File()
 {
-  Host::current()->extension<simgrid::s4u::FileDescriptorHostExt>()->file_descriptor_table->push_back(desc_id);
+  std::vector<int>* desc_table =
+      Host::current()->extension<simgrid::s4u::FileDescriptorHostExt>()->file_descriptor_table.get();
+  kernel::actor::simcall([this, desc_table] { desc_table->push_back(this->desc_id); });
 }
 
-void File::dump()
+void File::dump() const
 {
   if (local_storage_)
     XBT_INFO("File Descriptor information:\n"
@@ -229,10 +234,12 @@ sg_size_t File::write_on_disk(sg_size_t size, bool write_inside)
     if (current_position_ > size_)
       size_ = current_position_;
   }
-  std::map<std::string, sg_size_t>* content = local_disk_->extension<FileSystemDiskExt>()->get_content();
+  kernel::actor::simcall([this] {
+    std::map<std::string, sg_size_t>* content = local_disk_->extension<FileSystemDiskExt>()->get_content();
 
-  content->erase(path_);
-  content->insert({path_, size_});
+    content->erase(path_);
+    content->insert({path_, size_});
+  });
 
   return write_size;
 }
@@ -267,10 +274,12 @@ sg_size_t File::write_on_storage(sg_size_t size, bool write_inside)
     if (current_position_ > size_)
       size_ = current_position_;
   }
-  std::map<std::string, sg_size_t>* content = local_storage_->extension<FileSystemStorageExt>()->get_content();
+  kernel::actor::simcall([this] {
+    std::map<std::string, sg_size_t>* content = local_storage_->extension<FileSystemStorageExt>()->get_content();
 
-  content->erase(path_);
-  content->insert({path_, size_});
+    content->erase(path_);
+    content->insert({path_, size_});
+  });
 
   return write_size;
 }
@@ -288,7 +297,7 @@ sg_size_t File::write(sg_size_t size, bool write_inside)
   return 0;
 }
 
-sg_size_t File::size()
+sg_size_t File::size() const
 {
   return size_;
 }
@@ -315,12 +324,12 @@ void File::seek(sg_offset_t offset, int origin)
   }
 }
 
-sg_size_t File::tell()
+sg_size_t File::tell() const
 {
   return current_position_;
 }
 
-void File::move(const std::string& fullpath)
+void File::move(const std::string& fullpath) const
 {
   /* Check if the new full path is on the same mount point */
   if (fullpath.compare(0, mount_point_.length(), mount_point_) == 0) {
@@ -346,7 +355,7 @@ void File::move(const std::string& fullpath)
   }
 }
 
-int File::unlink()
+int File::unlink() const
 {
   /* Check if the file is on local storage */
   std::map<std::string, sg_size_t>* content = nullptr;
@@ -475,8 +484,9 @@ int File::remote_move(sg_host_t host, const char* fullpath)
 FileSystemDiskExt::FileSystemDiskExt(const Disk* ptr)
 {
   const char* size_str    = ptr->get_property("size");
+  std::string dummyfile;
   if (size_str)
-    size_ = surf_parse_get_size(size_str, "disk size", ptr->get_name());
+    size_ = surf_parse_get_size(dummyfile, -1, size_str, "disk size", ptr->get_name());
 
   const char* current_mount_str = ptr->get_property("mount");
   if (current_mount_str)
@@ -551,6 +561,26 @@ std::map<std::string, sg_size_t>* FileSystemStorageExt::parse_content(const std:
   delete fs;
   return parse_content;
 }
+
+void FileSystemStorageExt::decr_used_size(sg_size_t size)
+{
+  simgrid::kernel::actor::simcall([this, size] { used_size_ -= size; });
+}
+
+void FileSystemStorageExt::incr_used_size(sg_size_t size)
+{
+  simgrid::kernel::actor::simcall([this, size] { used_size_ += size; });
+}
+
+void FileSystemDiskExt::decr_used_size(sg_size_t size)
+{
+  simgrid::kernel::actor::simcall([this, size] { used_size_ -= size; });
+}
+
+void FileSystemDiskExt::incr_used_size(sg_size_t size)
+{
+  simgrid::kernel::actor::simcall([this, size] { used_size_ += size; });
+}
 }
 }
 
@@ -672,7 +702,7 @@ void sg_file_close(const_sg_file_t fd)
 /** Retrieves the path to the file
  * @ingroup plugin_filesystem
  */
-const char* sg_file_get_name(sg_file_t fd)
+const char* sg_file_get_name(const_sg_file_t fd)
 {
   xbt_assert((fd != nullptr), "Invalid file descriptor");
   return fd->get_path();
@@ -681,7 +711,7 @@ const char* sg_file_get_name(sg_file_t fd)
 /** Retrieves the size of the file
  * @ingroup plugin_filesystem
  */
-sg_size_t sg_file_get_size(sg_file_t fd)
+sg_size_t sg_file_get_size(const_sg_file_t fd)
 {
   return fd->size();
 }
@@ -722,12 +752,12 @@ void sg_file_seek(sg_file_t fd, sg_offset_t offset, int origin)
   fd->seek(offset, origin);
 }
 
-sg_size_t sg_file_tell(sg_file_t fd)
+sg_size_t sg_file_tell(const_sg_file_t fd)
 {
   return fd->tell();
 }
 
-void sg_file_move(sg_file_t fd, const char* fullpath)
+void sg_file_move(const_sg_file_t fd, const char* fullpath)
 {
   fd->move(fullpath);
 }