Merge pull request #168 from simgrid/smpi_huge_pages

[simgrid.git] / src / surf / storage_interface.hpp

diff --git a/src/surf/storage_interface.hpp b/src/surf/storage_interface.hpp
index b872646..31c6dc8 100644 (file)
--- a/src/surf/storage_interface.hpp
+++ b/src/surf/storage_interface.hpp
@@ -21,8 +21,6 @@ namespace surf {
  * Classes *
  ***********/
 
-class StorageModel;
-class Storage;
 class StorageAction;
 
 /*************
@@ -82,13 +80,7 @@ class Storage : public simgrid::surf::Resource,
         public simgrid::surf::PropertyHolder {
 public:
 
-  /**
-   * @brief Storage constructor
-   *
-   * @param model StorageModel associated to this Storage
-   * @param name The name of the Storage
-   * @param props Dictionary of properties associated to this Storage
-   */
+  /** @brief Storage constructor */
   Storage(Model* model, const char* name, lmm_system_t maxminSystem, double bread, double bwrite, double bconnection,
           const char* type_id, const char* content_name, const char* content_type, sg_size_t size, const char* attach);
 
@@ -97,7 +89,7 @@ public:
   /** @brief Check if the Storage is used (if an action currently uses its resources) */
   bool isUsed() override;
 
-  void apply_event(tmgr_trace_iterator_t event, double value) override;
+  void apply_event(tmgr_trace_event_t event, double value) override;
 
   void turnOn() override;
   void turnOff() override;
@@ -150,7 +142,7 @@ public:
    *
    * @return A xbt_dict_t with path as keys and size in bytes as values
    */
-  virtual xbt_dict_t getContent();
+  virtual std::map<std::string, sg_size_t*>* getContent();
 
   /**
    * @brief Get the available size in bytes of the current Storage