disentangle file opening

[simgrid.git] / src / s4u / s4u_file.cpp

diff --git a/src/s4u/s4u_file.cpp b/src/s4u/s4u_file.cpp
index 7f9a7d5..ad9f634 100644 (file)
--- a/src/s4u/s4u_file.cpp
+++ b/src/s4u/s4u_file.cpp
@@ -19,15 +19,15 @@ namespace s4u {
 
 File::File(const char* fullpath, void* userdata) : File(fullpath, Host::current(), userdata){};
 
-File::File(const char* fullpath, sg_host_t host, void* userdata) : path_(fullpath), userdata_(userdata), host_(host)
+File::File(const char* fullpath, sg_host_t host, void* userdata) : path_(fullpath), userdata_(userdata)
 {
   // this cannot fail because we get a xbt_die if the mountpoint does not exist
   Storage* st                  = nullptr;
   size_t longest_prefix_length = 0;
   std::string path;
-  XBT_DEBUG("Search for storage name for '%s' on '%s'", fullpath, host->cname());
+  XBT_DEBUG("Search for storage name for '%s' on '%s'", fullpath, host->getCname());
 
-  for (auto mnt : host->mountedStorages()) {
+  for (auto mnt : host->getMountedStorages()) {
     XBT_DEBUG("See '%s'", mnt.first.c_str());
     mount_point = std::string(fullpath).substr(0, mnt.first.size());
 
@@ -41,16 +41,17 @@ File::File(const char* fullpath, sg_host_t host, void* userdata) : path_(fullpat
     mount_point = std::string(fullpath).substr(0, longest_prefix_length);
     path        = std::string(fullpath).substr(longest_prefix_length, strlen(fullpath));
   } else
-    xbt_die("Can't find mount point for '%s' on '%s'", fullpath, host->cname());
+    xbt_die("Can't find mount point for '%s' on '%s'", fullpath, host->getCname());
 
-  pimpl_       = simcall_file_open(mount_point.c_str(), path.c_str(), st);
-  storage_type = st->type();
-  storageId    = st->name();
+  pimpl_ =
+      simgrid::simix::kernelImmediate([this, st, path] { return new simgrid::surf::FileImpl(st, path, mount_point); });
+  storage_type = st->getType();
+  storageId    = st->getName();
 }
 
 File::~File()
 {
-  simcall_file_close(pimpl_, host_);
+  simgrid::simix::kernelImmediate([this] { delete pimpl_; });
 }
 
 sg_size_t File::read(sg_size_t size)
@@ -90,12 +91,13 @@ sg_size_t File::tell()
 
 void File::move(const char* fullpath)
 {
-  simcall_file_move(pimpl_,fullpath);
+  sg_host_t host = Host::current();
+  simgrid::simix::kernelImmediate([this, host, fullpath] { pimpl_->move(host, fullpath); });
 }
 
 int File::unlink()
 {
-  return simgrid::simix::kernelImmediate([this] { return pimpl_->unlink(Host::current()); });
+  return unlink(Host::current());
 }
 
 int File::unlink(sg_host_t host)