X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3ac47257d5835d1c289b450d79ae46b5747fe79a..8fea398a5a9ca83c4e6009daf964d59869388e6c:/src/surf/storage_n11.hpp diff --git a/src/surf/storage_n11.hpp b/src/surf/storage_n11.hpp index eab039ec13..16016d2361 100644 --- a/src/surf/storage_n11.hpp +++ b/src/surf/storage_n11.hpp @@ -6,7 +6,8 @@ #include -#include "storage_interface.hpp" +#include "FileImpl.hpp" +#include "StorageImpl.hpp" #ifndef STORAGE_N11_HPP_ #define STORAGE_N11_HPP_ @@ -28,10 +29,8 @@ 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; + StorageImpl* createStorage(const char* id, const char* type_id, const char* content_name, + const char* attach) override; double nextOccuringEvent(double now) override; void updateActionsState(double now, double delta) override; }; @@ -40,17 +39,16 @@ public: * Resource * ************/ -class StorageN11 : public Storage { +class StorageN11 : public StorageImpl { 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, const char *content_type, sg_size_t size, char *attach); - + StorageN11(StorageModel* model, const char* name, lmm_system_t maxminSystem, double bread, double bwrite, + const char* type_id, char* content_name, sg_size_t size, char* attach); + virtual ~StorageN11() = default; 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); }; @@ -60,7 +58,7 @@ 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(); @@ -68,7 +66,6 @@ public: bool isSuspended(); void setMaxDuration(double duration); void setPriority(double priority); - }; }