Use a simcall for s4u::File construction and destruction.

[simgrid.git] / 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 350382aae1ff4a32f0503441d5c7579da87c2cba..0b0c426212c9fe1e1fb37be424cbd2ef08e10045 100644 (file)
--- a/src/plugins/file_system/s4u_FileSystem.cpp
+++ b/src/plugins/file_system/s4u_FileSystem.cpp
@@ -93,49 +93,53 @@ 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, &fullpath, 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()
@@ -188,7 +192,7 @@ sg_size_t File::read(sg_size_t size)
   if (host && host->get_name() != Host::current()->get_name() && read_size > 0) {
     /* the file is hosted on a remote host, initiate a communication between src and dest hosts for data transfer */
     XBT_DEBUG("File is on %s remote host, initiate data transfer of %llu bytes.", host->get_cname(), read_size);
-    host->send_to(Host::current(), read_size);
+    host->sendto(Host::current(), read_size);
   }
 
   return read_size;
@@ -209,7 +213,7 @@ sg_size_t File::write_on_disk(sg_size_t size, bool write_inside)
   if (host && host->get_name() != Host::current()->get_name()) {
     /* the file is hosted on a remote host, initiate a communication between src and dest hosts for data transfer */
     XBT_DEBUG("File is on %s remote host, initiate data transfer of %llu bytes.", host->get_cname(), size);
-    Host::current()->send_to(host, size);
+    Host::current()->sendto(host, size);
   }
   XBT_DEBUG("WRITE %s on disk '%s'. size '%llu/%llu' '%llu:%llu'", get_path(), local_disk_->get_cname(), size, size_,
             sg_disk_get_size_used(local_disk_), sg_disk_get_size(local_disk_));
@@ -246,7 +250,7 @@ sg_size_t File::write_on_storage(sg_size_t size, bool write_inside)
   if (host && host->get_name() != Host::current()->get_name()) {
     /* the file is hosted on a remote host, initiate a communication between src and dest hosts for data transfer */
     XBT_DEBUG("File is on %s remote host, initiate data transfer of %llu bytes.", host->get_cname(), size);
-    Host::current()->send_to(host, size);
+    Host::current()->sendto(host, size);
   }
 
   XBT_DEBUG("WRITE %s on disk '%s'. size '%llu/%llu' '%llu:%llu'", get_path(), local_storage_->get_cname(), size, size_,
@@ -449,7 +453,7 @@ int File::remote_copy(sg_host_t host, const char* fullpath)
   if (src_host) {
     XBT_DEBUG("Initiate data transfer of %llu bytes between %s and %s.", read_size, src_host->get_cname(),
               dst_host->get_cname());
-    src_host->send_to(dst_host, read_size);
+    src_host->sendto(dst_host, read_size);
   }
 
   /* Create file on remote host, write it and close it */
@@ -502,6 +506,8 @@ std::map<std::string, sg_size_t>* FileSystemDiskExt::parse_content(const std::st
   std::map<std::string, sg_size_t>* parse_content = new std::map<std::string, sg_size_t>();
 
   std::ifstream* fs = surf_ifsopen(filename);
+  xbt_assert(not fs->fail(), "Cannot open file '%s' (path=%s)", filename.c_str(),
+             (boost::join(surf_path, ":")).c_str());
 
   std::string line;
   std::vector<std::string> tokens;
@@ -529,6 +535,8 @@ std::map<std::string, sg_size_t>* FileSystemStorageExt::parse_content(const std:
   std::map<std::string, sg_size_t>* parse_content = new std::map<std::string, sg_size_t>();
 
   std::ifstream* fs = surf_ifsopen(filename);
+  xbt_assert(not fs->fail(), "Cannot open file '%s' (path=%s)", filename.c_str(),
+             (boost::join(surf_path, ":")).c_str());
 
   std::string line;
   std::vector<std::string> tokens;
@@ -547,6 +555,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; });
+}
 }
 }