X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ecd5f7562caf1d443bf22788fa5f4fac408776ec..8c753c341f0c7f6d5ea38c4cb7bf7da6f0ef0a1b:/src/surf/storage_n11.hpp

diff --git a/src/surf/storage_n11.hpp b/src/surf/storage_n11.hpp
index b6d8c4f7ea..e5fe5e368b 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-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. */
@@ -28,10 +27,11 @@ class XBT_PRIVATE StorageN11Action;
 
 class StorageN11Model : public StorageModel {
 public:
+  StorageN11Model();
   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;
 };
 
 /************
@@ -40,9 +40,10 @@ 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* io_start(sg_size_t size, s4u::Io::OpType type);
   StorageAction* read(sg_size_t size);
   StorageAction* write(sg_size_t size);
 };
@@ -53,14 +54,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 setSharingWeight(double priority);
+  StorageN11Action(kernel::resource::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;
 };
 
 }