Merge branch 'actor-yield' of github.com:Takishipp/simgrid into actor-yield

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

diff --git a/src/surf/storage_n11.hpp b/src/surf/storage_n11.hpp
index 734b740..b6d8c4f 100644 (file)
--- a/src/surf/storage_n11.hpp
+++ b/src/surf/storage_n11.hpp
@@ -6,7 +6,7 @@
 
 #include <xbt/base.h>
 
-#include "storage_interface.hpp"
+#include "StorageImpl.hpp"
 
 #ifndef STORAGE_N11_HPP_
 #define STORAGE_N11_HPP_
@@ -28,7 +28,8 @@ class XBT_PRIVATE StorageN11Action;
 
 class StorageN11Model : public StorageModel {
 public:
-  Storage* createStorage(const char* id, const char* type_id, const char* content_name, const char* attach) override;
+  StorageImpl* createStorage(std::string id, std::string type_id, std::string content_name,
+                             std::string attach) override;
   double nextOccuringEvent(double now) override;
   void updateActionsState(double now, double delta) override;
 };
@@ -37,17 +38,13 @@ public:
  * Resource *
  ************/
 
-class StorageN11 : public Storage {
+class StorageN11 : public StorageImpl {
 public:
-  StorageN11(StorageModel* model, const char* name, lmm_system_t maxminSystem, double bread, double bwrite,
-             double bconnection, const char* type_id, char* content_name, sg_size_t size, char* attach);
-
-  StorageAction *open(const char* mount, const char* path);
-  StorageAction *close(surf_file_t fd);
-  StorageAction *ls(const char *path);
-  StorageAction* read(surf_file_t fd, sg_size_t size);
-  StorageAction* write(surf_file_t fd, sg_size_t size);
-  void rename(const char *src, const char *dest);
+  StorageN11(StorageModel* model, std::string name, lmm_system_t maxminSystem, double bread, double bwrite,
+             std::string type_id, std::string content_name, sg_size_t size, std::string attach);
+  virtual ~StorageN11() = default;
+  StorageAction* read(sg_size_t size);
+  StorageAction* write(sg_size_t size);
 };
 
 /**********
@@ -56,15 +53,14 @@ public:
 
 class StorageN11Action : public StorageAction {
 public:
-  StorageN11Action(Model *model, double cost, bool failed, Storage *storage, e_surf_action_storage_type_t type);
+  StorageN11Action(Model* model, double cost, bool failed, StorageImpl* storage, e_surf_action_storage_type_t type);
   void suspend();
   int unref();
   void cancel();
   void resume();
   bool isSuspended();
   void setMaxDuration(double duration);
-  void setPriority(double priority);
-
+  void setSharingWeight(double priority);
 };
 
 }