X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2a40fc047aa61d2fce966a98fe37945e4942b346..77bbf3027c4240a2e833209a3a3f186589da8577:/src/surf/storage_n11.hpp diff --git a/src/surf/storage_n11.hpp b/src/surf/storage_n11.hpp index 16016d2361..b6d8c4f7ea 100644 --- a/src/surf/storage_n11.hpp +++ b/src/surf/storage_n11.hpp @@ -6,7 +6,6 @@ #include -#include "FileImpl.hpp" #include "StorageImpl.hpp" #ifndef STORAGE_N11_HPP_ @@ -29,8 +28,8 @@ class XBT_PRIVATE StorageN11Action; class StorageN11Model : public StorageModel { public: - StorageImpl* 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; }; @@ -41,15 +40,11 @@ public: class StorageN11 : public StorageImpl { public: - 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); + 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 *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); + StorageAction* read(sg_size_t size); + StorageAction* write(sg_size_t size); }; /********** @@ -65,7 +60,7 @@ public: void resume(); bool isSuspended(); void setMaxDuration(double duration); - void setPriority(double priority); + void setSharingWeight(double priority); }; }