Merge branch 'pikachuyann/simgrid-xbt_random'

[simgrid.git] / include / simgrid / plugins / file_system.h

diff --git a/include/simgrid/plugins/file_system.h b/include/simgrid/plugins/file_system.h
index 6384260..6c92f19 100644 (file)
--- a/include/simgrid/plugins/file_system.h
+++ b/include/simgrid/plugins/file_system.h
@@ -85,6 +85,9 @@ SG_END_DECL
 #ifdef __cplusplus
 
 namespace simgrid {
+
+extern template class XBT_PUBLIC xbt::Extendable<s4u::File>;
+
 namespace s4u {
 
 /** @brief A simulated file
@@ -101,6 +104,10 @@ class XBT_PUBLIC File : public xbt::Extendable<File> {
   std::string path_;
   std::string fullpath_;
   sg_size_t current_position_ = SEEK_SET;
+  int desc_id                 = 0;
+  Disk* local_disk_           = nullptr;
+  Storage* local_storage_     = nullptr;
+  std::string mount_point_;
 
   Storage* find_local_storage_on(Host* host);
   Disk* find_local_disk_on(const Host* host);
@@ -140,14 +147,15 @@ public:
 
   int unlink(); /** Remove a file from the contents of a disk */
   void dump();
-
-  int desc_id = 0;
-  Disk* local_disk_       = nullptr;
-  Storage* local_storage_ = nullptr;
-  std::string mount_point_;
 };
 
 class XBT_PUBLIC FileSystemDiskExt {
+  std::unique_ptr<std::map<std::string, sg_size_t>> content_;
+  std::map<Host*, std::string> remote_mount_points_;
+  std::string mount_point_;
+  sg_size_t used_size_ = 0;
+  sg_size_t size_      = static_cast<sg_size_t>(500 * 1024) * 1024 * 1024;
+
 public:
   static simgrid::xbt::Extension<Disk, FileSystemDiskExt> EXTENSION_ID;
   explicit FileSystemDiskExt(const Disk* ptr);
@@ -165,16 +173,13 @@ public:
   sg_size_t get_used_size() const { 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:
+class XBT_PUBLIC FileSystemStorageExt {
   std::unique_ptr<std::map<std::string, sg_size_t>> content_;
-  std::map<Host*, std::string> remote_mount_points_;
-  std::string mount_point_;
   sg_size_t used_size_ = 0;
-  sg_size_t size_      = static_cast<sg_size_t>(500 * 1024) * 1024 * 1024;
-};
+  sg_size_t size_      = 0;
 
-class XBT_PUBLIC FileSystemStorageExt {
 public:
   static simgrid::xbt::Extension<Storage, FileSystemStorageExt> EXTENSION_ID;
   explicit FileSystemStorageExt(const Storage* ptr);
@@ -186,11 +191,6 @@ public:
   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::unique_ptr<std::map<std::string, sg_size_t>> content_;
-  sg_size_t used_size_ = 0;
-  sg_size_t size_     = 0;
 };
 
 class XBT_PUBLIC FileDescriptorHostExt {