Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

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

diff --git a/src/surf/storage_n11.hpp b/src/surf/storage_n11.hpp
index 6a5eabd..3a12eee 100644 (file)
--- a/src/surf/storage_n11.hpp
+++ b/src/surf/storage_n11.hpp
@@ -28,11 +28,9 @@ class XBT_PRIVATE StorageN11Action;
 
 class StorageN11Model : public StorageModel {
 public:
-  StorageN11Model();
-  ~StorageN11Model();
-  Storage *createStorage(const char* id, const char* type_id,
-       const char* content_name, const char* content_type, xbt_dict_t properties, const char* attach) override;
-  double next_occuring_event(double now) override;
+  Storage* createStorage(const char* id, const char* type_id, const char* content_name, const char* content_type,
+                         const char* attach) override;
+  double nextOccuringEvent(double now) override;
   void updateActionsState(double now, double delta) override;
 };
 
@@ -42,19 +40,16 @@ public:
 
 class StorageN11 : public Storage {
 public:
-  StorageN11(StorageModel *model, const char* name, xbt_dict_t properties,
-         lmm_system_t maxminSystem, double bread, double bwrite, double bconnection,
-         const char* type_id, char *content_name, char *content_type, sg_size_t size, char *attach);
+  StorageN11(StorageModel* model, const char* name, lmm_system_t maxminSystem, double bread, double bwrite,
+             double bconnection, const char* type_id, char* content_name, const char* content_type, 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);//FIXME:why we have a useless param  *??
-  StorageAction *write(surf_file_t fd, sg_size_t size);//FIXME:why we have a useless param  *??
+  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);
-
-  lmm_constraint_t p_constraintWrite;    /* Constraint for maximum write bandwidth*/
-  lmm_constraint_t p_constraintRead;     /* Constraint for maximum write bandwidth*/
 };
 
 /**********