X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d974764c400528dfd76c9a2ae6b7f26643fcc02f..a844d6ba059b98ad6a5317e85a9c69402353b0a9:/include/simgrid/s4u/file.hpp

diff --git a/include/simgrid/s4u/file.hpp b/include/simgrid/s4u/file.hpp
index 6c4ccd0ce7..5c1565ce8a 100644
--- a/include/simgrid/s4u/file.hpp
+++ b/include/simgrid/s4u/file.hpp
@@ -6,10 +6,8 @@
 #ifndef SIMGRID_S4U_FILE_HPP
 #define SIMGRID_S4U_FILE_HPP
 
-#include <boost/unordered_map.hpp>
-#include <vector>
-
 #include <xbt/base.h>
+
 #include <simgrid/simix.h>
 
 namespace simgrid {
@@ -22,62 +20,61 @@ class Storage;
  *
  * Used to simulate the time it takes to access to a file, but does not really store any information.
  *
- * They are located on @link{simgrid::s4u::Storage}, that are accessed from a given @link{simgrid::s4u::Host} through mountpoints.
+ * They are located on @link{simgrid::s4u::Storage} that are accessed from a given @link{simgrid::s4u::Host} through mountpoints.
  * For now, you cannot change the mountpoints programatically, and must declare them from your platform file.
  */
 XBT_PUBLIC_CLASS File {
 public:
-	File(const char *fullpath, void* userdata);
-	~File();
-private:
-	smx_file_t p_inferior;
-	const char *p_path;
+  File(const char *fullpath, void* userdata);
+  ~File();
+
+  /** Retrieves the path to the file */
+  const char *path() { return path_;}
+
+  /** Simulates a read action. Returns the size of data actually read
+   *
+   *  FIXME: reading from a remotely mounted disk is not implemented yet.
+   *  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.
+   */
+  sg_size_t write(sg_size_t size);
+
+  /** Allows to store user data on that host */
+  void setUserdata(void *data) {userdata_ = data;}
+  /** Retrieves the previously stored data */
+  void* userdata() {return userdata_;}
+
+  /** Retrieve the datasize */
+  sg_size_t size();
+
+  /** Sets the file head to the given position. */
+  void seek(sg_size_t pos);
+  /** Retrieves the current file position */
+  sg_size_t tell();
+
+  /** Rename a file
+   *
+   * WARNING: It is forbidden to move the file to another mount point */
+  void move(const char*fullpath);
+
+  /** Remove a file from disk */
+  void unlink();
+
+  /* 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);
+  */
 
-public:
-	/** Retrieves the path to the file */
-	const char *path() { return p_path;}
-public:
-	/** Simulates a read action. Returns the size of data actually read
-	 *
-	 *  FIXME: reading from a remotely mounted disk is not implemented yet. 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.
-	 */
-	sg_size_t write(sg_size_t size);
-
-	/** Allows to store user data on that host */
-	void set_userdata(void *data) {p_userdata = data;}
-	/** Retrieves the previously stored data */
-	void* userdata() {return p_userdata;}
 private:
-	void *p_userdata=NULL;
-
-public:
-	/** Retrieve the datasize */
-	sg_size_t size();
-
-	/** Sets the file head to the given position. */
-	void seek(sg_size_t pos);
-	/** Retrieves the current file position */
-	sg_size_t tell();
-
-	/** Rename a file
-	 *
-	 * WARNING: It is forbidden to move the file to another mount point */
-	void move(const char*fullpath);
-
-	/** Remove a file from disk */
-	void unlink();
-
-	/* 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);
-	*/
-
+  smx_file_t pimpl_ = nullptr;
+  const char *path_ = nullptr;
+  void *userdata_ = nullptr;
 };
 
 }} // namespace simgrid::s4u