Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

[simgrid.git] / include / simgrid / s4u / File.hpp

diff --git a/include/simgrid/s4u/File.hpp b/include/simgrid/s4u/File.hpp
index 885509e..d6cd734 100644 (file)
--- a/include/simgrid/s4u/File.hpp
+++ b/include/simgrid/s4u/File.hpp
@@ -8,14 +8,12 @@
 
 #include <xbt/base.h>
 
-#include "src/surf/StorageImpl.hpp"
 #include <simgrid/simix.h>
+#include <string>
 
 namespace simgrid {
 namespace s4u {
 
-class Storage;
-
 /** @brief A simulated file
  *
  * Used to simulate the time it takes to access to a file, but does not really store any information.
@@ -28,6 +26,7 @@ XBT_PUBLIC_CLASS File
 {
 public:
   File(const char* fullpath, void* userdata);
+  File(const char* fullpath, sg_host_t host, void* userdata);
   ~File();
 
   /** Retrieves the path to the file */
@@ -39,12 +38,10 @@ public:
    *  Any storage is considered as local, and no network communication ever occur.
    */
   sg_size_t read(sg_size_t size);
-  /** Simulates a write action. Returns the size of data actually written.
-   *
-   *  FIXME: reading from a remotely mounted disk is not implemented yet.
-   *  Any storage is considered as local, and no network communication ever occur.
-   */
+
+  /** Simulates a write action. Returns the size of data actually written. */
   sg_size_t write(sg_size_t size);
+  sg_size_t write(sg_size_t size, sg_host_t host);
 
   /** Allows to store user data on that host */
   void setUserdata(void* data) { userdata_ = data; }
@@ -55,7 +52,9 @@ public:
   sg_size_t size();
 
   /** Sets the file head to the given position. */
-  void seek(sg_size_t pos);
+  void seek(sg_offset_t pos);
+  void seek(sg_offset_t pos, int origin);
+
   /** Retrieves the current file position */
   sg_size_t tell();
 
@@ -65,22 +64,24 @@ public:
   void move(const char* fullpath);
 
   /** Remove a file from disk */
-  void unlink();
+  int unlink();
+  int unlink(sg_host_t host);
 
   /* FIXME: add these to the S4U API:
   XBT_PUBLIC(const char *) MSG_file_get_name(msg_file_t file);
   XBT_PUBLIC(msg_error_t) MSG_file_rcopy(msg_file_t fd, msg_host_t host, const char* fullpath);
   XBT_PUBLIC(msg_error_t) MSG_file_rmove(msg_file_t fd, msg_host_t host, const char* fullpath);
   */
-  char* storage_type;
-  char* storageId;
-  char* mount_point;
+  const char* storage_type;
+  const char* storageId;
+  std::string mount_point;
   int desc_id = 0;
 
 private:
-  smx_file_t pimpl_ = nullptr;
-  const char* path_ = nullptr;
-  void* userdata_   = nullptr;
+  surf_file_t pimpl_ = nullptr;
+  const char* path_  = nullptr;
+  void* userdata_    = nullptr;
+  sg_host_t host_    = nullptr;
 };
 }
 } // namespace simgrid::s4u