X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b8df87e176f27b25534f27d7e240defa32ca35bc..9e3b2f1d55a07271c05db2ed5b3fec27561097f9:/src/surf/StorageImpl.hpp?ds=sidebyside

diff --git a/src/surf/StorageImpl.hpp b/src/surf/StorageImpl.hpp
index 7ee634bf26..145b7f8dec 100644
--- a/src/surf/StorageImpl.hpp
+++ b/src/surf/StorageImpl.hpp
@@ -8,8 +8,8 @@
 #include "simgrid/kernel/resource/Resource.hpp"
 #include "simgrid/s4u/Io.hpp"
 #include "simgrid/s4u/Storage.hpp"
+#include "src/kernel/resource/profile/trace_mgr.hpp"
 #include "src/surf/PropertyHolder.hpp"
-#include "src/surf/trace_mgr.hpp"
 #include "surf_interface.hpp"
 
 #include <map>
@@ -67,7 +67,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* maxmin_system, double bread,
+  StorageImpl(kernel::resource::Model* model, const 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;
@@ -78,7 +78,7 @@ public:
   /** @brief Check if the Storage is used (if an action currently uses its resources) */
   bool is_used() override;
 
-  void apply_event(tmgr_trace_event_t event, double value) override;
+  void apply_event(simgrid::kernel::profile::Event* event, double value) override;
 
   void turn_on() override;
   void turn_off() override;
@@ -171,7 +171,12 @@ public:
   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)
+      : id(std::move(id))
+      , model(std::move(model))
+      , content(std::move(content))
+      , properties(properties)
+      , model_properties(model_properties)
+      , size(size)
   {
   }
 };