X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/08ddd90ede6ae87880ab6aefe213001b224de841..0ea1a3dca97a66f81466333806853c97af7eb398:/src/surf/storage_n11.hpp diff --git a/src/surf/storage_n11.hpp b/src/surf/storage_n11.hpp index c38ec744e2..617b285c4c 100644 --- a/src/surf/storage_n11.hpp +++ b/src/surf/storage_n11.hpp @@ -29,8 +29,8 @@ class StorageN11Model : public StorageModel { public: 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; + double next_occuring_event(double now) override; + void update_actions_state(double now, double delta) override; }; /************ @@ -39,7 +39,7 @@ public: class StorageN11 : public StorageImpl { public: - StorageN11(StorageModel* model, std::string name, lmm_system_t maxminSystem, double bread, double bwrite, + StorageN11(StorageModel* model, std::string name, kernel::lmm::System* 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); @@ -55,13 +55,11 @@ public: StorageN11Action(kernel::resource::Model* model, double cost, bool failed, StorageImpl* storage, e_surf_action_storage_type_t type); void suspend() override; - int unref() override; void cancel() override; void resume() override; - bool isSuspended() override; - void setMaxDuration(double duration) override; - void setSharingWeight(double priority) override; - void updateRemainingLazy(double now) override; + void set_max_duration(double duration) override; + void set_priority(double priority) override; + void update_remains_lazy(double now) override; }; }