plug two more leaks

[simgrid.git] / include / simgrid / s4u / Storage.hpp

diff --git a/include/simgrid/s4u/Storage.hpp b/include/simgrid/s4u/Storage.hpp
index 12bfe85..2ece591 100644 (file)
--- a/include/simgrid/s4u/Storage.hpp
+++ b/include/simgrid/s4u/Storage.hpp
@@ -17,7 +17,7 @@
 namespace simgrid {
 namespace s4u {
 
-std::map<std::string, Storage*>* allStorages();
+XBT_ATTRIB_PUBLIC std::map<std::string, Storage*>* allStorages();
 
 XBT_PUBLIC_CLASS Storage
 {
@@ -29,20 +29,22 @@ public:
   virtual ~Storage() = default;
   /** Retrieve a Storage by its name. It must exist in the platform file */
   static Storage* byName(const char* name);
-  const char* name();
-  const char* host();
-  sg_size_t sizeFree();
-  sg_size_t sizeUsed();
-  /** Retrieve the total amount of space of this storage element */
-  sg_size_t size();
-  xbt_dict_t properties();
-  const char* property(const char* key);
-  void setProperty(const char* key, char* value);
-  std::map<std::string, sg_size_t*>* content();
+  const char* getName();
+  const char* getType();
+  Host* getHost();
+  sg_size_t getSize(); /** Retrieve the total amount of space of this storage element */
+  sg_size_t getSizeFree();
+  sg_size_t getSizeUsed();
+
+  xbt_dict_t getProperties();
+  const char* getProperty(const char* key);
+  void setProperty(const char* key, const char* value);
+  std::map<std::string, sg_size_t>* getContent();
 
-public:
   void setUserdata(void* data) { userdata_ = data; }
-  void* userdata() { return userdata_; }
+  void* getUserdata() { return userdata_; }
+
+  surf::StorageImpl* getImpl() { return pimpl_; }
 
   /* The signals */
   /** @brief Callback signal fired when a new Link is created */
@@ -51,10 +53,12 @@ public:
   /** @brief Callback signal fired when a Link is destroyed */
   static simgrid::xbt::signal<void(s4u::Storage&)> onDestruction;
 
+  Host* attached_to_              = nullptr;
+
 private:
-  std::string name_;
   surf::StorageImpl* const pimpl_ = nullptr;
-  void* userdata_      = nullptr;
+  std::string name_;
+  void* userdata_ = nullptr;
 };
 
 } /* namespace s4u */