jedule: obey our coding standards

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

diff --git a/src/surf/StorageImpl.hpp b/src/surf/StorageImpl.hpp
index 29b98f8..6f50872 100644 (file)
--- a/src/surf/StorageImpl.hpp
+++ b/src/surf/StorageImpl.hpp
@@ -29,25 +29,6 @@ class StorageAction;
  * Callbacks *
  *************/
 
-/** @ingroup SURF_callbacks
- * @brief Callbacks handler which emit the callbacks after Storage creation *
- * @details Callback functions have the following signature: `void(Storage*)`
- */
-XBT_PUBLIC_DATA simgrid::xbt::signal<void(StorageImpl*)> storageCreatedCallbacks;
-
-/** @ingroup SURF_callbacks
- * @brief Callbacks handler which emit the callbacks after Storage destruction *
- * @details Callback functions have the following signature: `void(StoragePtr)`
- */
-XBT_PUBLIC_DATA simgrid::xbt::signal<void(StorageImpl*)> storageDestructedCallbacks;
-
-/** @ingroup SURF_callbacks
- * @brief Callbacks handler which emit the callbacks after Storage State changed *
- * @details Callback functions have the following signature: `void(StorageAction *action, int previouslyOn, int
- * currentlyOn)`
- */
-XBT_PUBLIC_DATA simgrid::xbt::signal<void(StorageImpl*, int, int)> storageStateChangedCallbacks;
-
 /** @ingroup SURF_callbacks
  * @brief Callbacks handler which emit the callbacks after StorageAction State changed *
  * @details Callback functions have the following signature: `void(StorageAction *action,
@@ -55,7 +36,7 @@ XBT_PUBLIC_DATA simgrid::xbt::signal<void(StorageImpl*, int, int)> storageStateC
  */
 XBT_PUBLIC_DATA
 simgrid::xbt::signal<void(StorageAction*, kernel::resource::Action::State, kernel::resource::Action::State)>
-    storageActionStateChangedCallbacks;
+    on_state_change;
 
 /*********
  * Model *
@@ -83,7 +64,7 @@ public:
 class StorageImpl : public kernel::resource::Resource, public PropertyHolder {
 public:
   /** @brief Storage constructor */
-  StorageImpl(kernel::resource::Model* model, std::string name, kernel::lmm::System* maxminSystem, double bread,
+  StorageImpl(kernel::resource::Model* model, std::string name, kernel::lmm::System* maxmin_system, double bread,
               double bwrite, std::string type_id, std::string content_name, sg_size_t size, std::string attach);
 
   ~StorageImpl() override;
@@ -99,6 +80,8 @@ public:
   void turn_on() override;
   void turn_off() override;
 
+  void destroy(); // Must be called instead of the destructor
+
   /**
    * @brief Read a file
    *
@@ -124,6 +107,7 @@ public:
   sg_size_t size_;          // Only used at parsing time then goes to the FileSystemExtension
 
 private:
+  bool currentlyDestroying_ = false;
   // Name of the host to which this storage is attached. Only used at platform parsing time, then the interface stores
   // the Host directly.
   std::string attach_;
@@ -146,6 +130,9 @@ enum e_surf_action_storage_type_t {
  */
 class StorageAction : public kernel::resource::Action {
 public:
+  static xbt::signal<void(StorageAction*, kernel::resource::Action::State, kernel::resource::Action::State)>
+      on_state_change;
+
   /**
    * @brief StorageAction constructor
    *
@@ -184,11 +171,12 @@ public:
   std::string id;
   std::string model;
   std::string content;
-  std::map<std::string, std::string>* properties;
-  std::map<std::string, std::string>* model_properties;
+  std::unordered_map<std::string, std::string>* properties;
+  std::unordered_map<std::string, std::string>* model_properties;
   sg_size_t size;
-  StorageType(std::string id, std::string model, std::string content, std::map<std::string, std::string>* properties,
-              std::map<std::string, std::string>* model_properties, sg_size_t size)
+  StorageType(std::string id, std::string model, std::string content,
+              std::unordered_map<std::string, std::string>* properties,
+              std::unordered_map<std::string, std::string>* model_properties, sg_size_t size)
       : id(id), model(model), content(content), properties(properties), model_properties(model_properties), size(size)
   {
   }