move kernel timers from simix:: to kernel::timer::

[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 e90f849..d3bcd84 100644 (file)
--- a/include/simgrid/plugins/file_system.h
+++ b/include/simgrid/plugins/file_system.h
@@ -67,12 +67,6 @@ typedef sg_file_t msg_file_t; // MSG backwards compatibility
 #define MSG_file_rmove(file, host, fullpath) sg_file_rmove((file), (host), (fullpath))
 
 #define MSG_storage_file_system_init() sg_storage_file_system_init()
-#define MSG_storage_get_free_size(st) sg_storage_get_size_free(st)
-#define MSG_storage_get_used_size(st) sg_storage_get_size_used(st)
-#define MSG_storage_get_size(st) sg_storage_get_size(st)
-#define MSG_storage_get_content(st) sg_storage_get_content(st)
-
-#define MSG_host_get_storage_content(st) sg_host_get_storage_content(st)
 
 #endif // SIMGRID_HAVE_MSG
 
@@ -94,9 +88,7 @@ namespace s4u {
  *
  * Used to simulate the time it takes to access to a file, but does not really store any information.
  *
- * They are located on @ref simgrid::s4u::Storage that are accessed from a given @ref simgrid::s4u::Host through
- * mountpoints.
- * For now, you cannot change the mountpoints programmatically, and must declare them from your platform file.
+ * They are located on @ref simgrid::s4u::Disk that are accessed from a given @ref simgrid::s4u::Host
  */
 class XBT_PUBLIC File : public xbt::Extendable<File> {
   sg_size_t size_ = 0;
@@ -104,14 +96,14 @@ class XBT_PUBLIC File : public xbt::Extendable<File> {
   std::string fullpath_;
   sg_size_t current_position_ = SEEK_SET;
   int desc_id                 = 0;
-  Disk* local_disk_           = nullptr;
+  const Disk* local_disk_     = nullptr;
   std::string mount_point_;
 
-  Disk* find_local_disk_on(const Host* host);
+  const Disk* find_local_disk_on(const Host* host);
 
 public:
   File(const std::string& fullpath, void* userdata);
-  File(const std::string& fullpath, sg_host_t host, void* userdata);
+  File(const std::string& fullpath, const_sg_host_t host, void* userdata);
   File(const File&) = delete;
   File& operator=(const File&) = delete;
   ~File();