Merge branch 'master' of https://framagit.org/simgrid/simgrid

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

diff --git a/src/surf/storage_n11.hpp b/src/surf/storage_n11.hpp
index 6682708..fdd2abf 100644 (file)
--- a/src/surf/storage_n11.hpp
+++ b/src/surf/storage_n11.hpp
@@ -11,7 +11,8 @@
 #define STORAGE_N11_HPP_
 
 namespace simgrid {
-namespace surf {
+namespace kernel {
+namespace resource {
 
 /***********
  * Classes *
@@ -30,7 +31,7 @@ public:
   StorageN11Model();
   StorageImpl* createStorage(const std::string& id, const std::string& type_id, const std::string& content_name,
                              const std::string& attach) override;
-  double next_occuring_event(double now) override;
+  double next_occurring_event(double now) override;
   void update_actions_state(double now, double delta) override;
 };
 
@@ -44,9 +45,9 @@ public:
              double bwrite, const std::string& type_id, const std::string& content_name, sg_size_t size,
              const std::string& attach);
   virtual ~StorageN11() = default;
-  StorageAction* io_start(sg_size_t size, s4u::Io::OpType type);
-  StorageAction* read(sg_size_t size);
-  StorageAction* write(sg_size_t size);
+  StorageAction* io_start(sg_size_t size, s4u::Io::OpType type) override;
+  StorageAction* read(sg_size_t size) override;
+  StorageAction* write(sg_size_t size) override;
 };
 
 /**********
@@ -55,17 +56,16 @@ public:
 
 class StorageN11Action : public StorageAction {
 public:
-  StorageN11Action(kernel::resource::Model* model, double cost, bool failed, StorageImpl* storage,
-                   s4u::Io::OpType type);
+  StorageN11Action(Model* model, double cost, bool failed, StorageImpl* storage, s4u::Io::OpType type);
   void suspend() override;
   void cancel() override;
   void resume() override;
   void set_max_duration(double duration) override;
-  void set_priority(double priority) override;
+  void set_sharing_penalty(double sharing_penalty) override;
   void update_remains_lazy(double now) override;
 };
 
-}
-}
-
+} // namespace resource
+} // namespace kernel
+} // namespace simgrid
 #endif /* STORAGE_N11_HPP_ */