X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/10675785aab38470f386150c08e4c3ab8fcc8a71..db9ef2223acb402e44eec406541e671bfebd5ade:/include/simgrid/plugins/file_system.h?ds=sidebyside

diff --git a/include/simgrid/plugins/file_system.h b/include/simgrid/plugins/file_system.h
index 49b13a3d40..28c31ea4d9 100644
--- a/include/simgrid/plugins/file_system.h
+++ b/include/simgrid/plugins/file_system.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2017-2022. 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. */
@@ -27,7 +27,7 @@ XBT_PUBLIC void sg_storage_file_system_init();
 XBT_PUBLIC sg_file_t sg_file_open(const char* fullpath, void* data);
 XBT_PUBLIC sg_size_t sg_file_read(sg_file_t fd, sg_size_t size);
 XBT_PUBLIC sg_size_t sg_file_write(sg_file_t fd, sg_size_t size);
-XBT_PUBLIC void sg_file_close(const_sg_file_t fd);
+XBT_PUBLIC void sg_file_close(sg_file_t fd);
 
 XBT_PUBLIC const char* sg_file_get_name(const_sg_file_t fd);
 XBT_PUBLIC sg_size_t sg_file_get_size(const_sg_file_t fd);
@@ -101,13 +101,18 @@ class XBT_PUBLIC File : public xbt::Extendable<File> {
 
   const Disk* find_local_disk_on(const Host* host);
 
-public:
+protected:
   File(const std::string& fullpath, void* userdata);
   File(const std::string& fullpath, const_sg_host_t host, void* userdata);
   File(const File&) = delete;
   File& operator=(const File&) = delete;
   ~File();
 
+public:
+  static File* open(const std::string& fullpath, void* userdata);
+  static File* open(const std::string& fullpath, const_sg_host_t host, void* userdata);
+  void close();
+
   /** Retrieves the path to the file */
   const char* get_path() const { return fullpath_.c_str(); }
 
@@ -147,10 +152,7 @@ public:
   std::map<std::string, sg_size_t, std::less<>>* get_content() const { return content_.get(); }
   const char* get_mount_point() const { return mount_point_.c_str(); }
   const char* get_mount_point(s4u::Host* remote_host) { return remote_mount_points_[remote_host].c_str(); }
-  void add_remote_mount(Host* host, const std::string& mount_point)
-  {
-    remote_mount_points_.insert({host, mount_point});
-  }
+  void add_remote_mount(Host* host, const std::string& mount_point);
   sg_size_t get_size() const { return size_; }
   sg_size_t get_used_size() const { return used_size_; }
   void decr_used_size(sg_size_t size);