X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7bc01999f5003e51cc1d12f93647999a1a143f23..e2680c4776709548e15f400af83ffe4a2cf5eb49:/src/s4u/s4u_file.cpp

diff --git a/src/s4u/s4u_file.cpp b/src/s4u/s4u_file.cpp
index 1eabd4b347..25595a9212 100644
--- a/src/s4u/s4u_file.cpp
+++ b/src/s4u/s4u_file.cpp
@@ -1,57 +1,106 @@
-/* Copyright (c) 2015. The SimGrid Team. All rights reserved.               */
+/* Copyright (c) 2015-2017. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "xbt/log.h"
-#include "src/msg/msg_private.h"
 
-#include "simgrid/s4u/Actor.hpp"
-#include "simgrid/s4u/comm.hpp"
-#include "simgrid/s4u/host.hpp"
-#include "simgrid/s4u/mailbox.hpp"
+#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");
 
-#include "simgrid/s4u/file.hpp"
-#include "simgrid/s4u/host.hpp"
-#include "simgrid/simix.h"
-
 namespace simgrid {
 namespace s4u {
 
-File::File(const char*fullpath, void *userdata) {
+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)
+{
   // this cannot fail because we get a xbt_die if the mountpoint does not exist
-  pimpl_ = simcall_file_open(fullpath, Host::current());
-  path_ = fullpath;
+  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());
+
+  for (auto mnt : host->mountedStorages()) {
+    XBT_DEBUG("See '%s'", mnt.first.c_str());
+    mount_point = std::string(fullpath).substr(0, mnt.first.size());
+
+    if (mount_point == mnt.first && mnt.first.length() > longest_prefix_length) {
+      /* The current mount name is found in the full path and is bigger than the previous*/
+      longest_prefix_length = mnt.first.length();
+      st                    = mnt.second;
+    }
+  }
+  if (longest_prefix_length > 0) { /* Mount point found, split fullpath into mount_name and path+filename*/
+    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());
+
+  pimpl_       = simcall_file_open(mount_point.c_str(), path.c_str(), st);
+  storage_type = st->type();
+  storageId    = st->name();
 }
 
-File::~File() {
-  simcall_file_close(pimpl_, Host::current());
+File::~File()
+{
+  simcall_file_close(pimpl_, host_);
 }
 
-sg_size_t File::read(sg_size_t size) {
+sg_size_t File::read(sg_size_t size)
+{
   return simcall_file_read(pimpl_, size, Host::current());
 }
-sg_size_t File::write(sg_size_t size) {
+
+sg_size_t File::write(sg_size_t size)
+{
   return simcall_file_write(pimpl_,size, Host::current());
 }
-sg_size_t File::size() {
-  return simcall_file_get_size(pimpl_);
+
+sg_size_t File::write(sg_size_t size, sg_host_t host)
+{
+  return simcall_file_write(pimpl_, size, host);
+}
+
+sg_size_t File::size()
+{
+  return simgrid::simix::kernelImmediate([this] { return pimpl_->size(); });
+}
+
+void File::seek(sg_offset_t pos)
+{
+  simgrid::simix::kernelImmediate([this, pos] { pimpl_->seek(pos, SEEK_SET); });
 }
 
-void File::seek(sg_size_t pos) {
-  simcall_file_seek(pimpl_,pos,SEEK_SET);
+void File::seek(sg_offset_t pos, int origin)
+{
+  simgrid::simix::kernelImmediate([this, pos, origin] { pimpl_->seek(pos, origin); });
 }
-sg_size_t File::tell() {
-  return simcall_file_tell(pimpl_);
+
+sg_size_t File::tell()
+{
+  return simgrid::simix::kernelImmediate([this] { return pimpl_->tell(); });
 }
-void File::move(const char*fullpath) {
+
+void File::move(const char* fullpath)
+{
   simcall_file_move(pimpl_,fullpath);
 }
-void File::unlink() {
-  sg_host_t attached = Host::current(); // FIXME: we should check where this file is attached
-  simcall_file_unlink(pimpl_,attached);
+
+void File::unlink()
+{
+  simcall_file_unlink(pimpl_, Host::current());
+}
+
+void File::unlink(sg_host_t host)
+{
+  simcall_file_unlink(pimpl_, host);
 }
 
 }} // namespace simgrid::s4u