X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0342cac8cbf7d74cf6efa11b33abd8cb6d87cc3c..c1194401ce4a41ff54a7591f4cf33c9ce2756978:/src/surf/storage_n11.hpp

diff --git a/src/surf/storage_n11.hpp b/src/surf/storage_n11.hpp
index 2da0174a66..4d4f67c336 100644
--- a/src/surf/storage_n11.hpp
+++ b/src/surf/storage_n11.hpp
@@ -1,19 +1,18 @@
-/* Copyright (c) 2013-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2013-2019. 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. */
 
 #include <xbt/base.h>
 
-#include "FileImpl.hpp"
 #include "StorageImpl.hpp"
 
 #ifndef STORAGE_N11_HPP_
 #define STORAGE_N11_HPP_
 
 namespace simgrid {
-namespace surf {
+namespace kernel {
+namespace resource {
 
 /***********
  * Classes *
@@ -29,10 +28,11 @@ 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;
+  StorageN11Model();
+  StorageImpl* createStorage(const std::string& id, const std::string& type_id, const std::string& content_name,
+                             const std::string& attach) override;
+  double next_occuring_event(double now) override;
+  void update_actions_state(double now, double delta) override;
 };
 
 /************
@@ -41,14 +41,13 @@ 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, const std::string& name, kernel::lmm::System* maxminSystem, double bread,
+             double bwrite, const std::string& type_id, const std::string& content_name, sg_size_t size,
+             const std::string& attach);
   virtual ~StorageN11() = default;
-  StorageAction *open(const char* mount, const char* path);
-  StorageAction *ls(const char *path);
+  StorageAction* io_start(sg_size_t size, s4u::Io::OpType type);
   StorageAction* read(sg_size_t size);
   StorageAction* write(sg_size_t size);
-  void rename(const char *src, const char *dest);
 };
 
 /**********
@@ -57,17 +56,16 @@ 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 setSharingWeight(double priority);
+  StorageN11Action(Model* model, double cost, bool failed, StorageImpl* storage, s4u::Io::OpType 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;
 };
 
-}
-}
-
+} // namespace resource
+} // namespace kernel
+} // namespace simgrid
 #endif /* STORAGE_N11_HPP_ */