X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1e22304ac763eda6122ced2baa724139e606b2ad..649026e94f9b98cafdd7dcbb63dc0ed6f51cea25:/include/simgrid/plugins/file_system.h

diff --git a/include/simgrid/plugins/file_system.h b/include/simgrid/plugins/file_system.h
index 1a5ea1cd53..961331e8ad 100644
--- a/include/simgrid/plugins/file_system.h
+++ b/include/simgrid/plugins/file_system.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2017-2019. 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. */
@@ -73,6 +73,7 @@ SG_END_DECL()
 #include <xbt/Extendable.hpp>
 
 #include <map>
+#include <memory>
 #include <string>
 
 namespace simgrid {
@@ -88,8 +89,10 @@ namespace s4u {
  */
 class XBT_PUBLIC File {
 public:
-  File(std::string fullpath, void* userdata);
-  File(std::string fullpath, sg_host_t host, void* userdata);
+  File(const std::string& fullpath, void* userdata);
+  File(const std::string& fullpath, sg_host_t host, void* userdata);
+  File(const File&) = delete;
+  File& operator=(const File&) = delete;
   ~File();
 
   /** Retrieves the path to the file */
@@ -99,7 +102,7 @@ public:
   sg_size_t read(sg_size_t size);
 
   /** 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, int write_inside=0);
 
   /** Allows to store user data on that host */
   void set_userdata(void* data) { userdata_ = data; }
@@ -112,7 +115,7 @@ public:
   sg_size_t tell();                       /** Retrieves the current file position */
 
   /** Rename a file. WARNING: It is forbidden to move the file to another mount point */
-  void move(std::string fullpath);
+  void move(const std::string& fullpath);
   int remote_copy(sg_host_t host, const char* fullpath);
   int remote_move(sg_host_t host, const char* fullpath);
 
@@ -135,16 +138,17 @@ class XBT_PUBLIC FileSystemStorageExt {
 public:
   static simgrid::xbt::Extension<Storage, FileSystemStorageExt> EXTENSION_ID;
   explicit FileSystemStorageExt(Storage* ptr);
-  ~FileSystemStorageExt();
-  std::map<std::string, sg_size_t>* parse_content(std::string filename);
-  std::map<std::string, sg_size_t>* get_content() { return content_; }
+  FileSystemStorageExt(const FileSystemStorageExt&) = delete;
+  FileSystemStorageExt& operator=(const FileSystemStorageExt&) = delete;
+  std::map<std::string, sg_size_t>* parse_content(const std::string& filename);
+  std::map<std::string, sg_size_t>* get_content() { return content_.get(); }
   sg_size_t get_size() { return size_; }
   sg_size_t get_used_size() { return used_size_; }
   void decr_used_size(sg_size_t size) { used_size_ -= size; }
   void incr_used_size(sg_size_t size) { used_size_ += size; }
 
 private:
-  std::map<std::string, sg_size_t>* content_;
+  std::unique_ptr<std::map<std::string, sg_size_t>> content_;
   sg_size_t used_size_ = 0;
   sg_size_t size_     = 0;
 };
@@ -153,8 +157,9 @@ class XBT_PUBLIC FileDescriptorHostExt {
 public:
   static simgrid::xbt::Extension<Host, FileDescriptorHostExt> EXTENSION_ID;
   FileDescriptorHostExt() = default;
-  ~FileDescriptorHostExt() { delete file_descriptor_table; }
-  std::vector<int>* file_descriptor_table = nullptr; // Created lazily on need
+  FileDescriptorHostExt(const FileDescriptorHostExt&) = delete;
+  FileDescriptorHostExt& operator=(const FileDescriptorHostExt&) = delete;
+  std::unique_ptr<std::vector<int>> file_descriptor_table        = nullptr; // Created lazily on need
 };
 } // namespace s4u
 } // namespace simgrid