X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a92d7b716f51a53dea7f59db8524d4add713b910..51c23076e2b42ff07dc167dea1cb0e3a4ab3cf68:/src/surf/storage_n11.hpp diff --git a/src/surf/storage_n11.hpp b/src/surf/storage_n11.hpp index 00bd08d9ab..617b285c4c 100644 --- a/src/surf/storage_n11.hpp +++ b/src/surf/storage_n11.hpp @@ -1,5 +1,4 @@ -/* Copyright (c) 2013-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2013-2018. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -28,10 +27,10 @@ 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; - double nextOccuringEvent(double now) override; - void updateActionsState(double now, double delta) override; + StorageImpl* createStorage(std::string id, std::string type_id, std::string content_name, + std::string attach) override; + double next_occuring_event(double now) override; + void update_actions_state(double now, double delta) override; }; /************ @@ -40,14 +39,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); - 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, 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); + StorageAction* write(sg_size_t size); }; /********** @@ -56,14 +52,14 @@ public: class StorageN11Action : public StorageAction { public: - 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); + StorageN11Action(kernel::resource::Model* model, double cost, bool failed, StorageImpl* storage, + e_surf_action_storage_type_t type); + void suspend() override; + void cancel() override; + void resume() override; + void set_max_duration(double duration) override; + void set_priority(double priority) override; + void update_remains_lazy(double now) override; }; }