X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/183a6118a95c570b0c66695505dab7dbebc0c7b3..5991e068e19c81bce114d7ba8ae9d9a6afb729f1:/src/s4u/s4u_file.cpp

diff --git a/src/s4u/s4u_file.cpp b/src/s4u/s4u_file.cpp
index ec8cd7cd48..5eaf55c82d 100644
--- a/src/s4u/s4u_file.cpp
+++ b/src/s4u/s4u_file.cpp
@@ -8,6 +8,8 @@
 #include "simgrid/s4u/File.hpp"
 #include "simgrid/s4u/Host.hpp"
 #include "simgrid/s4u/Storage.hpp"
+#include "simgrid/simix.hpp"
+#include "src/surf/FileImpl.hpp"
 #include "src/surf/HostImpl.hpp"
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_file,"S4U files");
@@ -17,7 +19,7 @@ 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)
+File::File(const char* fullpath, sg_host_t host, void* userdata) : path_(fullpath), userdata_(userdata), host_(host)
 {
   // this cannot fail because we get a xbt_die if the mountpoint does not exist
   Storage* st                  = nullptr;
@@ -42,7 +44,6 @@ File::File(const char* fullpath, sg_host_t host, void* userdata) : path_(fullpat
     xbt_die("Can't find mount point for '%s' on '%s'", fullpath, host->cname());
 
   pimpl_       = simcall_file_open(mount_point.c_str(), path.c_str(), st);
-  host_        = host;
   storage_type = st->type();
   storageId    = st->name();
 }
@@ -69,17 +70,17 @@ sg_size_t File::write(sg_size_t size, sg_host_t host)
 
 sg_size_t File::size()
 {
-  return simcall_file_get_size(pimpl_);
+  return simgrid::simix::kernelImmediate([this] { return pimpl_->size(); });
 }
 
 void File::seek(sg_size_t pos)
 {
-  simcall_file_seek(pimpl_,pos,SEEK_SET);
+  simgrid::simix::kernelImmediate([this, pos] { pimpl_->seek(pos, SEEK_SET); });
 }
 
 sg_size_t File::tell()
 {
-  return simcall_file_tell(pimpl_);
+  return simgrid::simix::kernelImmediate([this] { return pimpl_->tell(); });
 }
 
 void File::move(const char* fullpath)